archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-09-20 14:14:03 +00:00
Code Activity

Assert that nested scoped disks are scoped properly (regression test)

Browse source 
The test fails with the nested disk dataset because we resolve a disk first, then initialize tenancy, and because the nested scoped disks aren't forgotten, so the disk config changes that the FS bootstrapper applies aren't reflected on the already-resolved disk instance.
This commit is contained in:
lukinovec 2026-09-03 14:53:59 +02:00 • committed by Samuel Stancl
parent e0e696f83e
commit ae91281d3a
1 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

42
tests/Bootstrappers/FilesystemTenancyBootstrapperTest.php
View file

@ -250,7 +250,7 @@ test('the framework/cache directory is created when storage_path is scoped', fun
} }
})->with([true, false]); })->with([true, false]);
test('scoped disks are scoped per tenant', function () { test('scoped disks are scoped per tenant', function (bool $nested) {
config([ config([
'tenancy.bootstrappers' => [ 'tenancy.bootstrappers' => [
FilesystemTenancyBootstrapper::class, FilesystemTenancyBootstrapper::class,
@ -260,30 +260,44 @@ test('scoped disks are scoped per tenant', function () {
'disk' => 'public', 'disk' => 'public',
'prefix' => 'scoped_disk_prefix', 'prefix' => 'scoped_disk_prefix',
], ],
'filesystems.disks.nested_disk' => [
'driver' => 'scoped',
'disk' => 'scoped_disk',
'prefix' => 'nested_disk_prefix',
],
]); ]);
$disk = $nested ? 'nested_disk' : 'scoped_disk';
$prefix = $nested ? 'scoped_disk_prefix/nested_disk_prefix' : 'scoped_disk_prefix';
$tenant = Tenant::create(); $tenant = Tenant::create();
Storage::disk('scoped_disk')->put('foo.txt', 'central'); Storage::disk($disk)->put('foo.txt', 'central');
expect(Storage::disk('scoped_disk')->get('foo.txt'))->toBe('central');
expect(file_get_contents(storage_path() . "/app/public/scoped_disk_prefix/foo.txt"))->toBe('central'); config(['filesystem.disks.public.prefix' => 'scoped_disk_prefix']);
expect(Storage::disk($disk)->get('foo.txt'))->toBe('central');
expect(file_get_contents(storage_path() . "/app/public/{$prefix}/foo.txt"))->toBe('central');
tenancy()->initialize($tenant); tenancy()->initialize($tenant);
expect(Storage::disk('scoped_disk')->get('foo.txt'))->toBe(null); expect(Storage::disk($disk)->get('foo.txt'))->toBe(null);
Storage::disk('scoped_disk')->put('foo.txt', 'tenant'); Storage::disk($disk)->put('foo.txt', 'tenant');
expect(file_get_contents(storage_path() . "/app/public/scoped_disk_prefix/foo.txt"))->toBe('tenant'); expect(file_get_contents(storage_path() . "/app/public/{$prefix}/foo.txt"))->toBe('tenant');
expect(Storage::disk('scoped_disk')->get('foo.txt'))->toBe('tenant'); expect(Storage::disk($disk)->get('foo.txt'))->toBe('tenant');
tenancy()->end(); tenancy()->end();
expect(Storage::disk('scoped_disk')->get('foo.txt'))->toBe('central'); expect(Storage::disk($disk)->get('foo.txt'))->toBe('central');
Storage::disk('scoped_disk')->put('foo.txt', 'central2'); Storage::disk($disk)->put('foo.txt', 'central2');
expect(Storage::disk('scoped_disk')->get('foo.txt'))->toBe('central2'); expect(Storage::disk($disk)->get('foo.txt'))->toBe('central2');
expect(file_get_contents(storage_path() . "/app/public/scoped_disk_prefix/foo.txt"))->toBe('central2'); expect(file_get_contents(storage_path() . "/app/public/{$prefix}/foo.txt"))->toBe('central2');
expect(file_get_contents(storage_path() . "/tenant{$tenant->id}/app/public/scoped_disk_prefix/foo.txt"))->toBe('tenant'); expect(file_get_contents(storage_path() . "/tenant{$tenant->id}/app/public/{$prefix}/foo.txt"))->toBe('tenant');
}); })->with([
'scoped disk' => false,
'nested scoped disk' => true,
]);
test('file cache stores get their paths scoped on bootstrap and restored back on revert', function () { test('file cache stores get their paths scoped on bootstrap and restored back on revert', function () {
$fooPath = storage_path('framework/cache/foo_file'); $fooPath = storage_path('framework/cache/foo_file');