Fixes for CodeStyle vol.2

[bookstack] / tests / Entity / EntityTest.php

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

 
 

-use BookStack\Entities\Models\Bookshelf;
+namespace Tests\Entity;
+
+use BookStack\Auth\UserRepo;

 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Book;

+use BookStack\Entities\Models\Bookshelf;

 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 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
 {
 use BookStack\Entities\Repos\PageRepo;
 use Carbon\Carbon;
 use Tests\BrowserKitTest;
 
 class EntityTest extends BrowserKitTest
 {

-

     public function test_entity_creation()
     {
         // Test Creation
     public function test_entity_creation()
     {
         // Test Creation


@@ -42,7 +43,7 @@ class EntityTest extends BrowserKitTest
 
     public function test_book_sort_page_shows()
     {
 
     public function test_book_sort_page_shows()
     {

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

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


@@ -54,7 +55,7 @@ class EntityTest extends BrowserKitTest
 
     public function test_book_sort_item_returns_book_content()
     {
 
     public function test_book_sort_item_returns_book_content()
     {

-        $books =  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];


@@ -84,13 +85,12 @@ class EntityTest extends BrowserKitTest
             ->submitForm('Grid View')
             ->seePageIs('/books')
             ->pageHasElement('.featured-image-container');
             ->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([

-            'name' => 'My First Page'
+            'name' => 'My First Page',

         ]);
 
         $this->asAdmin()
         ]);
 
         $this->asAdmin()


@@ -110,13 +110,14 @@ class EntityTest extends BrowserKitTest
             ->see($page->name);
 
         $page = Page::where('slug', '=', 'my-first-page')->where('chapter_id', '=', $chapter->id)->first();
             ->see($page->name);
 
         $page = Page::where('slug', '=', 'my-first-page')->where('chapter_id', '=', $chapter->id)->first();

+

         return $page;
     }
 
     public function chapterCreation(Book $book)
     {
         $chapter = factory(Chapter::class)->make([
         return $page;
     }
 
     public function chapterCreation(Book $book)
     {
         $chapter = factory(Chapter::class)->make([

-            'name' => 'My First Chapter'
+            'name' => 'My First Chapter',

         ]);
 
         $this->asAdmin()
         ]);
 
         $this->asAdmin()


@@ -133,13 +134,14 @@ class EntityTest extends BrowserKitTest
             ->see($chapter->name)->see($chapter->description);
 
         $chapter = Chapter::where('slug', '=', 'my-first-chapter')->where('book_id', '=', $book->id)->first();
             ->see($chapter->name)->see($chapter->description);
 
         $chapter = Chapter::where('slug', '=', 'my-first-chapter')->where('book_id', '=', $book->id)->first();

+

         return $chapter;
     }
 
     public function bookCreation()
     {
         $book = factory(Book::class)->make([
         return $chapter;
     }
 
     public function bookCreation()
     {
         $book = factory(Book::class)->make([

-            'name' => 'My First Book'
+            'name' => 'My First Book',

         ]);
         $this->asAdmin()
             ->visit('/books')
         ]);
         $this->asAdmin()
             ->visit('/books')


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

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

+

         return $book;
     }
 
         return $book;
     }
 


@@ -245,7 +248,7 @@ class EntityTest extends BrowserKitTest
     {
         $page = Page::orderBy('updated_at', 'asc')->first();
         Page::where('id', '!=', $page->id)->update([
     {
         $page = Page::orderBy('updated_at', 'asc')->first();
         Page::where('id', '!=', $page->id)->update([

-            'updated_at' => Carbon::now()->subSecond(1)
+            'updated_at' => Carbon::now()->subSecond(1),

         ]);
         $this->asAdmin()->visit('/')
             ->dontSeeInElement('#recently-updated-pages', $page->name);
         ]);
         $this->asAdmin()->visit('/')
             ->dontSeeInElement('#recently-updated-pages', $page->name);


@@ -258,13 +261,13 @@ class EntityTest extends BrowserKitTest
     public function test_slug_multi_byte_url_safe()
     {
         $book = $this->newBook([
     public function test_slug_multi_byte_url_safe()
     {
         $book = $this->newBook([

-            'name' => 'информация'
+            'name' => 'информация',

         ]);
 
         $this->assertEquals('informatsiya', $book->slug);
 
         $book = $this->newBook([
         ]);
 
         $this->assertEquals('informatsiya', $book->slug);
 
         $book = $this->newBook([

-            'name' => '¿Qué?'
+            'name' => '¿Qué?',

         ]);
 
         $this->assertEquals('que', $book->slug);
         ]);
 
         $this->assertEquals('que', $book->slug);


@@ -273,7 +276,7 @@ class EntityTest extends BrowserKitTest
     public function test_slug_format()
     {
         $book = $this->newBook([
     public function test_slug_format()
     {
         $book = $this->newBook([

-            'name' => 'PartA / PartB / PartC'
+            'name' => 'PartA / PartB / PartC',

         ]);
 
         $this->assertEquals('parta-partb-partc', $book->slug);
         ]);
 
         $this->assertEquals('parta-partb-partc', $book->slug);


@@ -313,5 +316,4 @@ class EntityTest extends BrowserKitTest
             ->submitForm('Confirm')
             ->seePageIs($chapter->getUrl());
     }
             ->submitForm('Confirm')
             ->seePageIs($chapter->getUrl());
     }

-

 }
 }