added routes for zip export

[bookstack] / tests / TestCase.php

diff --git a/tests/TestCase.php b/tests/TestCase.php
index e3c47cd89588d0370be487db5c114ececc56a7dc..0fb899ea99eebf419fa93f92732c24e0594606c6 100644 (file)
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -6,7 +6,6 @@ use BookStack\Entities\Models\Entity;
 use BookStack\Http\HttpClientHistory;
 use BookStack\Http\HttpRequestService;
 use BookStack\Settings\SettingService;
 use BookStack\Http\HttpClientHistory;
 use BookStack\Http\HttpRequestService;
 use BookStack\Settings\SettingService;

-use BookStack\Uploads\HttpFetcher;

 use BookStack\Users\Models\User;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use BookStack\Users\Models\User;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Foundation\Testing\DatabaseTransactions;


@@ -16,7 +15,6 @@ use Illuminate\Support\Env;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Testing\Assert as PHPUnit;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Testing\Assert as PHPUnit;

-use Mockery;

 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use Ssddanbrown\AssertHtml\TestsHtml;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use Ssddanbrown\AssertHtml\TestsHtml;


@@ -44,7 +42,6 @@ abstract class TestCase extends BaseTestCase
         $this->permissions = new PermissionsProvider($this->users);
         $this->files = new FileProvider();
 
         $this->permissions = new PermissionsProvider($this->users);
         $this->files = new FileProvider();
 

-        User::clearDefault();

         parent::setUp();
 
         // We can uncomment the below to run tests with failings upon deprecations.
         parent::setUp();
 
         // We can uncomment the below to run tests with failings upon deprecations.


@@ -107,19 +104,6 @@ abstract class TestCase extends BaseTestCase
         }
     }
 
         }
     }
 

-    /**
-     * Mock the HttpFetcher service and return the given data on fetch.
-     */
-    protected function mockHttpFetch($returnData, int $times = 1)
-    {
-        // TODO - Remove
-        $mockHttp = Mockery::mock(HttpFetcher::class);
-        $this->app[HttpFetcher::class] = $mockHttp;
-        $mockHttp->shouldReceive('fetch')
-            ->times($times)
-            ->andReturn($returnData);
-    }
-

     /**
      * Mock the http client used in BookStack http calls.
      */
     /**
      * Mock the http client used in BookStack http calls.
      */


@@ -134,7 +118,7 @@ abstract class TestCase extends BaseTestCase
      * Database config is juggled so the value can be restored when
      * parallel testing are used, where multiple databases exist.
      */
      * Database config is juggled so the value can be restored when
      * parallel testing are used, where multiple databases exist.
      */

-    protected function runWithEnv(string $name, $value, callable $callback)
+    protected function runWithEnv(string $name, $value, callable $callback, bool $handleDatabase = true)

     {
         Env::disablePutenv();
         $originalVal = $_SERVER[$name] ?? null;
     {
         Env::disablePutenv();
         $originalVal = $_SERVER[$name] ?? null;


@@ -148,13 +132,17 @@ abstract class TestCase extends BaseTestCase
         $database = config('database.connections.mysql_testing.database');
         $this->refreshApplication();
 
         $database = config('database.connections.mysql_testing.database');
         $this->refreshApplication();
 

-        DB::purge();
-        config()->set('database.connections.mysql_testing.database', $database);
-        DB::beginTransaction();
+        if ($handleDatabase) {
+            DB::purge();
+            config()->set('database.connections.mysql_testing.database', $database);
+            DB::beginTransaction();
+        }

 
         $callback();
 
 
         $callback();
 

-        DB::rollBack();
+        if ($handleDatabase) {
+            DB::rollBack();
+        }

 
         if (is_null($originalVal)) {
             unset($_SERVER[$name]);
 
         if (is_null($originalVal)) {
             unset($_SERVER[$name]);


@@ -264,8 +252,8 @@ abstract class TestCase extends BaseTestCase
         $detailsToCheck = ['type' => $type];
 
         if ($entity) {
         $detailsToCheck = ['type' => $type];
 
         if ($entity) {

-            $detailsToCheck['entity_type'] = $entity->getMorphClass();
-            $detailsToCheck['entity_id'] = $entity->id;
+            $detailsToCheck['loggable_type'] = $entity->getMorphClass();
+            $detailsToCheck['loggable_id'] = $entity->id;

         }
 
         if ($detail) {
         }
 
         if ($detail) {