Fix build:js:watch not building at first launch in Docker

[bookstack] / tests / TestCase.php

diff --git a/tests/TestCase.php b/tests/TestCase.php
index 3f7d846f7b02c57cacc59718e733ce7569d91456..1f1d5ece7288e88575b49975848812bac5915173 100644 (file)
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,51 +1,67 @@
-<?php
+<?php namespace Tests;

 
 

+use BookStack\Entities\Entity;

 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Foundation\Testing\DatabaseTransactions;

+use Illuminate\Foundation\Testing\TestCase as BaseTestCase;

 
 

-class TestCase extends Illuminate\Foundation\Testing\TestCase
+abstract class TestCase extends BaseTestCase

 {
 {

-
+    use CreatesApplication;

     use DatabaseTransactions;
     use DatabaseTransactions;

+    use SharedTestHelpers;

 
     /**
      * The base URL to use while testing the application.
 
     /**
      * The base URL to use while testing the application.

-     *

      * @var string
      */
     protected $baseUrl = 'http://localhost';
      * @var string
      */
     protected $baseUrl = 'http://localhost';

-    private $admin;

 
     /**
 
     /**

-     * Creates the application.
-     *
-     * @return \Illuminate\Foundation\Application
+     * Assert the session contains a specific entry.
+     * @param string $key
+     * @return $this

      */
      */

-    public function createApplication()
+    protected function assertSessionHas(string $key)

     {
     {

-        $app = require __DIR__.'/../bootstrap/app.php';
-
-        $app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();
+        $this->assertTrue(session()->has($key), "Session does not contain a [{$key}] entry");
+        return $this;
+    }

 
 

-        return $app;
+    /**
+     * Override of the get method so we can get visibility of custom TestResponse methods.
+     * @param  string  $uri
+     * @param  array  $headers
+     * @return TestResponse
+     */
+    public function get($uri, array $headers = [])
+    {
+        return parent::get($uri, $headers);

     }
 
     }
 

-    public function asAdmin()
+    /**
+     * Create the test response instance from the given response.
+     *
+     * @param  \Illuminate\Http\Response $response
+     * @return TestResponse
+     */
+    protected function createTestResponse($response)

     {
     {

-        if($this->admin === null) {
-            $this->admin = \BookStack\User::find(1);
-        }
-        return $this->actingAs($this->admin);
+        return TestResponse::fromBaseResponse($response);

     }
 
     /**
     }
 
     /**

-     * Quickly sets an array of settings.
-     * @param $settingsArray
+     * Assert that an activity entry exists of the given key.
+     * Checks the activity belongs to the given entity if provided.

      */
      */

-    protected function setSettings($settingsArray)
+    protected function assertActivityExists(string $key, Entity $entity = null)

     {
     {

-        $settings = app('BookStack\Services\SettingService');
-        foreach ($settingsArray as $key => $value) {
-            $settings->put($key, $value);
+        $detailsToCheck = ['key' => $key];
+
+        if ($entity) {
+            $detailsToCheck['entity_type'] = $entity->getMorphClass();
+            $detailsToCheck['entity_id'] = $entity->id;

         }
         }

+
+        $this->assertDatabaseHas('activities', $detailsToCheck);

     }
     }

-}
+}
\ No newline at end of file