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 8792e70db31b57d2b678d625533a51af83c4f67a..9a5a2fe175a43ed0a2bbdd614f60b106ebdd9bb4 100644 (file)
--- a/tests/Entity/SortTest.php
+++ b/tests/Entity/SortTest.php
@@ -10,30 +10,23 @@ 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::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();
 


@@ -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::query()->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::query()->first();
+        $page = $this->entities->page();

         $currentBook = $page->book;
         $newBook = Book::query()->where('id', '!=', $currentBook->id)->first();
         $newChapter = $newBook->chapters()->first();
 
         $currentBook = $page->book;
         $newBook = Book::query()->where('id', '!=', $currentBook->id)->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::query()->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');


@@ -78,7 +71,7 @@ class SortTest extends TestCase
         $page = $oldChapter->pages()->first();
         $newBook = Book::query()->where('id', '!=', $oldChapter->book_id)->first();
 
         $page = $oldChapter->pages()->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::query()->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::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', '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,19 +126,19 @@ 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::query()->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::query()->first();
+        $chapter = $this->entities->chapter();

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


@@ -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::query()->first();
+        $chapter = $this->entities->chapter();

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

-        $editor = $this->getEditor();
+        $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,7 +181,7 @@ 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,
         ]);
         $moveChapterResp = $this->put($chapter->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
         ]);


@@ -200,20 +193,20 @@ class SortTest extends TestCase
 
     public function test_chapter_move_requires_create_permissions_in_new_book()
     {
 
     public function test_chapter_move_requires_create_permissions_in_new_book()
     {

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

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

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

 
 

-        $this->setEntityRestrictions($newBook, ['view', 'update', 'delete'], [$editor->roles->first()]);
-        $this->setEntityRestrictions($chapter, ['view', 'update', 'create', 'delete'], [$editor->roles->first()]);
+        $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);
 
 
         $moveChapterResp = $this->actingAs($editor)->put($chapter->getUrl('/move'), [
             'entity_selection' => 'book:' . $newBook->id,
         ]);
         $this->assertPermissionError($moveChapterResp);
 

-        $this->setEntityRestrictions($newBook, ['view', 'update', 'create', 'delete'], [$editor->roles->first()]);
+        $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,
         ]);


@@ -243,8 +236,7 @@ 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());
         $this->withHtml($resp)->assertElementExists('a[href="' . $bookToSort->getUrl('/sort') . '"]');
 
         $resp = $this->asAdmin()->get($bookToSort->getUrl());
         $this->withHtml($resp)->assertElementExists('a[href="' . $bookToSort->getUrl('/sort') . '"]');


@@ -256,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


