Merge pull request #5917 from BookStackApp/copy_references

[bookstack] / tests / Entity / CommentStoreTest.php

diff --git a/tests/Entity/CommentStoreTest.php b/tests/Entity/CommentStoreTest.php
index c5fe4ce5064a600bbfa0fd427f780468e6482c8c..c4c959c29553d46f30309cc8001d78b9c5994838 100644 (file)
--- a/tests/Entity/CommentStoreTest.php
+++ b/tests/Entity/CommentStoreTest.php
@@ -14,6 +14,7 @@ class CommentStoreTest extends TestCase
         $this->asAdmin();
         $page = $this->entities->page();
 
+        Comment::factory()->create(['commentable_id' => $page->id, 'commentable_type' => 'page', 'local_id' => 2]);
         $comment = Comment::factory()->make(['parent_id' => 2]);
         $resp = $this->postJson("/comment/$page->id", $comment->getAttributes());
 
@@ -24,10 +25,9 @@ class CommentStoreTest extends TestCase
         $pageResp->assertSee($comment->html, false);
 
         $this->assertDatabaseHas('comments', [
-            'local_id'    => 1,
-            'entity_id'   => $page->id,
-            'entity_type' => Page::newModelInstance()->getMorphClass(),
-            'text'        => null,
+            'local_id'    => 3,
+            'commentable_id'   => $page->id,
+            'commentable_type' => 'page',
             'parent_id'   => 2,
         ]);
 
@@ -53,9 +53,9 @@ class CommentStoreTest extends TestCase
             ]);
 
             if ($valid) {
-                $this->assertDatabaseHas('comments', ['entity_id' => $page->id, 'content_ref' => $ref]);
+                $this->assertDatabaseHas('comments', ['commentable_id' => $page->id, 'content_ref' => $ref]);
             } else {
-                $this->assertDatabaseMissing('comments', ['entity_id' => $page->id, 'content_ref' => $ref]);
+                $this->assertDatabaseMissing('comments', ['commentable_id' => $page->id, 'content_ref' => $ref]);
             }
         }
     }
@@ -80,7 +80,7 @@ class CommentStoreTest extends TestCase
 
         $this->assertDatabaseHas('comments', [
             'html'      => $newHtml,
-            'entity_id' => $page->id,
+            'commentable_id' => $page->id,
         ]);
 
         $this->assertActivityExists(ActivityType::COMMENT_UPDATE);
@@ -219,7 +219,7 @@ class CommentStoreTest extends TestCase
         $page = $this->entities->page();
         Comment::factory()->create([
             'html' => '<script>superbadscript</script><script>superbadscript</script><p onclick="superbadonclick">scriptincommentest</p>',
-            'entity_type' => 'page', 'entity_id' => $page
+            'commentable_type' => 'page', 'commentable_id' => $page
         ]);
 
         $resp = $this->asAdmin()->get($page->getUrl());
@@ -237,8 +237,8 @@ class CommentStoreTest extends TestCase
         $resp = $this->asAdmin()->post("/comment/{$page->id}", ['html' => $input]);
         $resp->assertOk();
         $this->assertDatabaseHas('comments', [
-           'entity_type' => 'page',
-           'entity_id' => $page->id,
+           'commentable_type' => 'page',
+           'commentable_id' => $page->id,
            'html' => $expected,
         ]);
 
@@ -260,8 +260,8 @@ class CommentStoreTest extends TestCase
         $resp = $this->asAdmin()->post("/comment/{$page->id}", ['html' => $input]);
         $resp->assertOk();
         $this->assertDatabaseHas('comments', [
-            'entity_type' => 'page',
-            'entity_id' => $page->id,
+            'commentable_type' => 'page',
+            'commentable_id' => $page->id,
             'html' => $expected,
         ]);