X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/d3ca23b195cf2484ac5eaeea0b0e8cb4ca0aad48..86e7386db9c840973e43bcd72d8b36efd2ee4b9b:/tests/Entity/SortTest.php diff --git a/tests/Entity/SortTest.php b/tests/Entity/SortTest.php index dcca426f7..7b10278b0 100644 --- a/tests/Entity/SortTest.php +++ b/tests/Entity/SortTest.php @@ -198,6 +198,31 @@ class SortTest extends TestCase $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 = Chapter::query()->first(); + $currentBook = $chapter->book; + $newBook = Book::query()->where('id', '!=', $currentBook->id)->first(); + $editor = $this->getEditor(); + + $this->setEntityRestrictions($newBook, ['view', 'update', 'delete'], [$editor->roles->first()]); + $this->setEntityRestrictions($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->setEntityRestrictions($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 */ @@ -239,20 +264,20 @@ class SortTest extends TestCase // 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, ]; } @@ -260,8 +285,8 @@ class SortTest extends TestCase $sortResp->assertRedirect($newBook->getUrl()); $sortResp->assertStatus(302); $this->assertDatabaseHas('chapters', [ - 'id' => $chapterToMove->id, - 'book_id' => $newBook->id, + 'id' => $chapterToMove->id, + 'book_id' => $newBook->id, 'priority' => 0, ]); $this->assertTrue($newBook->chapters()->count() === 1); @@ -279,11 +304,11 @@ class SortTest extends TestCase $otherChapter = Chapter::query()->where('book_id', '!=', $page->book_id)->first(); $sortData = [ - 'id' => $page->id, - 'sort' => 0, + 'id' => $page->id, + 'sort' => 0, 'parentChapter' => $otherChapter->id, - 'type' => 'page', - 'book' => $page->book_id, + 'type' => 'page', + 'book' => $page->book_id, ]; $this->asEditor()->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect(); @@ -301,11 +326,11 @@ class SortTest extends TestCase $this->setEntityRestrictions($otherChapter); $sortData = [ - 'id' => $page->id, - 'sort' => 0, + 'id' => $page->id, + 'sort' => 0, 'parentChapter' => $otherChapter->id, - 'type' => 'page', - 'book' => $otherChapter->book_id, + 'type' => 'page', + 'book' => $otherChapter->book_id, ]; $this->asEditor()->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect(); @@ -324,11 +349,11 @@ class SortTest extends TestCase $this->setEntityRestrictions($otherChapter->book, ['update', 'delete'], [$editor->roles()->first()]); $sortData = [ - 'id' => $page->id, - 'sort' => 0, + 'id' => $page->id, + 'sort' => 0, 'parentChapter' => $otherChapter->id, - 'type' => 'page', - 'book' => $otherChapter->book_id, + 'type' => 'page', + 'book' => $otherChapter->book_id, ]; $this->actingAs($editor)->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect(); @@ -347,11 +372,11 @@ class SortTest extends TestCase $this->setEntityRestrictions($otherChapter, ['view', 'delete'], [$editor->roles()->first()]); $sortData = [ - 'id' => $page->id, - 'sort' => 0, + 'id' => $page->id, + 'sort' => 0, 'parentChapter' => $otherChapter->id, - 'type' => 'page', - 'book' => $otherChapter->book_id, + 'type' => 'page', + 'book' => $otherChapter->book_id, ]; $this->actingAs($editor)->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect(); @@ -370,11 +395,11 @@ class SortTest extends TestCase $this->setEntityRestrictions($page, ['view', 'delete'], [$editor->roles()->first()]); $sortData = [ - 'id' => $page->id, - 'sort' => 0, + 'id' => $page->id, + 'sort' => 0, 'parentChapter' => $otherChapter->id, - 'type' => 'page', - 'book' => $otherChapter->book_id, + 'type' => 'page', + 'book' => $otherChapter->book_id, ]; $this->actingAs($editor)->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect(); @@ -393,11 +418,11 @@ class SortTest extends TestCase $this->setEntityRestrictions($page, ['view', 'update'], [$editor->roles()->first()]); $sortData = [ - 'id' => $page->id, - 'sort' => 0, + 'id' => $page->id, + 'sort' => 0, 'parentChapter' => $otherChapter->id, - 'type' => 'page', - 'book' => $otherChapter->book_id, + 'type' => 'page', + 'book' => $otherChapter->book_id, ]; $this->actingAs($editor)->put($page->book->getUrl('/sort'), ['sort-tree' => json_encode([$sortData])])->assertRedirect(); @@ -406,7 +431,6 @@ class SortTest extends TestCase ]); } - public function test_book_sort_item_returns_book_content() { $books = Book::all();