Fixed OIDC Logout

[bookstack] / tests / Entity / CommentTest.php

diff --git a/tests/Entity/CommentTest.php b/tests/Entity/CommentTest.php
index 63d1a29a29ac656bf5d53ec38a00fad8102af35c..0a71bb6eff4ab6167f70f21d9a610a6ab576829f 100644 (file)
--- a/tests/Entity/CommentTest.php
+++ b/tests/Entity/CommentTest.php
@@ -1,18 +1,20 @@
-<?php namespace Tests\Entity;
+<?php

 
 

+namespace Tests\Entity;
+
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Comment;

 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Models\Page;

-use BookStack\Actions\Comment;

 use Tests\TestCase;
 
 class CommentTest extends TestCase
 {
 use Tests\TestCase;
 
 class CommentTest extends TestCase
 {

-

     public function test_add_comment()
     {
         $this->asAdmin();
     public function test_add_comment()
     {
         $this->asAdmin();

-        $page = Page::first();
+        $page = $this->entities->page();

 
 

-        $comment = factory(Comment::class)->make(['parent_id' => 2]);
+        $comment = Comment::factory()->make(['parent_id' => 2]);

         $resp = $this->postJson("/comment/$page->id", $comment->getAttributes());
 
         $resp->assertStatus(200);
         $resp = $this->postJson("/comment/$page->id", $comment->getAttributes());
 
         $resp->assertStatus(200);


@@ -22,20 +24,22 @@ class CommentTest extends TestCase
         $pageResp->assertSee($comment->text);
 
         $this->assertDatabaseHas('comments', [
         $pageResp->assertSee($comment->text);
 
         $this->assertDatabaseHas('comments', [

-            'local_id' => 1,
-            'entity_id' => $page->id,
+            'local_id'    => 1,
+            'entity_id'   => $page->id,

             'entity_type' => Page::newModelInstance()->getMorphClass(),
             'entity_type' => Page::newModelInstance()->getMorphClass(),

-            'text' => $comment->text,
-            'parent_id' => 2
+            'text'        => $comment->text,
+            'parent_id'   => 2,

         ]);
         ]);

+
+        $this->assertActivityExists(ActivityType::COMMENT_CREATE);

     }
 
     public function test_comment_edit()
     {
         $this->asAdmin();
     }
 
     public function test_comment_edit()
     {
         $this->asAdmin();

-        $page = Page::first();
+        $page = $this->entities->page();

 
 

-        $comment = factory(Comment::class)->make();
+        $comment = Comment::factory()->make();

         $this->postJson("/comment/$page->id", $comment->getAttributes());
 
         $comment = $page->comments()->first();
         $this->postJson("/comment/$page->id", $comment->getAttributes());
 
         $comment = $page->comments()->first();


@@ -49,17 +53,19 @@ class CommentTest extends TestCase
         $resp->assertDontSee($comment->text);
 
         $this->assertDatabaseHas('comments', [
         $resp->assertDontSee($comment->text);
 
         $this->assertDatabaseHas('comments', [

-            'text' => $newText,
-            'entity_id' => $page->id
+            'text'      => $newText,
+            'entity_id' => $page->id,

         ]);
         ]);

+
+        $this->assertActivityExists(ActivityType::COMMENT_UPDATE);

     }
 
     public function test_comment_delete()
     {
         $this->asAdmin();
     }
 
     public function test_comment_delete()
     {
         $this->asAdmin();

-        $page = Page::first();
+        $page = $this->entities->page();

 
 

-        $comment = factory(Comment::class)->make();
+        $comment = Comment::factory()->make();

         $this->postJson("/comment/$page->id", $comment->getAttributes());
 
         $comment = $page->comments()->first();
         $this->postJson("/comment/$page->id", $comment->getAttributes());
 
         $comment = $page->comments()->first();


@@ -68,32 +74,34 @@ class CommentTest extends TestCase
         $resp->assertStatus(200);
 
         $this->assertDatabaseMissing('comments', [
         $resp->assertStatus(200);
 
         $this->assertDatabaseMissing('comments', [

-            'id' => $comment->id
+            'id' => $comment->id,

         ]);
         ]);

+
+        $this->assertActivityExists(ActivityType::COMMENT_DELETE);

     }
 
     public function test_comments_converts_markdown_input_to_html()
     {
     }
 
     public function test_comments_converts_markdown_input_to_html()
     {

-        $page = Page::first();
+        $page = $this->entities->page();

         $this->asAdmin()->postJson("/comment/$page->id", [
             'text' => '# My Title',
         ]);
 
         $this->assertDatabaseHas('comments', [
         $this->asAdmin()->postJson("/comment/$page->id", [
             'text' => '# My Title',
         ]);
 
         $this->assertDatabaseHas('comments', [

-            'entity_id' => $page->id,
+            'entity_id'   => $page->id,

             'entity_type' => $page->getMorphClass(),
             'entity_type' => $page->getMorphClass(),

-            'text' => '# My Title',
-            'html' => "<h1>My Title</h1>\n",
+            'text'        => '# My Title',
+            'html'        => "<h1>My Title</h1>\n",

         ]);
 
         $pageView = $this->get($page->getUrl());
         ]);
 
         $pageView = $this->get($page->getUrl());

-        $pageView->assertSee('<h1>My Title</h1>');
+        $pageView->assertSee('<h1>My Title</h1>', false);

     }
 
     public function test_html_cannot_be_injected_via_comment_content()
     {
         $this->asAdmin();
     }
 
     public function test_html_cannot_be_injected_via_comment_content()
     {
         $this->asAdmin();

-        $page = Page::first();
+        $page = $this->entities->page();

 
         $script = '<script>const a = "script";</script>\n\n# sometextinthecomment';
         $this->postJson("/comment/$page->id", [
 
         $script = '<script>const a = "script";</script>\n\n# sometextinthecomment';
         $this->postJson("/comment/$page->id", [


@@ -101,7 +109,7 @@ class CommentTest extends TestCase
         ]);
 
         $pageView = $this->get($page->getUrl());
         ]);
 
         $pageView = $this->get($page->getUrl());

-        $pageView->assertDontSee($script);
+        $pageView->assertDontSee($script, false);

         $pageView->assertSee('sometextinthecomment');
 
         $comment = $page->comments()->first();
         $pageView->assertSee('sometextinthecomment');
 
         $comment = $page->comments()->first();


@@ -110,7 +118,38 @@ class CommentTest extends TestCase
         ]);
 
         $pageView = $this->get($page->getUrl());
         ]);
 
         $pageView = $this->get($page->getUrl());

