Fix a lot of bugs, fix #23

tests/BootstrapsTenancyTest.php

@@ -47,7 +47,14 @@ class BootstrapsTenancyTest extends TestCase
         foreach (config('tenancy.filesystem.disks') as $disk) {
             $suffix = config('tenancy.filesystem.suffix_base') . tenant('uuid');
             $current_path_prefix = \Storage::disk($disk)->getAdapter()->getPathPrefix();
-            $this->assertSame($old_storage_facade_roots[$disk] . "/$suffix/", $current_path_prefix);
+
+            if ($override = config("tenancy.filesystem.root_override.{$disk}")) {
+                $correct_path_prefix = str_replace("%storage_path%", storage_path(), $override);
+            } else {
+                $correct_path_prefix = $old_storage_facade_roots[$disk] . "/$suffix/";
+            }
+
+            $this->assertSame($correct_path_prefix, $current_path_prefix);
         }
     }
 

tests/HttpKernel.php

@@ -16,9 +16,9 @@ class HttpKernel extends Kernel
     protected $middleware = [
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrimStrings::class,
+        \Orchestra\Testbench\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class,
+        // \Orchestra\Testbench\Http\Middleware\TrustProxies::class,
     ];
 
     /**
@@ -28,12 +28,12 @@ class HttpKernel extends Kernel
      */
     protected $middlewareGroups = [
         'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
+            \Orchestra\Testbench\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
+            \Orchestra\Testbench\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
@@ -55,12 +55,12 @@ class HttpKernel extends Kernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => \App\Http\Middleware\Authenticate::class,
+        'auth' => \Orchestra\Testbench\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'guest' => \Orchestra\Testbench\Http\Middleware\RedirectIfAuthenticated::class,
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,

tests/ReidentificationTest.php

@@ -25,7 +25,14 @@ class ReidentificationTest extends TestCase
         foreach (config('tenancy.filesystem.disks') as $disk) {
             $suffix = config('tenancy.filesystem.suffix_base') . tenant('uuid');
             $current_path_prefix = \Storage::disk($disk)->getAdapter()->getPathPrefix();
-            $this->assertSame($originals[$disk] . "/$suffix/", $current_path_prefix);
+
+            if ($override = config("tenancy.filesystem.root_override.{$disk}")) {
+                $correct_path_prefix = str_replace("%storage_path%", storage_path(), $override);
+            } else {
+                $correct_path_prefix = $originals[$disk] . "/$suffix/";
+            }
+
+            $this->assertSame($correct_path_prefix, $current_path_prefix);
         }
     }
 

tests/TenantAssetTest.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Stancl\Tenancy\Tests;
+
+class TenantAssetTest extends TestCase
+{
+    /** @test */
+    public function asset_can_be_accessed_using_the_url_returned_by_the_tenant_asset_helper()
+    {
+        $this->markTestIncomplete();
+        $filename = 'testfile' . $this->randomString(10);
+        \Storage::disk('public')->put($filename, 'bar');
+        $this->get(tenant_asset($filename))->assertSee('bar');
+    }
+}

tests/TestCase.php

@@ -4,7 +4,7 @@ namespace Stancl\Tenancy\Tests;
 
 use Illuminate\Support\Facades\Redis;
 
-class TestCase extends \Orchestra\Testbench\TestCase
+abstract class TestCase extends \Orchestra\Testbench\TestCase
 {
     public $autoCreateTenant = true;
     public $autoInitTenancy = true;