Merge branch 'master' into master

[bookstack] / tests / Entity / EntityTest.php

diff --git a/tests/Entity/EntityTest.php b/tests/Entity/EntityTest.php
index 647676ec75772d5b47b5a9e2e035db493cb29f93..3a363e2b87bfeaaa7424946f49acff2556554c7d 100644 (file)
--- a/tests/Entity/EntityTest.php
+++ b/tests/Entity/EntityTest.php
@@ -1,41 +1,26 @@
-<?php namespace Tests;
+<?php namespace Tests\Entity;

 
 

-use BookStack\Book;
-use BookStack\Chapter;
-use BookStack\Page;
-use BookStack\Repos\EntityRepo;
-use BookStack\Repos\UserRepo;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use BookStack\Auth\UserRepo;
+use BookStack\Entities\Repos\PageRepo;
+use Carbon\Carbon;
+use Tests\BrowserKitTest;

 
 class EntityTest extends BrowserKitTest
 {
 
     public function test_entity_creation()
     {
 
 class EntityTest extends BrowserKitTest
 {
 
     public function test_entity_creation()
     {

-

         // Test Creation
         $book = $this->bookCreation();
         $chapter = $this->chapterCreation($book);
         // Test Creation
         $book = $this->bookCreation();
         $chapter = $this->chapterCreation($book);

-        $page = $this->pageCreation($chapter);
+        $this->pageCreation($chapter);

 
         // Test Updating
 
         // Test Updating

-        $book = $this->bookUpdate($book);
-
-        // Test Deletion
-        $this->bookDelete($book);
-    }
-
-    public function bookDelete(Book $book)
-    {
-        $this->asAdmin()
-            ->visit($book->getUrl())
-            // Check link works correctly
-            ->click('Delete')
-            ->seePageIs($book->getUrl() . '/delete')
-            // Ensure the book name is show to user
-            ->see($book->name)
-            ->press('Confirm')
-            ->seePageIs('/books')
-            ->notSeeInDatabase('books', ['id' => $book->id]);
+        $this->bookUpdate($book);

     }
 
     public function bookUpdate(Book $book)
     }
 
     public function bookUpdate(Book $book)


@@ -64,9 +49,7 @@ class EntityTest extends BrowserKitTest
             ->click('Sort')
             ->seePageIs($bookToSort->getUrl() . '/sort')
             ->seeStatusCode(200)
             ->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()
     }
 
     public function test_book_sort_item_returns_book_content()


@@ -83,6 +66,27 @@ class EntityTest extends BrowserKitTest
             ->see($firstChapter->name);
     }
 
             ->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(Page::class)->make([
     public function pageCreation($chapter)
     {
         $page = factory(Page::class)->make([


@@ -119,7 +123,7 @@ class EntityTest extends BrowserKitTest
             // Navigate to chapter create page
             ->visit($book->getUrl())
             ->click('New Chapter')
             // 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')
             // Fill out form
             ->type($chapter->name, '#name')
             ->type($chapter->description, '#description')


@@ -141,33 +145,22 @@ class EntityTest extends BrowserKitTest
             ->visit('/books')
             // Choose to create a book
             ->click('Create New Book')
             ->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')
             // Fill out form & save
             ->type($book->name, '#name')
             ->type($book->description, '#description')

-            ->press('Select Image')
-            ->click('test-image.jpg')
-            ->press('Select Image')

             ->press('Save Book')
             // Check it redirects correctly
             ->seePageIs('/books/my-first-book')
             ->see($book->name)->see($book->description);
 
             ->press('Save Book')
             // Check it redirects correctly
             ->seePageIs('/books/my-first-book')
             ->see($book->name)->see($book->description);
 

-        $book = factory(Book::class)->latest();
-        $this->assertDatabaseHas('images', [
-        'id' => $book->image
-        ]);
-

         // Ensure duplicate names are given different slugs
         $this->asAdmin()
         // Ensure duplicate names are given different slugs
         $this->asAdmin()

-            ->visit('/books/create')
+            ->visit('/create-book')

             ->type($book->name, '#name')
             ->type($book->description, '#description')
             ->type($book->name, '#name')
             ->type($book->description, '#description')

-            ->press('Select Image')
-            ->click('test-image.jpg')
-            ->press('Select Image')

             ->press('Save Book');
             ->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");
 
         $expectedPattern = '/\/books\/my-first-book-[0-9a-zA-Z]{3}/';
         $this->assertRegExp($expectedPattern, $this->currentUri, "Did not land on expected page [$expectedPattern].\n");
 


@@ -183,7 +176,7 @@ class EntityTest extends BrowserKitTest
         $entities = $this->createEntityChainBelongingToUser($creator, $updater);
         $this->actingAs($creator);
         app(UserRepo::class)->destroy($creator);
         $entities = $this->createEntityChainBelongingToUser($creator, $updater);
         $this->actingAs($creator);
         app(UserRepo::class)->destroy($creator);

-        app(EntityRepo::class)->savePageRevision($entities['page']);
+        app(PageRepo::class)->update($entities['page'], ['html' => '<p>hello!</p>>']);

 
         $this->checkEntitiesViewable($entities);
     }
 
         $this->checkEntitiesViewable($entities);
     }


@@ -196,7 +189,7 @@ class EntityTest extends BrowserKitTest
         $entities = $this->createEntityChainBelongingToUser($creator, $updater);
         $this->actingAs($updater);
         app(UserRepo::class)->destroy($updater);
         $entities = $this->createEntityChainBelongingToUser($creator, $updater);
         $this->actingAs($updater);
         app(UserRepo::class)->destroy($updater);

-        app(EntityRepo::class)->savePageRevision($entities['page']);
+        app(PageRepo::class)->update($entities['page'], ['html' => '<p>Hello there!</p>']);

 
         $this->checkEntitiesViewable($entities);
     }
 
         $this->checkEntitiesViewable($entities);
     }


@@ -213,15 +206,6 @@ class EntityTest extends BrowserKitTest
             ->click('Revisions')->seeStatusCode(200);
     }
 
             ->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();
     public function test_recently_updated_pages_view()
     {
         $user = $this->getEditor();


@@ -260,6 +244,9 @@ class EntityTest extends BrowserKitTest
     public function test_recently_updated_pages_on_home()
     {
         $page = Page::orderBy('updated_at', 'asc')->first();
     public function test_recently_updated_pages_on_home()
     {
         $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')
         $this->asAdmin()->visit('/')
             ->dontSeeInElement('#recently-updated-pages', $page->name);
         $this->visit($page->getUrl() . '/edit')


@@ -268,11 +255,63 @@ class EntityTest extends BrowserKitTest
             ->seeInElement('#recently-updated-pages', $page->name);
     }
 
             ->seeInElement('#recently-updated-pages', $page->name);
     }
 

-    public function test_recently_created_pages_on_home()
+    public function test_slug_multi_byte_url_safe()

     {
     {

-        $entityChain = $this->createEntityChainBelongingToUser($this->getEditor());
-        $this->asAdmin()->visit('/')
-            ->seeInElement('#recently-created-pages', $entityChain['page']->name);
+        $book = $this->newBook([
+            'name' => 'информация'
+        ]);
+
+        $this->assertEquals('informatsiya', $book->slug);
+
+        $book = $this->newBook([
+            'name' => '¿Qué?'
+        ]);
+
+        $this->assertEquals('que', $book->slug);
+    }
+
+    public function test_slug_format()
+    {
+        $book = $this->newBook([
+            'name' => 'PartA / PartB / PartC'
+        ]);
+
+        $this->assertEquals('parta-partb-partc', $book->slug);
+    }
+
+    public function test_shelf_cancel_creation_returns_to_correct_place()
+    {
+        $shelf = Bookshelf::first();
+
+        // Cancel button from shelf goes back to shelf
+        $this->asEditor()->visit($shelf->getUrl('/create-book'))
+            ->see('Cancel')
+            ->click('Cancel')
+            ->seePageIs($shelf->getUrl());
+
+        // Cancel button from books goes back to books
+        $this->asEditor()->visit('/create-book')
+            ->see('Cancel')
+            ->click('Cancel')
+            ->seePageIs('/books');
+
+        // Cancel button from book edit goes back to book
+        $book = Book::first();
+
+        $this->asEditor()->visit($book->getUrl('/edit'))
+            ->see('Cancel')
+            ->click('Cancel')
+            ->seePageIs($book->getUrl());
+    }
+
+    public function test_page_within_chapter_deletion_returns_to_chapter()
+    {
+        $chapter = Chapter::query()->first();
+        $page = $chapter->pages()->first();
+
+        $this->asEditor()->visit($page->getUrl('/delete'))
+            ->submitForm('Confirm')
+            ->seePageIs($chapter->getUrl());

     }
 
 }
     }
 
 }