Altered ldap_connect usage, cleaned up LDAP classes

[bookstack] / tests / Entity / SortTest.php

diff --git a/tests/Entity/SortTest.php b/tests/Entity/SortTest.php
index 89279bfcf9059b6daef98b853bce0412bdd8a817..9a5a2fe175a43ed0a2bbdd614f60b106ebdd9bb4 100644 (file)
--- a/tests/Entity/SortTest.php
+++ b/tests/Entity/SortTest.php
@@ -10,32 +10,25 @@ use Tests\TestCase;
 
 class SortTest extends TestCase
 {
 
 class SortTest extends TestCase
 {

-    protected $book;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->book = Book::first();
-    }
-

     public function test_drafts_do_not_show_up()
     {
         $this->asAdmin();
         $pageRepo = app(PageRepo::class);
     public function test_drafts_do_not_show_up()
     {
         $this->asAdmin();
         $pageRepo = app(PageRepo::class);

-        $draft = $pageRepo->getNewDraftPage($this->book);
+        $book = $this->entities->book();
+        $draft = $pageRepo->getNewDraftPage($book);

 
 

-        $resp = $this->get($this->book->getUrl());
+        $resp = $this->get($book->getUrl());

         $resp->assertSee($draft->name);
 
         $resp->assertSee($draft->name);
 

-        $resp = $this->get($this->book->getUrl() . '/sort');
+        $resp = $this->get($book->getUrl() . '/sort');

         $resp->assertDontSee($draft->name);
     }
 
     public function test_page_move_into_book()
     {
         $resp->assertDontSee($draft->name);
     }
 
     public function test_page_move_into_book()
     {

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

         $currentBook = $page->book;
         $currentBook = $page->book;

-        $newBook = Book::where('id', '!=', $currentBook->id)->first();
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();

 
         $resp = $this->asEditor()->get($page->getUrl('/move'));
         $resp->assertSee('Move Page');
 
         $resp = $this->asEditor()->get($page->getUrl('/move'));
         $resp->assertSee('Move Page');


@@ -43,7 +36,7 @@ class SortTest extends TestCase
         $movePageResp = $this->put($page->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
         ]);
         $movePageResp = $this->put($page->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
         ]);

-        $page = Page::find($page->id);
+        $page->refresh();

 
         $movePageResp->assertRedirect($page->getUrl());
         $this->assertTrue($page->book->id == $newBook->id, 'Page book is now the new book');
 
         $movePageResp->assertRedirect($page->getUrl());
         $this->assertTrue($page->book->id == $newBook->id, 'Page book is now the new book');


@@ -55,15 +48,15 @@ class SortTest extends TestCase
 
     public function test_page_move_into_chapter()
     {
 
     public function test_page_move_into_chapter()
     {

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

         $currentBook = $page->book;
         $currentBook = $page->book;

-        $newBook = Book::where('id', '!=', $currentBook->id)->first();
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();

         $newChapter = $newBook->chapters()->first();
 
         $newChapter = $newBook->chapters()->first();
 

-        $movePageResp = $this->actingAs($this->getEditor())->put($page->getUrl('/move'), [
+        $movePageResp = $this->actingAs($this->users->editor())->put($page->getUrl('/move'), [

             'entity_selection' => 'chapter:' . $newChapter->id,
         ]);
             'entity_selection' => 'chapter:' . $newChapter->id,
         ]);

-        $page = Page::find($page->id);
+        $page->refresh();

 
         $movePageResp->assertRedirect($page->getUrl());
         $this->assertTrue($page->book->id == $newBook->id, 'Page parent is now the new chapter');
 
         $movePageResp->assertRedirect($page->getUrl());
         $this->assertTrue($page->book->id == $newBook->id, 'Page parent is now the new chapter');


@@ -74,11 +67,11 @@ class SortTest extends TestCase
 
     public function test_page_move_from_chapter_to_book()
     {
 
     public function test_page_move_from_chapter_to_book()
     {

-        $oldChapter = Chapter::first();
+        $oldChapter = Chapter::query()->first();

         $page = $oldChapter->pages()->first();
         $page = $oldChapter->pages()->first();

-        $newBook = Book::where('id', '!=', $oldChapter->book_id)->first();
+        $newBook = Book::query()->where('id', '!=', $oldChapter->book_id)->first();

 
 

-        $movePageResp = $this->actingAs($this->getEditor())->put($page->getUrl('/move'), [
+        $movePageResp = $this->actingAs($this->users->editor())->put($page->getUrl('/move'), [

             'entity_selection' => 'book:' . $newBook->id,
         ]);
         $page->refresh();
             'entity_selection' => 'book:' . $newBook->id,
         ]);
         $page->refresh();


@@ -93,24 +86,24 @@ class SortTest extends TestCase
 
     public function test_page_move_requires_create_permissions_on_parent()
     {
 
     public function test_page_move_requires_create_permissions_on_parent()
     {

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

         $currentBook = $page->book;
         $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
         $currentBook = $page->book;
         $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();

-        $editor = $this->getEditor();
+        $editor = $this->users->editor();

 
 

-        $this->setEntityRestrictions($newBook, ['view', 'update', 'delete'], $editor->roles->all());
+        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'delete'], $editor->roles->all());

 
         $movePageResp = $this->actingAs($editor)->put($page->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
         ]);
         $this->assertPermissionError($movePageResp);
 
 
         $movePageResp = $this->actingAs($editor)->put($page->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
         ]);
         $this->assertPermissionError($movePageResp);
 

-        $this->setEntityRestrictions($newBook, ['view', 'update', 'delete', 'create'], $editor->roles->all());
+        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'delete', 'create'], $editor->roles->all());

         $movePageResp = $this->put($page->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
         ]);
 
         $movePageResp = $this->put($page->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
         ]);
 

