diff --git a/tests/Bootstrappers/BootstrapperTest.php b/tests/Bootstrappers/BootstrapperTest.php index ca1601b8..c4fed90c 100644 --- a/tests/Bootstrappers/BootstrapperTest.php +++ b/tests/Bootstrappers/BootstrapperTest.php @@ -23,7 +23,6 @@ use Stancl\Tenancy\Bootstrappers\RedisTenancyBootstrapper; use Stancl\Tenancy\Bootstrappers\DatabaseTenancyBootstrapper; use Stancl\Tenancy\Bootstrappers\FilesystemTenancyBootstrapper; use Stancl\Tenancy\Bootstrappers\CacheTenancyBootstrapper; -use Stancl\Tenancy\Bootstrappers\DatabaseCacheBootstrapper; use function Stancl\Tenancy\Tests\pest; beforeEach(function () { @@ -81,44 +80,28 @@ test('cache data is separated', function (string $store, string $bootstrapper) { 'cache.default' => $store, ]); - if ($bootstrapper === DatabaseCacheBootstrapper::class) { - config(['tenancy.bootstrappers' => [DatabaseTenancyBootstrapper::class, $bootstrapper]]); - } elseif ($store === 'database') { - // Not needed with DatabaseCacheBootstrapper, as it always uses the tenant connection for tenant cache + if ($store === 'database') { config([ 'cache.stores.database.connection' => 'central', 'cache.stores.database.lock_connection' => 'central', ]); + + Schema::create('cache', function (Blueprint $table) { + $table->string('key')->primary(); + $table->mediumText('value'); + $table->integer('expiration'); + }); + + Schema::create('cache_locks', function (Blueprint $table) { + $table->string('key')->primary(); + $table->string('owner'); + $table->integer('expiration'); + }); } $tenant1 = Tenant::create(); $tenant2 = Tenant::create(); - if ($store === 'database') { - $createCacheTables = function () { - Schema::create('cache', function (Blueprint $table) { - $table->string('key')->primary(); - $table->mediumText('value'); - $table->integer('expiration'); - }); - - Schema::create('cache_locks', function (Blueprint $table) { - $table->string('key')->primary(); - $table->string('owner'); - $table->integer('expiration'); - }); - }; - - // Create cache tables in central DB - $createCacheTables(); - - if ($bootstrapper === DatabaseCacheBootstrapper::class) { - // Create cache tables in tenant DBs - // With this bootstrapper, cache will be saved in these tenant DBs instead of the central DB - tenancy()->runForMultiple([$tenant1, $tenant2], $createCacheTables); - } - } - cache()->set('foo', 'central'); expect(Cache::get('foo'))->toBe('central'); @@ -158,8 +141,6 @@ test('cache data is separated', function (string $store, string $bootstrapper) { ['memcached', CacheTenancyBootstrapper::class], ['database', CacheTenancyBootstrapper::class], ['dynamodb', CacheTenancyBootstrapper::class], - - ['database', DatabaseCacheBootstrapper::class], ]); test('redis data is separated', function () {