Comments: Added HTML filter on load, tinymce elem filtering

[bookstack] / tests / References / ReferencesTest.php

diff --git a/tests/References/ReferencesTest.php b/tests/References/ReferencesTest.php
index 16ea19ac5ab9d04a53ac43356cebd9791e5f151b..715f7143534b09ddcf179bd2517c5a11c6461462 100644 (file)
--- a/tests/References/ReferencesTest.php
+++ b/tests/References/ReferencesTest.php
@@ -2,12 +2,9 @@
 
 namespace Tests\References;
 
 
 namespace Tests\References;
 

-use BookStack\Entities\Models\Book;
-use BookStack\Entities\Models\Chapter;
-use BookStack\Entities\Models\Page;
+use BookStack\App\Model;

 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\TrashCan;

-use BookStack\Model;

 use BookStack\References\Reference;
 use Tests\TestCase;
 
 use BookStack\References\Reference;
 use Tests\TestCase;
 


@@ -15,10 +12,8 @@ class ReferencesTest extends TestCase
 {
     public function test_references_created_on_page_update()
     {
 {
     public function test_references_created_on_page_update()
     {

-        /** @var Page $pageA */
-        /** @var Page $pageB */
-        $pageA = Page::query()->first();
-        $pageB = Page::query()->where('id', '!=', $pageA->id)->first();
+        $pageA = $this->entities->page();
+        $pageB = $this->entities->page();

 
         $this->assertDatabaseMissing('references', ['from_id' => $pageA->id, 'from_type' => $pageA->getMorphClass()]);
 
 
         $this->assertDatabaseMissing('references', ['from_id' => $pageA->id, 'from_type' => $pageA->getMorphClass()]);
 


@@ -35,12 +30,33 @@ class ReferencesTest extends TestCase
         ]);
     }
 
         ]);
     }
 

-    public function test_references_deleted_on_entity_delete()
+    public function test_references_created_on_book_chapter_bookshelf_update()

     {
     {

-        /** @var Page $pageA */
-        /** @var Page $pageB */
-        $pageA = Page::query()->first();
-        $pageB = Page::query()->where('id', '!=', $pageA->id)->first();
+        $entities = [$this->entities->book(), $this->entities->chapter(), $this->entities->shelf()];
+        $shelf = $this->entities->shelf();
+
+        foreach ($entities as $entity) {
+            $entity->refresh();
+            $this->assertDatabaseMissing('references', ['from_id' => $entity->id, 'from_type' => $entity->getMorphClass()]);
+
+            $this->asEditor()->put($entity->getUrl(), [
+                'name' => 'Reference test',
+                'description_html' => '<a href="' . $shelf->getUrl() . '">Testing</a>',
+            ]);
+
+            $this->assertDatabaseHas('references', [
+                'from_id'   => $entity->id,
+                'from_type' => $entity->getMorphClass(),
+                'to_id'     => $shelf->id,
+                'to_type'   => $shelf->getMorphClass(),
+            ]);
+        }
+    }
+
+    public function test_references_deleted_on_page_delete()
+    {
+        $pageA = $this->entities->page();
+        $pageB = $this->entities->page();

 
         $this->createReference($pageA, $pageB);
         $this->createReference($pageB, $pageA);
 
         $this->createReference($pageA, $pageB);
         $this->createReference($pageB, $pageA);


@@ -55,11 +71,29 @@ class ReferencesTest extends TestCase
         $this->assertDatabaseMissing('references', ['to_id' => $pageA->id, 'to_type' => $pageA->getMorphClass()]);
     }
 
         $this->assertDatabaseMissing('references', ['to_id' => $pageA->id, 'to_type' => $pageA->getMorphClass()]);
     }
 

