Removes some unused code.

[bookstack] / tests / Entity / EntityTest.php

diff --git a/tests/Entity/EntityTest.php b/tests/Entity/EntityTest.php
index 9fd4eb9ad299bcee4528cbf97e9e581744fd14fe..ef5ea3aee1dbea99f9421b7fbb677688112556b4 100644 (file)
--- a/tests/Entity/EntityTest.php
+++ b/tests/Entity/EntityTest.php
@@ -1,8 +1,12 @@
-<?php
+<?php namespace Tests;

 
 

-use Illuminate\Support\Facades\DB;
+use BookStack\Book;
+use BookStack\Chapter;
+use BookStack\Page;
+use BookStack\Repos\EntityRepo;
+use BookStack\Repos\UserRepo;

 
 

-class EntityTest extends TestCase
+class EntityTest extends BrowserKitTest

 {
 
     public function test_entity_creation()
 {
 
     public function test_entity_creation()


@@ -20,7 +24,7 @@ class EntityTest extends TestCase
         $this->bookDelete($book);
     }
 
         $this->bookDelete($book);
     }
 

-    public function bookDelete(\BookStack\Book $book)
+    public function bookDelete(Book $book)

     {
         $this->asAdmin()
             ->visit($book->getUrl())
     {
         $this->asAdmin()
             ->visit($book->getUrl())


@@ -34,7 +38,7 @@ class EntityTest extends TestCase
             ->notSeeInDatabase('books', ['id' => $book->id]);
     }
 
             ->notSeeInDatabase('books', ['id' => $book->id]);
     }
 

-    public function bookUpdate(\BookStack\Book $book)
+    public function bookUpdate(Book $book)

     {
         $newName = $book->name . ' Updated';
         $this->asAdmin()
     {
         $newName = $book->name . ' Updated';
         $this->asAdmin()


@@ -48,12 +52,12 @@ class EntityTest extends TestCase
             ->seePageIs($book->getUrl() . '-updated')
             ->see($newName);
 
             ->seePageIs($book->getUrl() . '-updated')
             ->see($newName);
 

-        return \BookStack\Book::find($book->id);
+        return Book::find($book->id);

     }
 
     public function test_book_sort_page_shows()
     {
     }
 
     public function test_book_sort_page_shows()
     {

-        $books =  \BookStack\Book::all();
+        $books =  Book::all();

         $bookToSort = $books[0];
         $this->asAdmin()
             ->visit($bookToSort->getUrl())
         $bookToSort = $books[0];
         $this->asAdmin()
             ->visit($bookToSort->getUrl())


@@ -67,7 +71,7 @@ class EntityTest extends TestCase
 
     public function test_book_sort_item_returns_book_content()
     {
 
     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];
         $bookToSort = $books[0];
         $firstPage = $bookToSort->pages[0];
         $firstChapter = $bookToSort->chapters[0];


@@ -81,7 +85,7 @@ class EntityTest extends TestCase
 
     public function pageCreation($chapter)
     {
 
     public function pageCreation($chapter)
     {

-        $page = factory(\BookStack\Page::class)->make([
+        $page = factory(Page::class)->make([

             'name' => 'My First Page'
         ]);
 
             'name' => 'My First Page'
         ]);
 


@@ -90,7 +94,7 @@ class EntityTest extends TestCase
             ->visit($chapter->getUrl())
             ->click('New Page');
 
             ->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
 
         $this->seePageIs($draftPage->getUrl())
             // Fill out form


@@ -101,13 +105,13 @@ class EntityTest extends TestCase
             ->seePageIs($chapter->book->getUrl() . '/page/my-first-page')
             ->see($page->name);
 
             ->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;
     }
 
         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'
         ]);
 
             'name' => 'My First Chapter'
         ]);
 


@@ -124,13 +128,13 @@ class EntityTest extends TestCase
             ->seePageIs($book->getUrl() . '/chapter/my-first-chapter')
             ->see($chapter->name)->see($chapter->description);
 
             ->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()
     {
         return $chapter;
     }
 
     public function bookCreation()
     {

-        $book = factory(\BookStack\Book::class)->make([
+        $book = factory(Book::class)->make([

             'name' => 'My First Book'
         ]);
         $this->asAdmin()
             'name' => 'My First Book'
         ]);
         $this->asAdmin()


@@ -156,7 +160,7 @@ class EntityTest extends TestCase
         $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");
 

-        $book = \BookStack\Book::where('slug', '=', 'my-first-book')->first();
+        $book = Book::where('slug', '=', 'my-first-book')->first();

         return $book;
     }
 
         return $book;
     }
 


@@ -167,8 +171,8 @@ class EntityTest extends TestCase
         $updater = $this->getEditor();
         $entities = $this->createEntityChainBelongingToUser($creator, $updater);
         $this->actingAs($creator);
         $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(EntityRepo::class)->savePageRevision($entities['page']);

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


@@ -180,8 +184,8 @@ class EntityTest extends TestCase
         $updater = $this->getEditor();
         $entities = $this->createEntityChainBelongingToUser($creator, $updater);
         $this->actingAs($updater);
         $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(EntityRepo::class)->savePageRevision($entities['page']);

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


@@ -218,7 +222,7 @@ class EntityTest extends TestCase
 
     public function test_old_page_slugs_redirect_to_new_pages()
     {
 
     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.
         $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 +231,7 @@ class EntityTest extends TestCase
             ->type('super test', '#name')
             ->press('Save Page');
 
             ->type('super test', '#name')
             ->press('Save Page');
 

-        $page = \BookStack\Page::first();
+        $page = Page::first();

         $pageUrl = $page->getUrl();
 
         // Second Save
         $pageUrl = $page->getUrl();
 
         // Second Save


@@ -244,7 +248,7 @@ class EntityTest extends TestCase
 
     public function test_recently_updated_pages_on_home()
     {
 
     public function test_recently_updated_pages_on_home()
     {

-        $page = \BookStack\Page::orderBy('updated_at', 'asc')->first();
+        $page = Page::orderBy('updated_at', 'asc')->first();

         $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')