archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-04 19:34:04 +00:00
Code Activity

fix ./test

Browse source
This commit is contained in:
Samuel Štancl 2019-08-15 14:06:54 +02:00
parent f183235992
commit 19409d7723
3 changed files with 15 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/TenantManager.php
View file

@ -23,7 +23,7 @@ final class TenantManager
* *
* @var StorageDriver * @var StorageDriver
*/ */
protected $storage; public $storage;
/** /**
* Database manager. * Database manager.
@ -350,24 +350,4 @@ final class TenantManager
return $this->tenant[(string) $attribute]; 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;
}
} }

6
test
View file

@ -4,9 +4,9 @@ set -e
# for development # for development
docker-compose up -d docker-compose up -d
printf "Variant 1\n\n" 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" 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" 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/ docker-compose exec test vendor/bin/phpcov merge --clover clover.xml coverage/

17
tests/TestCase.php
View file

@ -5,6 +5,7 @@ namespace Stancl\Tenancy\Tests;
use Illuminate\Support\Facades\Redis; use Illuminate\Support\Facades\Redis;
use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Artisan;
use Stancl\Tenancy\StorageDrivers\DatabaseStorageDriver; use Stancl\Tenancy\StorageDrivers\DatabaseStorageDriver;
use Stancl\Tenancy\StorageDrivers\RedisStorageDriver;
abstract class TestCase extends \Orchestra\Testbench\TestCase abstract class TestCase extends \Orchestra\Testbench\TestCase
{ {
@ -25,10 +26,10 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
// $this->loadLaravelMigrations(); // $this->loadLaravelMigrations();
$this->loadMigrationsFrom(realpath(__DIR__ . '/../src/assets/migrations')); $this->loadMigrationsFrom(realpath(__DIR__ . '/../src/assets/migrations/'));
// Artisan::call('migrate:fresh', [ // Artisan::call('migrate:fresh', [
// '--path' => __DIR__ . '/../src/assets/migrations' // '--path' => __DIR__ . '/../src/assets/migrations/'
// ]); // ]);
// dd(Artisan::output()); // dd(Artisan::output());
@ -95,14 +96,18 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
'tenancy.migrations_directory' => database_path('../migrations'), '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([ $app['config']->set([
'tenancy.redis.tenancy' => true,
'database.redis.client' => 'phpredis',
'tenancy.storage_driver' => DatabaseStorageDriver::class, 'tenancy.storage_driver' => DatabaseStorageDriver::class,
]); ]);
tenancy()->setStorageDriver(DatabaseStorageDriver::class); tenancy()->storage = $app->make(DatabaseStorageDriver::class);
} }
} }