+    public function test_references_from_deleted_on_book_chapter_shelf_delete()
+    {
+        $entities = [$this->entities->chapter(), $this->entities->book(), $this->entities->shelf()];
+        $shelf = $this->entities->shelf();
+
+        foreach ($entities as $entity) {
+            $this->createReference($entity, $shelf);
+            $this->assertDatabaseHas('references', ['from_id' => $entity->id, 'from_type' => $entity->getMorphClass()]);
+
+            $this->asEditor()->delete($entity->getUrl());
+            app(TrashCan::class)->empty();
+
+            $this->assertDatabaseMissing('references', [
+                'from_id'   => $entity->id,
+                'from_type' => $entity->getMorphClass()
+            ]);
+        }
+    }
+

     public function test_references_to_count_visible_on_entity_show_view()
     {
         $entities = $this->entities->all();
     public function test_references_to_count_visible_on_entity_show_view()
     {
         $entities = $this->entities->all();

-        /** @var Page $otherPage */
-        $otherPage = Page::query()->where('id', '!=', $entities['page']->id)->first();
+        $otherPage = $this->entities->page();

 
         $this->asEditor();
         foreach ($entities as $entity) {
 
         $this->asEditor();
         foreach ($entities as $entity) {


@@ -68,13 +102,13 @@ class ReferencesTest extends TestCase
 
         foreach ($entities as $entity) {
             $resp = $this->get($entity->getUrl());
 
         foreach ($entities as $entity) {
             $resp = $this->get($entity->getUrl());

-            $resp->assertSee('Referenced on 1 page');
-            $resp->assertDontSee('Referenced on 1 pages');
+            $resp->assertSee('Referenced by 1 item');
+            $resp->assertDontSee('Referenced by 1 items');

         }
 
         $this->createReference($otherPage, $entities['page']);
         $resp = $this->get($entities['page']->getUrl());
         }
 
         $this->createReference($otherPage, $entities['page']);
         $resp = $this->get($entities['page']->getUrl());

-        $resp->assertSee('Referenced on 2 pages');
+        $resp->assertSee('Referenced by 2 items');

     }
 
     public function test_references_to_visible_on_references_page()
     }
 
     public function test_references_to_visible_on_references_page()


@@ -95,13 +129,11 @@ class ReferencesTest extends TestCase
 
     public function test_reference_not_visible_if_view_permission_does_not_permit()
     {
 
     public function test_reference_not_visible_if_view_permission_does_not_permit()
     {

-        /** @var Page $page */
-        /** @var Page $pageB */

         $page = $this->entities->page();
         $page = $this->entities->page();

-        $pageB = Page::query()->where('id', '!=', $page->id)->first();
+        $pageB = $this->entities->page();

         $this->createReference($pageB, $page);
 
         $this->createReference($pageB, $page);
 

-        $this->entities->setPermissions($pageB);
+        $this->permissions->setEntityPermissions($pageB);

 
         $this->asEditor()->get($page->getUrl('/references'))->assertDontSee($pageB->name);
         $this->asAdmin()->get($page->getUrl('/references'))->assertSee($pageB->name);
 
         $this->asEditor()->get($page->getUrl('/references'))->assertDontSee($pageB->name);
         $this->asAdmin()->get($page->getUrl('/references'))->assertSee($pageB->name);


@@ -118,11 +150,8 @@ class ReferencesTest extends TestCase
 
     public function test_pages_leading_to_entity_updated_on_url_change()
     {
 
     public function test_pages_leading_to_entity_updated_on_url_change()
     {

-        /** @var Page $pageA */
-        /** @var Page $pageB */
-        /** @var Book $book */
-        $pageA = Page::query()->first();
-        $pageB = Page::query()->where('id', '!=', $pageA->id)->first();
+        $pageA = $this->entities->page();
+        $pageB = $this->entities->page();

         $book = $this->entities->book();
 
         foreach ([$pageA, $pageB] as $page) {
         $book = $this->entities->book();
 
         foreach ([$pageA, $pageB] as $page) {


@@ -147,11 +176,8 @@ class ReferencesTest extends TestCase
 
     public function test_pages_linking_to_other_page_updated_on_parent_book_url_change()
     {
 
     public function test_pages_linking_to_other_page_updated_on_parent_book_url_change()
     {

-        /** @var Page $bookPage */
-        /** @var Page $otherPage */
-        /** @var Book $book */
-        $bookPage = Page::query()->first();
-        $otherPage = Page::query()->where('id', '!=', $bookPage->id)->first();
+        $bookPage = $this->entities->page();
+        $otherPage = $this->entities->page();

         $book = $bookPage->book;
 
         $otherPage->html = '<a href="' . $bookPage->getUrl() . '">Link</a>';
         $book = $bookPage->book;
 
         $otherPage->html = '<a href="' . $bookPage->getUrl() . '">Link</a>';


@@ -172,11 +198,8 @@ class ReferencesTest extends TestCase
 
     public function test_pages_linking_to_chapter_updated_on_parent_book_url_change()
     {
 
     public function test_pages_linking_to_chapter_updated_on_parent_book_url_change()
     {

-        /** @var Chapter $bookChapter */
-        /** @var Page $otherPage */
-        /** @var Book $book */
-        $bookChapter = Chapter::query()->first();
-        $otherPage = Page::query()->first();
+        $bookChapter = $this->entities->chapter();
+        $otherPage = $this->entities->page();

         $book = $bookChapter->book;
 
         $otherPage->html = '<a href="' . $bookChapter->getUrl() . '">Link</a>';
         $book = $bookChapter->book;
 
         $otherPage->html = '<a href="' . $bookChapter->getUrl() . '">Link</a>';


@@ -197,8 +220,6 @@ class ReferencesTest extends TestCase
 
     public function test_markdown_links_leading_to_entity_updated_on_url_change()
     {
 
     public function test_markdown_links_leading_to_entity_updated_on_url_change()
     {

-        /** @var Page $page */
-        /** @var Book $book */

         $page = $this->entities->page();
         $book = $this->entities->book();
 
         $page = $this->entities->page();
         $book = $this->entities->book();
 


@@ -224,6 +245,32 @@ class ReferencesTest extends TestCase
         $this->assertEquals($expected, $page->markdown);
     }
 
         $this->assertEquals($expected, $page->markdown);
     }
 

+    public function test_description_links_from_book_chapter_shelf_updated_on_url_change()
+    {
+        $entities = [$this->entities->chapter(), $this->entities->book(), $this->entities->shelf()];
+        $shelf = $this->entities->shelf();
+        $this->asEditor();
+
+        foreach ($entities as $entity) {
+            $this->put($entity->getUrl(), [
+                'name' => 'Reference test',
+                'description_html' => '<a href="' . $shelf->getUrl() . '">Testing</a>',
+            ]);
+        }
+
+        $oldUrl = $shelf->getUrl();
+        $this->put($shelf->getUrl(), ['name' => 'My updated shelf link']);
+        $shelf->refresh();
+        $this->assertNotEquals($oldUrl, $shelf->getUrl());
+
+        foreach ($entities as $entity) {
+            $oldHtml = $entity->description_html;
+            $entity->refresh();
+            $this->assertNotEquals($oldHtml, $entity->description_html);
+            $this->assertStringContainsString($shelf->getUrl(), $entity->description_html);
+        }
+    }
+

     protected function createReference(Model $from, Model $to)
     {
         (new Reference())->forceFill([
     protected function createReference(Model $from, Model $to)
     {
         (new Reference())->forceFill([