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 e0f160eed7a751e6702aac3fc04d1f2c86101181..1f1d5ece7288e88575b49975848812bac5915173 100644 (file)
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,14 +1,15 @@
 <?php namespace Tests;
 
 <?php namespace Tests;
 

+use BookStack\Entities\Entity;

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

-use Illuminate\Foundation\Testing\TestResponse;

 
 abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication;
     use DatabaseTransactions;
     use SharedTestHelpers;
 
 abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication;
     use DatabaseTransactions;
     use SharedTestHelpers;

+

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


@@ -16,13 +17,51 @@ abstract class TestCase extends BaseTestCase
     protected $baseUrl = 'http://localhost';
 
     /**
     protected $baseUrl = 'http://localhost';
 
     /**

-     * Assert a permission error has occurred.
-     * @param TestResponse $response
+     * Assert the session contains a specific entry.
+     * @param string $key
+     * @return $this
+     */
+    protected function assertSessionHas(string $key)
+    {
+        $this->assertTrue(session()->has($key), "Session does not contain a [{$key}] entry");
+        return $this;
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * Create the test response instance from the given response.
+     *
+     * @param  \Illuminate\Http\Response $response
+     * @return TestResponse

      */
      */

-    protected function assertPermissionError(TestResponse $response)
+    protected function createTestResponse($response)

     {
     {

-        $response->assertRedirect('/');
-        $this->assertTrue(session()->has('error'));
-        session()->remove('error');
+        return TestResponse::fromBaseResponse($response);
+    }
+
+    /**
+     * Assert that an activity entry exists of the given key.
+     * Checks the activity belongs to the given entity if provided.
+     */
+    protected function assertActivityExists(string $key, Entity $entity = null)
+    {
+        $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
     }
 }
\ No newline at end of file