Fixes for CodeStyle vol.2

[bookstack] / tests / TestCase.php

diff --git a/tests/TestCase.php b/tests/TestCase.php
index e0455f44712cd424c2ddea4d8f5dd670251c516f..080515173d67cdd6cdf3605dc9e66c7ad1de42a4 100644 (file)
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,31 +1,76 @@
 <?php
 
 <?php
 

+namespace Tests;
+
+use BookStack\Entities\Models\Entity;

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

-use Symfony\Component\DomCrawler\Crawler;
+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 of the application.
+     * The base URL to use while testing the application.

      *
      * @var string
      */
      *
      * @var string
      */

-    public $baseUrl = 'http://localhost';
+    protected $baseUrl = 'http://localhost';
+
+    /**
+     * 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;
+    }

 
     /**
 
     /**

-     * Creates the application.
+     * Override of the get method so we can get visibility of custom TestResponse methods.
+     *
+     * @param string $uri
+     * @param array  $headers

      *
      *

-     * @return \Illuminate\Foundation\Application
+     * @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 createTestResponse($response)
+    {
+        return TestResponse::fromBaseResponse($response);
+    }
+
+    /**
+     * Assert that an activity entry exists of the given key.
+     * Checks the activity belongs to the given entity if provided.

      */
      */

-    public function createApplication()
+    protected function assertActivityExists(string $type, Entity $entity = null)

     {
     {

-        $app = require __DIR__.'/../bootstrap/app.php';
+        $detailsToCheck = ['type' => $type];

 
 

-        $app->make(Kernel::class)->bootstrap();
+        if ($entity) {
+            $detailsToCheck['entity_type'] = $entity->getMorphClass();
+            $detailsToCheck['entity_id'] = $entity->id;
+        }

 
 

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

     }
 }
     }
 }