X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/f1c2866fbc24ec6e951071c4886cfa8beee62e29..refs/pull/1881/head:/tests/TestCase.php

diff --git a/tests/TestCase.php b/tests/TestCase.php
index 3a0967c8e..1f1d5ece7 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,78 +1,67 @@
-<?php
+<?php namespace Tests;
 
+use BookStack\Entities\Entity;
 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 SharedTestHelpers;
 
     /**
      * The base URL to use while testing the application.
-     *
      * @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();
-
-        return $app;
+        $this->assertTrue(session()->has($key), "Session does not contain a [{$key}] entry");
+        return $this;
     }
 
-    public function asAdmin()
+    /**
+     * 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 = [])
     {
-        if($this->admin === null) {
-            $this->admin = \BookStack\User::find(1);
-        }
-        return $this->actingAs($this->admin);
+        return parent::get($uri, $headers);
     }
 
     /**
-     * Quickly sets an array of settings.
-     * @param $settingsArray
+     * Create the test response instance from the given response.
+     *
+     * @param  \Illuminate\Http\Response $response
+     * @return TestResponse
      */
-    protected function setSettings($settingsArray)
+    protected function createTestResponse($response)
     {
-        $settings = app('BookStack\Services\SettingService');
-        foreach ($settingsArray as $key => $value) {
-            $settings->put($key, $value);
-        }
+        return TestResponse::fromBaseResponse($response);
     }
 
     /**
-     * Assert that a given string is seen inside an element.
-     *
-     * @param  bool|string|null $element
-     * @param  integer          $position
-     * @param  string           $text
-     * @param  bool             $negate
-     * @return $this
+     * Assert that an activity entry exists of the given key.
+     * Checks the activity belongs to the given entity if provided.
      */
-    protected function seeInNthElement($element, $position, $text, $negate = false)
+    protected function assertActivityExists(string $key, Entity $entity = null)
     {
-        $method = $negate ? 'assertNotRegExp' : 'assertRegExp';
-
-        $rawPattern = preg_quote($text, '/');
+        $detailsToCheck = ['key' => $key];
 
-        $escapedPattern = preg_quote(e($text), '/');
-
-        $content = $this->crawler->filter($element)->eq($position)->html();
-
-        $pattern = $rawPattern == $escapedPattern
-            ? $rawPattern : "({$rawPattern}|{$escapedPattern})";
-
-        $this->$method("/$pattern/i", $content);
+        if ($entity) {
+            $detailsToCheck['entity_type'] = $entity->getMorphClass();
+            $detailsToCheck['entity_id'] = $entity->id;
+        }
 
-        return $this;
+        $this->assertDatabaseHas('activities', $detailsToCheck);
     }
-}
+}
\ No newline at end of file