-        $pageView->assertDontSee($script);
+        $pageView->assertDontSee($script, false);

         $pageView->assertSee('sometextinthecommentupdated');
     }
         $pageView->assertSee('sometextinthecommentupdated');
     }

+
+    public function test_reply_comments_are_nested()
+    {
+        $this->asAdmin();
+        $page = $this->entities->page();
+
+        $this->postJson("/comment/$page->id", ['text' => 'My new comment']);
+        $this->postJson("/comment/$page->id", ['text' => 'My new comment']);
+
+        $respHtml = $this->withHtml($this->get($page->getUrl()));
+        $respHtml->assertElementCount('.comment-branch', 3);
+        $respHtml->assertElementNotExists('.comment-branch .comment-branch');
+
+        $comment = $page->comments()->first();
+        $resp = $this->postJson("/comment/$page->id", ['text' => 'My nested comment', 'parent_id' => $comment->local_id]);
+        $resp->assertStatus(200);
+
+        $respHtml = $this->withHtml($this->get($page->getUrl()));
+        $respHtml->assertElementCount('.comment-branch', 4);
+        $respHtml->assertElementContains('.comment-branch .comment-branch', 'My nested comment');
+    }
+
+    public function test_comments_are_visible_in_the_page_editor()
+    {
+        $page = $this->entities->page();
+
+        $this->asAdmin()->postJson("/comment/$page->id", ['text' => 'My great comment to see in the editor']);
+
+        $respHtml = $this->withHtml($this->get($page->getUrl('/edit')));
+        $respHtml->assertElementContains('.comment-box .content', 'My great comment to see in the editor');
+    }

 }
 }