Docker: Fix PHP tests

[bookstack] / tests / BrowserKitTest.php

diff --git a/tests/BrowserKitTest.php b/tests/BrowserKitTest.php
index 86f61a7647181e1aa3a89e166d3202964c1c4c57..6c332a98469c4f5141972ee0b7e562b2f74b4ab2 100644 (file)
--- a/tests/BrowserKitTest.php
+++ b/tests/BrowserKitTest.php
@@ -1,9 +1,16 @@
 <?php namespace Tests;
 
 <?php namespace Tests;
 

-use BookStack\Entity;
-use BookStack\Role;
-use BookStack\Services\PermissionService;
+use BookStack\Auth\User;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Entity;
+use BookStack\Auth\Role;
+use BookStack\Auth\Permissions\PermissionService;
+use BookStack\Entities\Models\Page;
+use BookStack\Settings\SettingService;
+use DB;

 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Contracts\Console\Kernel;

+use Illuminate\Foundation\Application;

 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Laravel\BrowserKitTesting\TestCase;
 use Symfony\Component\DomCrawler\Crawler;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Laravel\BrowserKitTesting\TestCase;
 use Symfony\Component\DomCrawler\Crawler;


@@ -20,16 +27,16 @@ abstract class BrowserKitTest extends TestCase
      */
     protected $baseUrl = 'http://localhost';
 
      */
     protected $baseUrl = 'http://localhost';
 

-    public function tearDown()
+    public function tearDown() : void

     {
     {

-        \DB::disconnect();
+        DB::disconnect();

         parent::tearDown();
     }
 
     /**
      * Creates the application.
      *
         parent::tearDown();
     }
 
     /**
      * Creates the application.
      *

-     * @return \Illuminate\Foundation\Application
+     * @return Application

      */
     public function createApplication()
     {
      */
     public function createApplication()
     {


@@ -46,7 +53,7 @@ abstract class BrowserKitTest extends TestCase
      */
     public function getNormalUser()
     {
      */
     public function getNormalUser()
     {

-        return \BookStack\User::where('system_name', '=', null)->get()->last();
+        return User::where('system_name', '=', null)->get()->last();

     }
 
     /**
     }
 
     /**


@@ -55,7 +62,7 @@ abstract class BrowserKitTest extends TestCase
      */
     protected function setSettings($settingsArray)
     {
      */
     protected function setSettings($settingsArray)
     {

-        $settings = app('BookStack\Services\SettingService');
+        $settings = app(SettingService::class);

         foreach ($settingsArray as $key => $value) {
             $settings->put($key, $value);
         }
         foreach ($settingsArray as $key => $value) {
             $settings->put($key, $value);
         }


@@ -63,23 +70,21 @@ abstract class BrowserKitTest extends TestCase
 
     /**
      * Create a group of entities that belong to a specific user.
 
     /**
      * Create a group of entities that belong to a specific user.

-     * @param $creatorUser
-     * @param $updaterUser
-     * @return array

      */
      */

-    protected function createEntityChainBelongingToUser($creatorUser, $updaterUser = false)
+    protected function createEntityChainBelongingToUser(User $creatorUser, ?User $updaterUser = null): array

     {
     {

-        if ($updaterUser === false) $updaterUser = $creatorUser;
-        $book = factory(\BookStack\Book::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id]);
-        $chapter = factory(\BookStack\Chapter::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id]);
-        $page = factory(\BookStack\Page::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id, 'chapter_id' => $chapter->id]);
+        if (empty($updaterUser)) {
+            $updaterUser = $creatorUser;
+        }
+
+        $userAttrs = ['created_by' => $creatorUser->id, 'owned_by' => $creatorUser->id, 'updated_by' => $updaterUser->id];
+        $book = factory(Book::class)->create($userAttrs);
+        $chapter = factory(Chapter::class)->create(array_merge(['book_id' => $book->id], $userAttrs));
+        $page = factory(Page::class)->create(array_merge(['book_id' => $book->id, 'chapter_id' => $chapter->id], $userAttrs));

         $restrictionService = $this->app[PermissionService::class];
         $restrictionService->buildJointPermissionsForEntity($book);
         $restrictionService = $this->app[PermissionService::class];
         $restrictionService->buildJointPermissionsForEntity($book);

-        return [
-            'book' => $book,
-            'chapter' => $chapter,
-            'page' => $page
-        ];
+
+        return compact('book', 'chapter', 'page');

     }
 
     /**
     }
 
     /**


@@ -100,7 +105,7 @@ abstract class BrowserKitTest extends TestCase
      */
     protected function getNewBlankUser($attributes = [])
     {
      */
     protected function getNewBlankUser($attributes = [])
     {

-        $user = factory(\BookStack\User::class)->create($attributes);
+        $user = factory(User::class)->create($attributes);

         return $user;
     }
 
         return $user;
     }