diff --git a/src/TenancyBootstrappers/QueueTenancyBootstrapper.php b/src/TenancyBootstrappers/QueueTenancyBootstrapper.php index c547215c..b2a0fbf2 100644 --- a/src/TenancyBootstrappers/QueueTenancyBootstrapper.php +++ b/src/TenancyBootstrappers/QueueTenancyBootstrapper.php @@ -47,7 +47,7 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper return []; } - if ($this->config["queue.connections.$connection.tenancy"] === false) { + if ($this->config["queue.connections.$connection.central"]) { return []; } diff --git a/tests/QueueTest.php b/tests/QueueTest.php index 50bdf1b2..d657fc66 100644 --- a/tests/QueueTest.php +++ b/tests/QueueTest.php @@ -40,11 +40,6 @@ class QueueTest extends TestCase $this->loadLaravelMigrations(['--database' => 'tenant']); Event::fake(); - config(['queue.connections.central' => [ - 'driver' => 'sync', - 'tenancy' => false, - ]]); - dispatch(new TestJob())->onConnection('central'); Event::assertDispatched(JobProcessing::class, function ($event) { diff --git a/tests/TenantStorageTest.php b/tests/TenantStorageTest.php index 88bd5823..9b5789a1 100644 --- a/tests/TenantStorageTest.php +++ b/tests/TenantStorageTest.php @@ -84,10 +84,12 @@ class TenantStorageTest extends TestCase /** @test */ 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)); - } elseif (config('tenancy.storage_driver') == RedisStorageDriver::class) { + } elseif (config('tenancy.storage_driver') == 'redis') { $this->assertSame('RedisStorageDriver', class_basename(tenancy()->storage)); + } else { + dd(class_basename(config('tenancy.storage_driver'))); } } diff --git a/tests/TestCase.php b/tests/TestCase.php index 19b0a83f..8df82561 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -99,6 +99,10 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase 'tenancy.migrations_directory' => database_path('../migrations'), 'tenancy.storage_drivers.db.connection' => 'central', 'tenancy.bootstrappers.redis' => \Stancl\Tenancy\TenancyBootstrappers\RedisTenancyBootstrapper::class, + 'queue.connections.central' => [ + 'driver' => 'sync', + 'central' => true, + ], ]); $app->singleton(\Stancl\Tenancy\TenancyBootstrappers\RedisTenancyBootstrapper::class);