-        $page = Page::find($page->id);
+        $page->refresh();

         $movePageResp->assertRedirect($page->getUrl());
 
         $this->assertTrue($page->book->id == $newBook->id, 'Page book is now the new book');
         $movePageResp->assertRedirect($page->getUrl());
 
         $this->assertTrue($page->book->id == $newBook->id, 'Page book is now the new book');


@@ -118,13 +111,13 @@ class SortTest extends TestCase
 
     public function test_page_move_requires_delete_permissions()
     {
 
     public function test_page_move_requires_delete_permissions()
     {

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

         $currentBook = $page->book;
         $currentBook = $page->book;

-        $newBook = Book::where('id', '!=', $currentBook->id)->first();
-        $editor = $this->getEditor();
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
+        $editor = $this->users->editor();

 
 

-        $this->setEntityRestrictions($newBook, ['view', 'update', 'create', 'delete'], $editor->roles->all());
-        $this->setEntityRestrictions($page, ['view', 'update', 'create'], $editor->roles->all());
+        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'create', 'delete'], $editor->roles->all());
+        $this->permissions->setEntityPermissions($page, ['view', 'update', 'create'], $editor->roles->all());

 
         $movePageResp = $this->actingAs($editor)->put($page->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
 
         $movePageResp = $this->actingAs($editor)->put($page->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,


@@ -133,22 +126,22 @@ class SortTest extends TestCase
         $pageView = $this->get($page->getUrl());
         $pageView->assertDontSee($page->getUrl('/move'));
 
         $pageView = $this->get($page->getUrl());
         $pageView->assertDontSee($page->getUrl('/move'));
 

-        $this->setEntityRestrictions($page, ['view', 'update', 'create', 'delete'], $editor->roles->all());
+        $this->permissions->setEntityPermissions($page, ['view', 'update', 'create', 'delete'], $editor->roles->all());

         $movePageResp = $this->put($page->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
         ]);
 
         $movePageResp = $this->put($page->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
         ]);
 

-        $page = Page::find($page->id);
+        $page->refresh();

         $movePageResp->assertRedirect($page->getUrl());
         $this->assertTrue($page->book->id == $newBook->id, 'Page book is now the new book');
     }
 
     public function test_chapter_move()
     {
         $movePageResp->assertRedirect($page->getUrl());
         $this->assertTrue($page->book->id == $newBook->id, 'Page book is now the new book');
     }
 
     public function test_chapter_move()
     {

-        $chapter = Chapter::first();
+        $chapter = $this->entities->chapter();

         $currentBook = $chapter->book;
         $pageToCheck = $chapter->pages->first();
         $currentBook = $chapter->book;
         $pageToCheck = $chapter->pages->first();

-        $newBook = Book::where('id', '!=', $currentBook->id)->first();
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();

 
         $chapterMoveResp = $this->asEditor()->get($chapter->getUrl('/move'));
         $chapterMoveResp->assertSee('Move Chapter');
 
         $chapterMoveResp = $this->asEditor()->get($chapter->getUrl('/move'));
         $chapterMoveResp->assertSee('Move Chapter');


@@ -157,7 +150,7 @@ class SortTest extends TestCase
             'entity_selection' => 'book:' . $newBook->id,
         ]);
 
             'entity_selection' => 'book:' . $newBook->id,
         ]);
 