@@ -299,8 +291,7 @@ class SortTest extends TestCase
 
     public function test_book_sort_makes_no_changes_if_new_chapter_does_not_align_with_new_book()
     {
 
     public function test_book_sort_makes_no_changes_if_new_chapter_does_not_align_with_new_book()
     {

-        /** @var Page $page */
-        $page = Page::query()->where('chapter_id', '!=', 0)->first();
+        $page = $this->entities->pageWithinChapter();

         $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();
 
         $sortData = [
         $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();
 
         $sortData = [


@@ -319,11 +310,10 @@ class SortTest extends TestCase
 
     public function test_book_sort_makes_no_changes_if_no_view_permissions_on_new_chapter()
     {
 
     public function test_book_sort_makes_no_changes_if_no_view_permissions_on_new_chapter()
     {

-        /** @var Page $page */
-        $page = Page::query()->where('chapter_id', '!=', 0)->first();
+        $page = $this->entities->pageWithinChapter();

         /** @var Chapter $otherChapter */
         $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();
         /** @var Chapter $otherChapter */
         $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();

-        $this->setEntityRestrictions($otherChapter);
+        $this->permissions->setEntityPermissions($otherChapter);

 
         $sortData = [
             'id'            => $page->id,
 
         $sortData = [
             'id'            => $page->id,


@@ -341,12 +331,11 @@ class SortTest extends TestCase
 
     public function test_book_sort_makes_no_changes_if_no_view_permissions_on_new_book()
     {
 
     public function test_book_sort_makes_no_changes_if_no_view_permissions_on_new_book()
     {

-        /** @var Page $page */
-        $page = Page::query()->where('chapter_id', '!=', 0)->first();
+        $page = $this->entities->pageWithinChapter();

         /** @var Chapter $otherChapter */
         $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();
         /** @var Chapter $otherChapter */
         $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();

-        $editor = $this->getEditor();
-        $this->setEntityRestrictions($otherChapter->book, ['update', 'delete'], [$editor->roles()->first()]);
+        $editor = $this->users->editor();
+        $this->permissions->setEntityPermissions($otherChapter->book, ['update', 'delete'], [$editor->roles()->first()]);

 
         $sortData = [
             'id'            => $page->id,
 
         $sortData = [
             'id'            => $page->id,


@@ -364,12 +353,11 @@ class SortTest extends TestCase
 
     public function test_book_sort_makes_no_changes_if_no_update_or_create_permissions_on_new_chapter()
     {
 
     public function test_book_sort_makes_no_changes_if_no_update_or_create_permissions_on_new_chapter()
     {

-        /** @var Page $page */
-        $page = Page::query()->where('chapter_id', '!=', 0)->first();
+        $page = $this->entities->pageWithinChapter();

         /** @var Chapter $otherChapter */
         $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();
         /** @var Chapter $otherChapter */
         $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();

-        $editor = $this->getEditor();
-        $this->setEntityRestrictions($otherChapter, ['view', 'delete'], [$editor->roles()->first()]);
+        $editor = $this->users->editor();
+        $this->permissions->setEntityPermissions($otherChapter, ['view', 'delete'], [$editor->roles()->first()]);

 
         $sortData = [
             'id'            => $page->id,
 
         $sortData = [
             'id'            => $page->id,


@@ -387,12 +375,11 @@ class SortTest extends TestCase
 
     public function test_book_sort_makes_no_changes_if_no_update_permissions_on_moved_item()
     {
 
     public function test_book_sort_makes_no_changes_if_no_update_permissions_on_moved_item()
     {

-        /** @var Page $page */
-        $page = Page::query()->where('chapter_id', '!=', 0)->first();
+        $page = $this->entities->pageWithinChapter();

         /** @var Chapter $otherChapter */
         $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();
         /** @var Chapter $otherChapter */
         $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();

-        $editor = $this->getEditor();
-        $this->setEntityRestrictions($page, ['view', 'delete'], [$editor->roles()->first()]);
+        $editor = $this->users->editor();
+        $this->permissions->setEntityPermissions($page, ['view', 'delete'], [$editor->roles()->first()]);

 
         $sortData = [
             'id'            => $page->id,
 
         $sortData = [
             'id'            => $page->id,


@@ -410,12 +397,11 @@ class SortTest extends TestCase
 
     public function test_book_sort_makes_no_changes_if_no_delete_permissions_on_moved_item()
     {
 
     public function test_book_sort_makes_no_changes_if_no_delete_permissions_on_moved_item()
     {

-        /** @var Page $page */
-        $page = Page::query()->where('chapter_id', '!=', 0)->first();
+        $page = $this->entities->pageWithinChapter();

         /** @var Chapter $otherChapter */
         $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();
         /** @var Chapter $otherChapter */
         $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first();

-        $editor = $this->getEditor();
-        $this->setEntityRestrictions($page, ['view', 'update'], [$editor->roles()->first()]);
+        $editor = $this->users->editor();
+        $this->permissions->setEntityPermissions($page, ['view', 'update'], [$editor->roles()->first()]);

 
         $sortData = [
             'id'            => $page->id,
 
         $sortData = [
             'id'            => $page->id,


@@ -433,8 +419,7 @@ class SortTest extends TestCase
 
     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];
 


@@ -448,8 +433,7 @@ 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->chapters()->forceDelete();
         /** @var Page[] $pages */
         $pages = $book->pages()->where('chapter_id', '=', 0)->take(2)->get();