From 19409d77230e6f99b9c21c98be929744be08e82a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Thu, 15 Aug 2019 14:06:54 +0200
Subject: [PATCH] fix ./test

---
 src/TenantManager.php | 22 +---------------------
 test                  |  6 +++---
 tests/TestCase.php    | 17 +++++++++++------
 3 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/TenantManager.php b/src/TenantManager.php
index c90c8b88..bc8ed11d 100644
--- a/src/TenantManager.php
+++ b/src/TenantManager.php
@@ -23,7 +23,7 @@ final class TenantManager
      *
      * @var StorageDriver
      */
-    protected $storage;
+    public $storage;
 
     /**
      * Database manager.
@@ -350,24 +350,4 @@ final class TenantManager
 
         return $this->tenant[(string) $attribute];
     }
-
-    public function getStorageDriver(): Interfaces\StorageDriver
-    {
-        return $this->storage;
-    }
-
-    /**
-     * Set the storage driver.
-     *
-     * @param Interfaces\StorageDriver|string $driver
-     * @return void
-     */
-    public function setStorageDriver($driver)
-    {
-        if (is_string($driver)) {
-            $driver = $this->app->make($driver);
-        }
-
-        $this->storage = $driver;
-    }
 }
diff --git a/test b/test
index e8f29dd3..822b6d4b 100755
--- a/test
+++ b/test
@@ -4,9 +4,9 @@ set -e
 # for development
 docker-compose up -d
 printf "Variant 1\n\n"
-TENANCY_TEST_REDIS_TENANCY=1 TENANCY_TEST_REDIS_CLIENT=phpredis docker-compose exec test vendor/bin/phpunit --coverage-php coverage/1.cov "$@"
+docker-compose exec test env TENANCY_TEST_REDIS_TENANCY=1 TENANCY_TEST_REDIS_CLIENT=phpredis TENANCY_TEST_STORAGE_DRIVER=redis vendor/bin/phpunit --coverage-php coverage/1.cov "$@"
 printf "Variant 2\n\n"
-TENANCY_TEST_REDIS_TENANCY=0 TENANCY_TEST_REDIS_CLIENT=predis docker-compose exec test vendor/bin/phpunit --coverage-php coverage/2.cov "$@"
+docker-compose exec test env TENANCY_TEST_REDIS_TENANCY=0 TENANCY_TEST_REDIS_CLIENT=predis TENANCY_TEST_STORAGE_DRIVER=redis vendor/bin/phpunit --coverage-php coverage/2.cov "$@"
 printf "Variant 3\n\n"
-TENANCY_TEST_REDIS_TENANCY=1 TENANCY_TEST_REDIS_CLIENT=phpredis TENANCY_TEST_STORAGE_DRIVER=db docker-compose exec test vendor/bin/phpunit --coverage-php coverage/3.cov "$@"
+docker-compose exec test env TENANCY_TEST_REDIS_TENANCY=1 TENANCY_TEST_REDIS_CLIENT=phpredis TENANCY_TEST_STORAGE_DRIVER=db vendor/bin/phpunit --coverage-php coverage/3.cov "$@"
 docker-compose exec test vendor/bin/phpcov merge --clover clover.xml coverage/
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 94d3feac..584e3f4e 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -5,6 +5,7 @@ namespace Stancl\Tenancy\Tests;
 use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\Artisan;
 use Stancl\Tenancy\StorageDrivers\DatabaseStorageDriver;
+use Stancl\Tenancy\StorageDrivers\RedisStorageDriver;
 
 abstract class TestCase extends \Orchestra\Testbench\TestCase
 {
@@ -25,10 +26,10 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
 
         // $this->loadLaravelMigrations();
 
-        $this->loadMigrationsFrom(realpath(__DIR__ . '/../src/assets/migrations'));
+        $this->loadMigrationsFrom(realpath(__DIR__ . '/../src/assets/migrations/'));
 
         // Artisan::call('migrate:fresh', [
-        //     '--path' => __DIR__ . '/../src/assets/migrations'
+        //     '--path' => __DIR__ . '/../src/assets/migrations/'
         // ]);
         // dd(Artisan::output());
 
@@ -95,14 +96,18 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
             'tenancy.migrations_directory' => database_path('../migrations'),
         ]);
 
-        if (env('TENANCY_TEST_STORAGE_DRIVER', 'redis') === 'db') {
+        if (env('TENANCY_TEST_STORAGE_DRIVER', 'redis') === 'redis') {
+            $app['config']->set([
+                'tenancy.storage_driver' => RedisStorageDriver::class,
+            ]);
+
+            tenancy()->storage = $app->make(RedisStorageDriver::class);
+        } elseif (env('TENANCY_TEST_STORAGE_DRIVER', 'redis') === 'db') {
             $app['config']->set([
-                'tenancy.redis.tenancy' => true,
-                'database.redis.client' => 'phpredis',
                 'tenancy.storage_driver' => DatabaseStorageDriver::class,
             ]);
 
-            tenancy()->setStorageDriver(DatabaseStorageDriver::class);
+            tenancy()->storage = $app->make(DatabaseStorageDriver::class);
         }
     }