-        $chapter = Chapter::find($chapter->id);
+        $chapter = Chapter::query()->find($chapter->id);

         $moveChapterResp->assertRedirect($chapter->getUrl());
         $this->assertTrue($chapter->book->id === $newBook->id, 'Chapter Book is now the new book');
 
         $moveChapterResp->assertRedirect($chapter->getUrl());
         $this->assertTrue($chapter->book->id === $newBook->id, 'Chapter Book is now the new book');
 


@@ -165,7 +158,7 @@ class SortTest extends TestCase
         $newBookResp->assertSee('moved chapter');
         $newBookResp->assertSee($chapter->name);
 
         $newBookResp->assertSee('moved chapter');
         $newBookResp->assertSee($chapter->name);
 

-        $pageToCheck = Page::find($pageToCheck->id);
+        $pageToCheck = Page::query()->find($pageToCheck->id);

         $this->assertTrue($pageToCheck->book_id === $newBook->id, 'Chapter child page\'s book id has changed to the new book');
         $pageCheckResp = $this->get($pageToCheck->getUrl());
         $pageCheckResp->assertSee($newBook->name);
         $this->assertTrue($pageToCheck->book_id === $newBook->id, 'Chapter child page\'s book id has changed to the new book');
         $pageCheckResp = $this->get($pageToCheck->getUrl());
         $pageCheckResp->assertSee($newBook->name);


@@ -173,13 +166,13 @@ class SortTest extends TestCase
 
     public function test_chapter_move_requires_delete_permissions()
     {
 
     public function test_chapter_move_requires_delete_permissions()
     {

-        $chapter = Chapter::first();
+        $chapter = $this->entities->chapter();

         $currentBook = $chapter->book;
         $currentBook = $chapter->book;

-        $newBook = Book::where('id', '!=', $currentBook->id)->first();
-        $editor = $this->getEditor();
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
+        $editor = $this->users->editor();

 
 

-        $this->setEntityRestrictions($newBook, ['view', 'update', 'create', 'delete'], $editor->roles->all());
-        $this->setEntityRestrictions($chapter, ['view', 'update', 'create'], $editor->roles->all());
+        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'create', 'delete'], $editor->roles->all());
+        $this->permissions->setEntityPermissions($chapter, ['view', 'update', 'create'], $editor->roles->all());

 
         $moveChapterResp = $this->actingAs($editor)->put($chapter->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
 
         $moveChapterResp = $this->actingAs($editor)->put($chapter->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,


@@ -188,12 +181,37 @@ class SortTest extends TestCase
         $pageView = $this->get($chapter->getUrl());
         $pageView->assertDontSee($chapter->getUrl('/move'));
 
         $pageView = $this->get($chapter->getUrl());
         $pageView->assertDontSee($chapter->getUrl('/move'));
 

-        $this->setEntityRestrictions($chapter, ['view', 'update', 'create', 'delete'], $editor->roles->all());
+        $this->permissions->setEntityPermissions($chapter, ['view', 'update', 'create', 'delete'], $editor->roles->all());
+        $moveChapterResp = $this->put($chapter->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+
+        $chapter = Chapter::query()->find($chapter->id);
+        $moveChapterResp->assertRedirect($chapter->getUrl());
+        $this->assertTrue($chapter->book->id == $newBook->id, 'Page book is now the new book');
+    }
+
+    public function test_chapter_move_requires_create_permissions_in_new_book()
+    {
+        $chapter = $this->entities->chapter();
+        $currentBook = $chapter->book;
+        $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
+        $editor = $this->users->editor();
+
+        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'delete'], [$editor->roles->first()]);
+        $this->permissions->setEntityPermissions($chapter, ['view', 'update', 'create', 'delete'], [$editor->roles->first()]);
+
+        $moveChapterResp = $this->actingAs($editor)->put($chapter->getUrl('/move'), [
+            'entity_selection' => 'book:' . $newBook->id,
+        ]);
+        $this->assertPermissionError($moveChapterResp);
+
+        $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'create', 'delete'], [$editor->roles->first()]);

         $moveChapterResp = $this->put($chapter->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
         ]);
 
         $moveChapterResp = $this->put($chapter->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
         ]);
 

-        $chapter = Chapter::find($chapter->id);
+        $chapter = Chapter::query()->find($chapter->id);

         $moveChapterResp->assertRedirect($chapter->getUrl());
         $this->assertTrue($chapter->book->id == $newBook->id, 'Page book is now the new book');
     }
         $moveChapterResp->assertRedirect($chapter->getUrl());
         $this->assertTrue($chapter->book->id == $newBook->id, 'Page book is now the new book');
     }


