Skip intermediate login page with single provider

[bookstack] / tests / TestCase.php

diff --git a/tests/TestCase.php b/tests/TestCase.php
index f20b20fd83146cc9d84fb0bb9facbce126a548c0..98e0dfbacf4c4cfb6321a55d9aa44fe9e491c6ef 100644 (file)
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,6 +1,8 @@
-<?php namespace Tests;
+<?php

 
 

-use BookStack\Entities\Entity;
+namespace Tests;
+
+use BookStack\Entities\Models\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;
 


@@ -12,38 +14,31 @@ abstract class TestCase extends BaseTestCase
 
     /**
      * 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';
 

-    /**
-     * Assert a permission error has occurred.
-     * @param TestResponse $response
-     * @return TestCase
-     */
-    protected function assertPermissionError(TestResponse $response)
-    {
-        $response->assertRedirect('/');
-        $this->assertSessionHas('error');
-        session()->remove('error');
-        return $this;
-    }
-

     /**
      * Assert the session contains a specific entry.
     /**
      * Assert the session contains a specific entry.

+     *

      * @param string $key
      * @param string $key

+     *

      * @return $this
      */
     protected function assertSessionHas(string $key)
     {
         $this->assertTrue(session()->has($key), "Session does not contain a [{$key}] entry");
      * @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.
         return $this;
     }
 
     /**
      * Override of the get method so we can get visibility of custom TestResponse methods.

-     * @param  string  $uri
-     * @param  array  $headers
+     *
+     * @param string $uri
+     * @param array  $headers
+     *

      * @return TestResponse
      */
     public function get($uri, array $headers = [])
      * @return TestResponse
      */
     public function get($uri, array $headers = [])


@@ -54,7 +49,8 @@ abstract class TestCase extends BaseTestCase
     /**
      * Create the test response instance from the given response.
      *
     /**
      * Create the test response instance from the given response.
      *

-     * @param  \Illuminate\Http\Response $response
+     * @param \Illuminate\Http\Response $response
+     *

      * @return TestResponse
      */
     protected function createTestResponse($response)
      * @return TestResponse
      */
     protected function createTestResponse($response)


@@ -66,15 +62,19 @@ abstract class TestCase extends BaseTestCase
      * Assert that an activity entry exists of the given key.
      * Checks the activity belongs to the given entity if provided.
      */
      * 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)
+    protected function assertActivityExists(string $type, ?Entity $entity = null, string $detail = '')

     {
     {

-        $detailsToCheck = ['key' => $key];
+        $detailsToCheck = ['type' => $type];

 
         if ($entity) {
             $detailsToCheck['entity_type'] = $entity->getMorphClass();
             $detailsToCheck['entity_id'] = $entity->id;
         }
 
 
         if ($entity) {
             $detailsToCheck['entity_type'] = $entity->getMorphClass();
             $detailsToCheck['entity_id'] = $entity->id;
         }
 

+        if ($detail) {
+            $detailsToCheck['detail'] = $detail;
+        }
+

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

-}
\ No newline at end of file
+}