X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/712ccd23c4738e6a59a10f31ff654743fbc61879..06901b878f2c8057a6f9b7d2e0adfda425c68dee:/tests/Entity/SortTest.php diff --git a/tests/Entity/SortTest.php b/tests/Entity/SortTest.php index d510a20ca..9a5a2fe17 100644 --- a/tests/Entity/SortTest.php +++ b/tests/Entity/SortTest.php @@ -1,47 +1,42 @@ -book = Book::first(); - } - 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 = $this->get($this->book->getUrl() . '/sort'); + $resp = $this->get($book->getUrl() . '/sort'); $resp->assertDontSee($draft->name); } public function test_page_move_into_book() { - $page = Page::first(); + $page = $this->entities->page(); $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'); $movePageResp = $this->put($page->getUrl('/move'), [ - 'entity_selection' => 'book:' . $newBook->id + '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'); @@ -53,15 +48,15 @@ class SortTest extends TestCase public function test_page_move_into_chapter() { - $page = Page::first(); + $page = $this->entities->page(); $currentBook = $page->book; - $newBook = Book::where('id', '!=', $currentBook->id)->first(); + $newBook = Book::query()->where('id', '!=', $currentBook->id)->first(); $newChapter = $newBook->chapters()->first(); - $movePageResp = $this->actingAs($this->getEditor())->put($page->getUrl('/move'), [ - 'entity_selection' => 'chapter:' . $newChapter->id + $movePageResp = $this->actingAs($this->users->editor())->put($page->getUrl('/move'), [ + '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'); @@ -72,12 +67,12 @@ class SortTest extends TestCase public function test_page_move_from_chapter_to_book() { - $oldChapter = Chapter::first(); + $oldChapter = Chapter::query()->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'), [ - 'entity_selection' => 'book:' . $newBook->id + $movePageResp = $this->actingAs($this->users->editor())->put($page->getUrl('/move'), [ + 'entity_selection' => 'book:' . $newBook->id, ]); $page->refresh(); @@ -91,24 +86,24 @@ class SortTest extends TestCase public function test_page_move_requires_create_permissions_on_parent() { - $page = Page::first(); + $page = $this->entities->page(); $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', 'delete'], $editor->roles); + $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'delete'], $editor->roles->all()); $movePageResp = $this->actingAs($editor)->put($page->getUrl('/move'), [ - 'entity_selection' => 'book:' . $newBook->id + 'entity_selection' => 'book:' . $newBook->id, ]); $this->assertPermissionError($movePageResp); - $this->setEntityRestrictions($newBook, ['view', 'update', 'delete', 'create'], $editor->roles); + $this->permissions->setEntityPermissions($newBook, ['view', 'update', 'delete', 'create'], $editor->roles->all()); $movePageResp = $this->put($page->getUrl('/move'), [ - 'entity_selection' => 'book:' . $newBook->id + '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'); @@ -116,46 +111,46 @@ class SortTest extends TestCase public function test_page_move_requires_delete_permissions() { - $page = Page::first(); + $page = $this->entities->page(); $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); - $this->setEntityRestrictions($page, ['view', 'update', 'create'], $editor->roles); + $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 + 'entity_selection' => 'book:' . $newBook->id, ]); $this->assertPermissionError($movePageResp); $pageView = $this->get($page->getUrl()); $pageView->assertDontSee($page->getUrl('/move')); - $this->setEntityRestrictions($page, ['view', 'update', 'create', 'delete'], $editor->roles); + $this->permissions->setEntityPermissions($page, ['view', 'update', 'create', 'delete'], $editor->roles->all()); $movePageResp = $this->put($page->getUrl('/move'), [ - 'entity_selection' => 'book:' . $newBook->id + '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() { - $chapter = Chapter::first(); + $chapter = $this->entities->chapter(); $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'); $moveChapterResp = $this->put($chapter->getUrl('/move'), [ - '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'); @@ -163,7 +158,7 @@ class SortTest extends TestCase $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); @@ -171,55 +166,110 @@ class SortTest extends TestCase public function test_chapter_move_requires_delete_permissions() { - $chapter = Chapter::first(); + $chapter = $this->entities->chapter(); $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); - $this->setEntityRestrictions($chapter, ['view', 'update', 'create'], $editor->roles); + $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 + 'entity_selection' => 'book:' . $newBook->id, ]); $this->assertPermissionError($moveChapterResp); $pageView = $this->get($chapter->getUrl()); $pageView->assertDontSee($chapter->getUrl('/move')); - $this->setEntityRestrictions($chapter, ['view', 'update', 'create', 'delete'], $editor->roles); + $this->permissions->setEntityPermissions($chapter, ['view', 'update', 'create', 'delete'], $editor->roles->all()); $moveChapterResp = $this->put($chapter->getUrl('/move'), [ - '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, '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, + ]); + + $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_changes_book_for_deleted_pages_within() + { + /** @var Chapter $chapter */ + $chapter = Chapter::query()->whereHas('pages')->first(); + $currentBook = $chapter->book; + $pageToCheck = $chapter->pages->first(); + $newBook = Book::query()->where('id', '!=', $currentBook->id)->first(); + + $pageToCheck->delete(); + + $this->asEditor()->put($chapter->getUrl('/move'), [ + 'entity_selection' => 'book:' . $newBook->id, + ]); + + $pageToCheck->refresh(); + $this->assertEquals($newBook->id, $pageToCheck->book_id); + } + + public function test_book_sort_page_shows() + { + $bookToSort = $this->entities->book(); + + $resp = $this->asAdmin()->get($bookToSort->getUrl()); + $this->withHtml($resp)->assertElementExists('a[href="' . $bookToSort->getUrl('/sort') . '"]'); + + $resp = $this->get($bookToSort->getUrl('/sort')); + $resp->assertStatus(200); + $resp->assertSee($bookToSort->name); + } + 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 $reqData = [ [ - 'id' => $chapterToMove->id, - 'sort' => 0, + 'id' => $chapterToMove->id, + 'sort' => 0, 'parentChapter' => false, - 'type' => 'chapter', - 'book' => $newBook->id - ] + 'type' => 'chapter', + 'book' => $newBook->id, + ], ]; foreach ($pagesToMove as $index => $page) { $reqData[] = [ - 'id' => $page->id, - 'sort' => $index, + 'id' => $page->id, + 'sort' => $index, 'parentChapter' => $index === count($pagesToMove) - 1 ? $chapterToMove->id : false, - 'type' => 'page', - 'book' => $newBook->id + 'type' => 'page', + 'book' => $newBook->id, ]; } @@ -227,85 +277,177 @@ class SortTest extends TestCase $sortResp->assertRedirect($newBook->getUrl()); $sortResp->assertStatus(302); $this->assertDatabaseHas('chapters', [ - 'id' => $chapterToMove->id, - 'book_id' => $newBook->id, - 'priority' => 0 + 'id' => $chapterToMove->id, + 'book_id' => $newBook->id, + 'priority' => 0, ]); $this->assertTrue($newBook->chapters()->count() === 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); } - public function test_page_copy() + public function test_book_sort_makes_no_changes_if_new_chapter_does_not_align_with_new_book() { - $page = Page::first(); - $currentBook = $page->book; - $newBook = Book::where('id', '!=', $currentBook->id)->first(); - - $resp = $this->asEditor()->get($page->getUrl('/copy')); - $resp->assertSee('Copy Page'); + $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(); - $movePageResp = $this->post($page->getUrl('/copy'), [ - 'entity_selection' => 'book:' . $newBook->id, - 'name' => 'My copied test page' + $this->assertDatabaseHas('pages', [ + 'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id, ]); - $pageCopy = Page::where('name', '=', 'My copied test page')->first(); - - $movePageResp->assertRedirect($pageCopy->getUrl()); - $this->assertTrue($pageCopy->book->id == $newBook->id, 'Page was copied to correct book'); } - public function test_page_copy_with_no_destination() + public function test_book_sort_makes_no_changes_if_no_view_permissions_on_new_chapter() { - $page = Page::first(); - $currentBook = $page->book; - - $resp = $this->asEditor()->get($page->getUrl('/copy')); - $resp->assertSee('Copy Page'); + $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(); - $movePageResp = $this->post($page->getUrl('/copy'), [ - 'name' => 'My copied test page' + $this->assertDatabaseHas('pages', [ + 'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id, ]); + } - $pageCopy = Page::where('name', '=', 'My copied test page')->first(); + 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(); - $movePageResp->assertRedirect($pageCopy->getUrl()); - $this->assertTrue($pageCopy->book->id == $currentBook->id, 'Page was copied to correct book'); - $this->assertTrue($pageCopy->id !== $page->id, 'Page copy is not the same instance'); + $this->assertDatabaseHas('pages', [ + 'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id, + ]); } - public function test_page_can_be_copied_without_edit_permission() + public function test_book_sort_makes_no_changes_if_no_update_or_create_permissions_on_new_chapter() { - $page = Page::first(); - $currentBook = $page->book; - $newBook = Book::where('id', '!=', $currentBook->id)->first(); - $viewer = $this->getViewer(); - - $resp = $this->actingAs($viewer)->get($page->getUrl()); - $resp->assertDontSee($page->getUrl('/copy')); + $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(); - $newBook->created_by = $viewer->id; - $newBook->save(); - $this->giveUserPermissions($viewer, ['page-create-own']); - $this->regenEntityPermissions($newBook); + $this->assertDatabaseHas('pages', [ + 'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id, + ]); + } - $resp = $this->actingAs($viewer)->get($page->getUrl()); - $resp->assertSee($page->getUrl('/copy')); + 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(); - $movePageResp = $this->post($page->getUrl('/copy'), [ - 'entity_selection' => 'book:' . $newBook->id, - 'name' => 'My copied test page' + $this->assertDatabaseHas('pages', [ + 'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id, ]); - $movePageResp->assertRedirect(); + } + + 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', [ - 'name' => 'My copied test page', - 'created_by' => $viewer->id, - 'book_id' => $newBook->id, + 'id' => $page->id, 'chapter_id' => $page->chapter_id, 'book_id' => $page->book_id, ]); } -} \ No newline at end of file + public function test_book_sort_item_returns_book_content() + { + $bookToSort = $this->entities->book(); + $firstPage = $bookToSort->pages[0]; + $firstChapter = $bookToSort->chapters[0]; + + $resp = $this->asAdmin()->get($bookToSort->getUrl() . '/sort-item'); + + // Ensure book details are returned + $resp->assertSee($bookToSort->name); + $resp->assertSee($firstPage->name); + $resp->assertSee($firstChapter->name); + } + + public function test_pages_in_book_show_sorted_by_priority() + { + $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()); + $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()); + $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); + } +}