@@ -218,11 +236,10 @@ class SortTest extends TestCase
 
     public function test_book_sort_page_shows()
     {
 
     public function test_book_sort_page_shows()
     {

-        /** @var Book $bookToSort */
-        $bookToSort = Book::query()->first();
+        $bookToSort = $this->entities->book();

 
         $resp = $this->asAdmin()->get($bookToSort->getUrl());
 
         $resp = $this->asAdmin()->get($bookToSort->getUrl());

-        $resp->assertElementExists('a[href="' . $bookToSort->getUrl('/sort') . '"]');
+        $this->withHtml($resp)->assertElementExists('a[href="' . $bookToSort->getUrl('/sort') . '"]');

 
         $resp = $this->get($bookToSort->getUrl('/sort'));
         $resp->assertStatus(200);
 
         $resp = $this->get($bookToSort->getUrl('/sort'));
         $resp->assertStatus(200);


@@ -231,9 +248,9 @@ class SortTest extends TestCase
 
     public function test_book_sort()
     {
 
     public function test_book_sort()
     {

-        $oldBook = Book::query()->first();
-        $chapterToMove = $this->newChapter(['name' => 'chapter to move'], $oldBook);
-        $newBook = $this->newBook(['name' => 'New sort book']);
+        $oldBook = $this->entities->book();
+        $chapterToMove = $this->entities->newChapter(['name' => 'chapter to move'], $oldBook);
+        $newBook = $this->entities->newBook(['name' => 'New sort book']);

         $pagesToMove = Page::query()->take(5)->get();
 
         // Create request data
         $pagesToMove = Page::query()->take(5)->get();
 
         // Create request data


@@ -268,14 +285,141 @@ class SortTest extends TestCase
         $this->assertTrue($newBook->chapters()->first()->pages()->count() === 1);
 
         $checkPage = $pagesToMove[1];
         $this->assertTrue($newBook->chapters()->first()->pages()->count() === 1);
 
         $checkPage = $pagesToMove[1];

-        $checkResp = $this->get(Page::find($checkPage->id)->getUrl());
+        $checkResp = $this->get($checkPage->refresh()->getUrl());

         $checkResp->assertSee($newBook->name);
     }
 
         $checkResp->assertSee($newBook->name);
     }
 

+    public function test_book_sort_makes_no_changes_if_new_chapter_does_not_align_with_new_book()
+    {
+        $page = $this->entities->pageWithinChapter();
+        $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();
+
+        $sortData = [
+            'id'            => $page->id,
+            'sort'          => 0,
+            'parentChapter' => $otherChapter->id,
+            'type'          => 'page',
+            'book'          => $page->book_id,
+        ];
+        $this->asEditor()->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect();
+
+        $this->assertDatabaseHas('pages', [
+            'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id,
+        ]);
+    }
+
+    public function test_book_sort_makes_no_changes_if_no_view_permissions_on_new_chapter()
+    {
+        $page = $this->entities->pageWithinChapter();
+        /** @var Chapter $otherChapter */
+        $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();
+        $this->permissions->setEntityPermissions($otherChapter);
+
+        $sortData = [
+            'id'            => $page->id,
+            'sort'          => 0,
+            'parentChapter' => $otherChapter->id,
+            'type'          => 'page',
+            'book'          => $otherChapter->book_id,
+        ];
+        $this->asEditor()->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect();
+
+        $this->assertDatabaseHas('pages', [
+            'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id,
+        ]);
+    }
+
+    public function test_book_sort_makes_no_changes_if_no_view_permissions_on_new_book()
+    {
+        $page = $this->entities->pageWithinChapter();
+        /** @var Chapter $otherChapter */
+        $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();
+        $editor = $this->users->editor();
+        $this->permissions->setEntityPermissions($otherChapter->book, ['update', 'delete'], [$editor->roles()->first()]);
+
+        $sortData = [
+            'id'            => $page->id,
+            'sort'          => 0,
+            'parentChapter' => $otherChapter->id,
+            'type'          => 'page',
+            'book'          => $otherChapter->book_id,
+        ];
+        $this->actingAs($editor)->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect();
+
+        $this->assertDatabaseHas('pages', [
+            'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id,
+        ]);
+    }
+
+    public function test_book_sort_makes_no_changes_if_no_update_or_create_permissions_on_new_chapter()
+    {
+        $page = $this->entities->pageWithinChapter();
+        /** @var Chapter $otherChapter */
+        $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();
+        $editor = $this->users->editor();
+        $this->permissions->setEntityPermissions($otherChapter, ['view', 'delete'], [$editor->roles()->first()]);
+
+        $sortData = [
+            'id'            => $page->id,
+            'sort'          => 0,
+            'parentChapter' => $otherChapter->id,
+            'type'          => 'page',
+            'book'          => $otherChapter->book_id,
+        ];
+        $this->actingAs($editor)->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect();
+
+        $this->assertDatabaseHas('pages', [
+            'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id,
+        ]);
+    }
+
+    public function test_book_sort_makes_no_changes_if_no_update_permissions_on_moved_item()
+    {
+        $page = $this->entities->pageWithinChapter();
+        /** @var Chapter $otherChapter */
+        $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();
+        $editor = $this->users->editor();
+        $this->permissions->setEntityPermissions($page, ['view', 'delete'], [$editor->roles()->first()]);
+
+        $sortData = [
+            'id'            => $page->id,
+            'sort'          => 0,
+            'parentChapter' => $otherChapter->id,
+            'type'          => 'page',
+            'book'          => $otherChapter->book_id,
+        ];
+        $this->actingAs($editor)->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect();
+
+        $this->assertDatabaseHas('pages', [
+            'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id,
+        ]);
+    }
+
+    public function test_book_sort_makes_no_changes_if_no_delete_permissions_on_moved_item()
+    {
+        $page = $this->entities->pageWithinChapter();
+        /** @var Chapter $otherChapter */
+        $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();
+        $editor = $this->users->editor();
+        $this->permissions->setEntityPermissions($page, ['view', 'update'], [$editor->roles()->first()]);
+
+        $sortData = [
+            'id'            => $page->id,
+            'sort'          => 0,
+            'parentChapter' => $otherChapter->id,
+            'type'          => 'page',
+            'book'          => $otherChapter->book_id,
+        ];
+        $this->actingAs($editor)->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect();
+
+        $this->assertDatabaseHas('pages', [
+            'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id,
+        ]);
+    }
+

     public function test_book_sort_item_returns_book_content()
     {
     public function test_book_sort_item_returns_book_content()
     {

-        $books = Book::all();
-        $bookToSort = $books[0];
+        $bookToSort = $this->entities->book();

         $firstPage = $bookToSort->pages[0];
         $firstChapter = $bookToSort->chapters[0];
 
         $firstPage = $bookToSort->pages[0];
         $firstChapter = $bookToSort->chapters[0];
 


@@ -289,22 +433,21 @@ class SortTest extends TestCase
 
     public function test_pages_in_book_show_sorted_by_priority()
     {
 
     public function test_pages_in_book_show_sorted_by_priority()
     {

-        /** @var Book $book */
-        $book = Book::query()->whereHas('pages')->first();
+        $book = $this->entities->bookHasChaptersAndPages();

         $book->chapters()->forceDelete();
         /** @var Page[] $pages */
         $pages = $book->pages()->where('chapter_id', '=', 0)->take(2)->get();
         $book->pages()->whereNotIn('id', $pages->pluck('id'))->delete();
 
         $resp = $this->asEditor()->get($book->getUrl());
         $book->chapters()->forceDelete();
         /** @var Page[] $pages */
         $pages = $book->pages()->where('chapter_id', '=', 0)->take(2)->get();
         $book->pages()->whereNotIn('id', $pages->pluck('id'))->delete();
 
         $resp = $this->asEditor()->get($book->getUrl());

-        $resp->assertElementContains('.content-wrap a.page:nth-child(1)', $pages[0]->name);
-        $resp->assertElementContains('.content-wrap a.page:nth-child(2)', $pages[1]->name);
+        $this->withHtml($resp)->assertElementContains('.content-wrap a.page:nth-child(1)', $pages[0]->name);
+        $this->withHtml($resp)->assertElementContains('.content-wrap a.page:nth-child(2)', $pages[1]->name);

 
         $pages[0]->forceFill(['priority' => 10])->save();
         $pages[1]->forceFill(['priority' => 5])->save();
 
         $resp = $this->asEditor()->get($book->getUrl());
 
         $pages[0]->forceFill(['priority' => 10])->save();
         $pages[1]->forceFill(['priority' => 5])->save();
 
         $resp = $this->asEditor()->get($book->getUrl());

-        $resp->assertElementContains('.content-wrap a.page:nth-child(1)', $pages[1]->name);
-        $resp->assertElementContains('.content-wrap a.page:nth-child(2)', $pages[0]->name);
+        $this->withHtml($resp)->assertElementContains('.content-wrap a.page:nth-child(1)', $pages[1]->name);
+        $this->withHtml($resp)->assertElementContains('.content-wrap a.page:nth-child(2)', $pages[0]->name);

     }
 }
     }
 }