X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/cd6572b61af2165133468d2562d04dffdca8fca8..refs/pull/1630/head:/tests/Entity/EntityTest.php diff --git a/tests/Entity/EntityTest.php b/tests/Entity/EntityTest.php index 9fd4eb9ad..a3fb1cfe1 100644 --- a/tests/Entity/EntityTest.php +++ b/tests/Entity/EntityTest.php @@ -1,13 +1,18 @@ -bookCreation(); $chapter = $this->chapterCreation($book); @@ -20,7 +25,7 @@ class EntityTest extends TestCase $this->bookDelete($book); } - public function bookDelete(\BookStack\Book $book) + public function bookDelete(Book $book) { $this->asAdmin() ->visit($book->getUrl()) @@ -34,7 +39,7 @@ class EntityTest extends TestCase ->notSeeInDatabase('books', ['id' => $book->id]); } - public function bookUpdate(\BookStack\Book $book) + public function bookUpdate(Book $book) { $newName = $book->name . ' Updated'; $this->asAdmin() @@ -48,26 +53,24 @@ class EntityTest extends TestCase ->seePageIs($book->getUrl() . '-updated') ->see($newName); - return \BookStack\Book::find($book->id); + return Book::find($book->id); } public function test_book_sort_page_shows() { - $books = \BookStack\Book::all(); + $books = Book::all(); $bookToSort = $books[0]; $this->asAdmin() ->visit($bookToSort->getUrl()) ->click('Sort') ->seePageIs($bookToSort->getUrl() . '/sort') ->seeStatusCode(200) - ->see($bookToSort->name) - // Ensure page shows other books - ->see($books[1]->name); + ->see($bookToSort->name); } public function test_book_sort_item_returns_book_content() { - $books = \BookStack\Book::all(); + $books = Book::all(); $bookToSort = $books[0]; $firstPage = $bookToSort->pages[0]; $firstChapter = $bookToSort->chapters[0]; @@ -79,9 +82,30 @@ class EntityTest extends TestCase ->see($firstChapter->name); } + public function test_toggle_book_view() + { + $editor = $this->getEditor(); + setting()->putUser($editor, 'books_view_type', 'grid'); + + $this->actingAs($editor) + ->visit('/books') + ->pageHasElement('.featured-image-container') + ->submitForm('List View') + // Check redirection. + ->seePageIs('/books') + ->pageNotHasElement('.featured-image-container'); + + $this->actingAs($editor) + ->visit('/books') + ->submitForm('Grid View') + ->seePageIs('/books') + ->pageHasElement('.featured-image-container'); + + } + public function pageCreation($chapter) { - $page = factory(\BookStack\Page::class)->make([ + $page = factory(Page::class)->make([ 'name' => 'My First Page' ]); @@ -90,7 +114,7 @@ class EntityTest extends TestCase ->visit($chapter->getUrl()) ->click('New Page'); - $draftPage = \BookStack\Page::where('draft', '=', true)->orderBy('created_at', 'desc')->first(); + $draftPage = Page::where('draft', '=', true)->orderBy('created_at', 'desc')->first(); $this->seePageIs($draftPage->getUrl()) // Fill out form @@ -101,13 +125,13 @@ class EntityTest extends TestCase ->seePageIs($chapter->book->getUrl() . '/page/my-first-page') ->see($page->name); - $page = \BookStack\Page::where('slug', '=', 'my-first-page')->where('chapter_id', '=', $chapter->id)->first(); + $page = Page::where('slug', '=', 'my-first-page')->where('chapter_id', '=', $chapter->id)->first(); return $page; } - public function chapterCreation(\BookStack\Book $book) + public function chapterCreation(Book $book) { - $chapter = factory(\BookStack\Chapter::class)->make([ + $chapter = factory(Chapter::class)->make([ 'name' => 'My First Chapter' ]); @@ -115,7 +139,7 @@ class EntityTest extends TestCase // Navigate to chapter create page ->visit($book->getUrl()) ->click('New Chapter') - ->seePageIs($book->getUrl() . '/chapter/create') + ->seePageIs($book->getUrl() . '/create-chapter') // Fill out form ->type($chapter->name, '#name') ->type($chapter->description, '#description') @@ -124,20 +148,20 @@ class EntityTest extends TestCase ->seePageIs($book->getUrl() . '/chapter/my-first-chapter') ->see($chapter->name)->see($chapter->description); - $chapter = \BookStack\Chapter::where('slug', '=', 'my-first-chapter')->where('book_id', '=', $book->id)->first(); + $chapter = Chapter::where('slug', '=', 'my-first-chapter')->where('book_id', '=', $book->id)->first(); return $chapter; } public function bookCreation() { - $book = factory(\BookStack\Book::class)->make([ + $book = factory(Book::class)->make([ 'name' => 'My First Book' ]); $this->asAdmin() ->visit('/books') // Choose to create a book ->click('Create New Book') - ->seePageIs('/books/create') + ->seePageIs('/create-book') // Fill out form & save ->type($book->name, '#name') ->type($book->description, '#description') @@ -148,15 +172,15 @@ class EntityTest extends TestCase // Ensure duplicate names are given different slugs $this->asAdmin() - ->visit('/books/create') + ->visit('/create-book') ->type($book->name, '#name') ->type($book->description, '#description') ->press('Save Book'); - + $expectedPattern = '/\/books\/my-first-book-[0-9a-zA-Z]{3}/'; $this->assertRegExp($expectedPattern, $this->currentUri, "Did not land on expected page [$expectedPattern].\n"); - $book = \BookStack\Book::where('slug', '=', 'my-first-book')->first(); + $book = Book::where('slug', '=', 'my-first-book')->first(); return $book; } @@ -167,8 +191,8 @@ class EntityTest extends TestCase $updater = $this->getEditor(); $entities = $this->createEntityChainBelongingToUser($creator, $updater); $this->actingAs($creator); - app('BookStack\Repos\UserRepo')->destroy($creator); - app('BookStack\Repos\EntityRepo')->savePageRevision($entities['page']); + app(UserRepo::class)->destroy($creator); + app(PageRepo::class)->savePageRevision($entities['page']); $this->checkEntitiesViewable($entities); } @@ -180,8 +204,8 @@ class EntityTest extends TestCase $updater = $this->getEditor(); $entities = $this->createEntityChainBelongingToUser($creator, $updater); $this->actingAs($updater); - app('BookStack\Repos\UserRepo')->destroy($updater); - app('BookStack\Repos\EntityRepo')->savePageRevision($entities['page']); + app(UserRepo::class)->destroy($updater); + app(PageRepo::class)->savePageRevision($entities['page']); $this->checkEntitiesViewable($entities); } @@ -198,15 +222,6 @@ class EntityTest extends TestCase ->click('Revisions')->seeStatusCode(200); } - public function test_recently_created_pages_view() - { - $user = $this->getEditor(); - $content = $this->createEntityChainBelongingToUser($user); - - $this->asAdmin()->visit('/pages/recently-created') - ->seeInNthElement('.entity-list .page', 0, $content['page']->name); - } - public function test_recently_updated_pages_view() { $user = $this->getEditor(); @@ -218,7 +233,7 @@ class EntityTest extends TestCase public function test_old_page_slugs_redirect_to_new_pages() { - $page = \BookStack\Page::first(); + $page = Page::first(); $pageUrl = $page->getUrl(); $newPageUrl = '/books/' . $page->book->slug . '/page/super-test-page'; // Need to save twice since revisions are not generated in seeder. @@ -227,7 +242,7 @@ class EntityTest extends TestCase ->type('super test', '#name') ->press('Save Page'); - $page = \BookStack\Page::first(); + $page = Page::first(); $pageUrl = $page->getUrl(); // Second Save @@ -244,7 +259,10 @@ class EntityTest extends TestCase public function test_recently_updated_pages_on_home() { - $page = \BookStack\Page::orderBy('updated_at', 'asc')->first(); + $page = Page::orderBy('updated_at', 'asc')->first(); + Page::where('id', '!=', $page->id)->update([ + 'updated_at' => Carbon::now()->subSecond(1) + ]); $this->asAdmin()->visit('/') ->dontSeeInElement('#recently-updated-pages', $page->name); $this->visit($page->getUrl() . '/edit') @@ -253,11 +271,25 @@ class EntityTest extends TestCase ->seeInElement('#recently-updated-pages', $page->name); } - public function test_recently_created_pages_on_home() + public function test_slug_multi_byte_lower_casing() { - $entityChain = $this->createEntityChainBelongingToUser($this->getEditor()); - $this->asAdmin()->visit('/') - ->seeInElement('#recently-created-pages', $entityChain['page']->name); + $entityRepo = app(EntityRepo::class); + $book = $entityRepo->createFromInput('book', [ + 'name' => 'КНИГА' + ]); + + $this->assertEquals('книга', $book->slug); + } + + + public function test_slug_format() + { + $entityRepo = app(EntityRepo::class); + $book = $entityRepo->createFromInput('book', [ + 'name' => 'PartA / PartB / PartC' + ]); + + $this->assertEquals('parta-partb-partc', $book->slug); } }