archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 15:54:03 +00:00
Code Activity

tenancy=false => central=true; move config to env setup

Browse source
This commit is contained in:
Samuel Štancl 2019-10-17 20:48:20 +02:00
parent 2def3b20dd
commit 51ed344181
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/TenancyBootstrappers/QueueTenancyBootstrapper.php
View file

@ -47,7 +47,7 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper
return []; return [];
} }
if ($this->config["queue.connections.$connection.tenancy"] === false) { if ($this->config["queue.connections.$connection.central"]) {
return []; return [];
} }

5
tests/QueueTest.php
View file

@ -40,11 +40,6 @@ class QueueTest extends TestCase
$this->loadLaravelMigrations(['--database' => 'tenant']); $this->loadLaravelMigrations(['--database' => 'tenant']);
Event::fake(); Event::fake();
config(['queue.connections.central' => [
'driver' => 'sync',
'tenancy' => false,
]]);
dispatch(new TestJob())->onConnection('central'); dispatch(new TestJob())->onConnection('central');
Event::assertDispatched(JobProcessing::class, function ($event) { Event::assertDispatched(JobProcessing::class, function ($event) {

6
tests/TenantStorageTest.php
View file

@ -84,10 +84,12 @@ class TenantStorageTest extends TestCase
/** @test */ /** @test */
public function correct_storage_driver_is_used() public function correct_storage_driver_is_used()
{ {
if (config('tenancy.storage_driver') == DatabaseStorageDriver::class) { if (config('tenancy.storage_driver') == 'db') {
$this->assertSame('DatabaseStorageDriver', class_basename(tenancy()->storage)); $this->assertSame('DatabaseStorageDriver', class_basename(tenancy()->storage));
} elseif (config('tenancy.storage_driver') == RedisStorageDriver::class) { } elseif (config('tenancy.storage_driver') == 'redis') {
$this->assertSame('RedisStorageDriver', class_basename(tenancy()->storage)); $this->assertSame('RedisStorageDriver', class_basename(tenancy()->storage));
} else {
dd(class_basename(config('tenancy.storage_driver')));
} }
} }

4
tests/TestCase.php
View file

@ -99,6 +99,10 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
'tenancy.migrations_directory' => database_path('../migrations'), 'tenancy.migrations_directory' => database_path('../migrations'),
'tenancy.storage_drivers.db.connection' => 'central', 'tenancy.storage_drivers.db.connection' => 'central',
'tenancy.bootstrappers.redis' => \Stancl\Tenancy\TenancyBootstrappers\RedisTenancyBootstrapper::class, 'tenancy.bootstrappers.redis' => \Stancl\Tenancy\TenancyBootstrappers\RedisTenancyBootstrapper::class,
'queue.connections.central' => [
'driver' => 'sync',
'central' => true,
],
]); ]);
$app->singleton(\Stancl\Tenancy\TenancyBootstrappers\RedisTenancyBootstrapper::class); $app->singleton(\Stancl\Tenancy\TenancyBootstrappers\RedisTenancyBootstrapper::class);