From 6caedc7a37a5ca6cee39b69c3c651230a5e30b52 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 15 Feb 2020 19:09:33 +0000 Subject: [PATCH] Fixed issues preventing breadcrumb navigation menus from opening - Added tests to cover endpoint Fixes #1884 --- app/Entities/Book.php | 2 +- app/Http/Controllers/SearchController.php | 2 +- tests/Entity/EntitySearchTest.php | 84 +++++++++++++++++++++-- 3 files changed, 80 insertions(+), 8 deletions(-) diff --git a/app/Entities/Book.php b/app/Entities/Book.php index 919f60035..df0d99228 100644 --- a/app/Entities/Book.php +++ b/app/Entities/Book.php @@ -115,7 +115,7 @@ class Book extends Entity implements HasCoverImage { $pages = $this->directPages()->visible()->get(); $chapters = $this->chapters()->visible()->get(); - return $pages->contact($chapters)->sortBy('priority')->sortByDesc('draft'); + return $pages->concat($chapters)->sortBy('priority')->sortByDesc('draft'); } /** diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index a5cd7ad6b..a5d57741d 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -109,7 +109,7 @@ class SearchController extends Controller // Page in chapter if ($entity->isA('page') && $entity->chapter) { - $entities = $entity->chapter->visiblePages(); + $entities = $entity->chapter->getVisiblePages(); } // Page in book or chapter diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php index 3eb50a412..34c3cd4a8 100644 --- a/tests/Entity/EntitySearchTest.php +++ b/tests/Entity/EntitySearchTest.php @@ -1,6 +1,7 @@ first(); + $book = Book::all()->first(); $page = $book->pages->first(); $search = $this->asEditor()->get('/search?term=' . urlencode($page->name)); @@ -54,7 +55,7 @@ class EntitySearchTest extends TestCase public function test_book_search() { - $book = \BookStack\Entities\Book::first(); + $book = Book::first(); $page = $book->pages->last(); $chapter = $book->chapters->last(); @@ -67,7 +68,7 @@ class EntitySearchTest extends TestCase public function test_chapter_search() { - $chapter = \BookStack\Entities\Chapter::has('pages')->first(); + $chapter = Chapter::has('pages')->first(); $page = $chapter->pages[0]; $pageTestResp = $this->asEditor()->get('/search/chapter/' . $chapter->id . '?term=' . urlencode($page->name)); @@ -77,11 +78,11 @@ class EntitySearchTest extends TestCase public function test_tag_search() { $newTags = [ - new \BookStack\Actions\Tag([ + new Tag([ 'name' => 'animal', 'value' => 'cat' ]), - new \BookStack\Actions\Tag([ + new Tag([ 'name' => 'color', 'value' => 'red' ]) @@ -204,4 +205,75 @@ class EntitySearchTest extends TestCase $chapterSearch->assertSee($chapter->name); $chapterSearch->assertSee($chapter->book->getShortName(42)); } + + public function test_sibling_search_for_pages() + { + $chapter = Chapter::query()->with('pages')->first(); + $this->assertGreaterThan(2, count($chapter->pages), 'Ensure we\'re testing with at least 1 sibling'); + $page = $chapter->pages->first(); + + $search = $this->actingAs($this->getViewer())->get("/search/entity/siblings?entity_id={$page->id}&entity_type=page"); + $search->assertSuccessful(); + foreach ($chapter->pages as $page) { + $search->assertSee($page->name); + } + + $search->assertDontSee($chapter->name); + } + + public function test_sibling_search_for_pages_without_chapter() + { + $page = Page::query()->where('chapter_id', '=', 0)->firstOrFail(); + $bookChildren = $page->book->getDirectChildren(); + $this->assertGreaterThan(2, count($bookChildren), 'Ensure we\'re testing with at least 1 sibling'); + + $search = $this->actingAs($this->getViewer())->get("/search/entity/siblings?entity_id={$page->id}&entity_type=page"); + $search->assertSuccessful(); + foreach ($bookChildren as $child) { + $search->assertSee($child->name); + } + + $search->assertDontSee($page->book->name); + } + + public function test_sibling_search_for_chapters() + { + $chapter = Chapter::query()->firstOrFail(); + $bookChildren = $chapter->book->getDirectChildren(); + $this->assertGreaterThan(2, count($bookChildren), 'Ensure we\'re testing with at least 1 sibling'); + + $search = $this->actingAs($this->getViewer())->get("/search/entity/siblings?entity_id={$chapter->id}&entity_type=chapter"); + $search->assertSuccessful(); + foreach ($bookChildren as $child) { + $search->assertSee($child->name); + } + + $search->assertDontSee($chapter->book->name); + } + + public function test_sibling_search_for_books() + { + $books = Book::query()->take(10)->get(); + $book = $books->first(); + $this->assertGreaterThan(2, count($books), 'Ensure we\'re testing with at least 1 sibling'); + + $search = $this->actingAs($this->getViewer())->get("/search/entity/siblings?entity_id={$book->id}&entity_type=book"); + $search->assertSuccessful(); + foreach ($books as $expectedBook) { + $search->assertSee($expectedBook->name); + } + } + + public function test_sibling_search_for_shelves() + { + $shelves = Bookshelf::query()->take(10)->get(); + $shelf = $shelves->first(); + $this->assertGreaterThan(2, count($shelves), 'Ensure we\'re testing with at least 1 sibling'); + + $search = $this->actingAs($this->getViewer())->get("/search/entity/siblings?entity_id={$shelf->id}&entity_type=bookshelf"); + $search->assertSuccessful(); + foreach ($shelves as $expectedShelf) { + $search->assertSee($expectedShelf->name); + } + } }