archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 17:44:04 +00:00
Code Activity

Delete redundant test, test the same logic in the one larger test

Browse source
This commit is contained in:
lukinovec 2025-07-29 13:13:31 +02:00
parent 8cd35d3985
commit 62a0e395c3
1 changed files with 24 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

71
tests/Bootstrappers/LogTenancyBootstrapperTest.php
View file

@ -98,46 +98,55 @@ test('all channels included in the log stack get processed', function () {
test('channel overrides work correctly with both arrays and closures', function () { test('channel overrides work correctly with both arrays and closures', function () {
config([ config([
'logging.default' => 'slack', 'logging.default' => 'stack',
'logging.channels.stack.channels' => ['slack', 'single'],
'logging.channels.slack' => [ 'logging.channels.slack' => [
'driver' => 'slack',
'url' => $originalSlackUrl = 'default-webhook', 'url' => $originalSlackUrl = 'default-webhook',
'username' => 'Default', 'username' => 'Default',
], ],
]); ]);
$originalSinglePath = config('logging.channels.single.path');
$tenant = Tenant::create(['id' => 'tenant1', 'webhookUrl' => 'tenant-webhook']); $tenant = Tenant::create(['id' => 'tenant1', 'webhookUrl' => 'tenant-webhook']);
// Specify channel override for 'slack' channel using an array // Test both array mapping and closure-based overrides
LogTenancyBootstrapper::$channelOverrides = [ LogTenancyBootstrapper::$channelOverrides = [
'slack' => [ 'slack' => ['url' => 'webhookUrl'], // slack.url will be mapped to $tenant->webhookUrl
'url' => 'webhookUrl', // $tenant->webhookUrl will be used 'single' => function ($config, $tenant) {
], $config->set('logging.channels.single.path', storage_path("logs/override-{$tenant->id}.log"));
},
]; ];
tenancy()->initialize($tenant); tenancy()->initialize($tenant);
// Array mapping overrides work
expect(config('logging.channels.slack.url'))->toBe($tenant->webhookUrl); expect(config('logging.channels.slack.url'))->toBe($tenant->webhookUrl);
expect(config('logging.channels.slack.username'))->toBe('Default'); // Default username -- remains default unless specified expect(config('logging.channels.slack.username'))->toBe('Default'); // Default username, remains default unless overridden
// Closure overrides work
expect(config('logging.channels.single.path'))->toEndWith('storage/logs/override-tenant1.log');
tenancy()->end(); tenancy()->end();
// After tenancy ends, the original config should be restored // After tenancy ends, the original config should be restored
expect(config('logging.channels.slack.url'))->toBe($originalSlackUrl); expect(config('logging.channels.slack.url'))->toBe($originalSlackUrl);
expect(config('logging.channels.single.path'))->toBe($originalSinglePath);
// Now, use closure to set the slack username to $tenant->id (tenant1) // Test that we can also change array mappings to different properties
LogTenancyBootstrapper::$channelOverrides['slack'] = function ($config, $tenant) { $tenant->update(['slackUrl' => 'tenant-slack']);
$config->set('logging.channels.slack.username', $tenant->id);
}; LogTenancyBootstrapper::$channelOverrides = [
'slack' => ['url' => 'slackUrl'],
];
tenancy()->initialize($tenant); tenancy()->initialize($tenant);
expect(config('logging.channels.slack.url'))->toBe($tenant->slackUrl);
expect(config('logging.channels.slack.url'))->toBe($originalSlackUrl); // Unchanged expect(config('logging.channels.slack.username'))->toBe('Default'); // Still remains default since we only override url
expect(config('logging.channels.slack.username'))->toBe($tenant->id);
tenancy()->end(); tenancy()->end();
// Config reverted back to original expect(config('logging.channels.slack.url'))->toBe($originalSlackUrl);
expect(config('logging.channels.slack.username'))->toBe('Default'); expect(config('logging.channels.slack.username'))->toBe('Default');
}); });
@ -158,38 +167,6 @@ test('channel overrides take precedence over the default storage path channel up
expect(config('logging.channels.single.path'))->toEndWith('storage/logs/override-tenant1.log'); expect(config('logging.channels.single.path'))->toEndWith('storage/logs/override-tenant1.log');
}); });
test('multiple channel overrides work together', function () {
config([
'logging.default' => 'stack',
'logging.channels.stack' => [
'driver' => 'stack',
'channels' => ['slack', 'single'],
],
]);
$originalSinglePath = config('logging.channels.single.path');
$originalSlackUrl = config('logging.channels.slack.url');
$tenant = Tenant::create(['id' => 'tenant1', 'slackUrl' => 'tenant-slack']);
LogTenancyBootstrapper::$channelOverrides = [
'slack' => ['url' => 'slackUrl'],
'single' => function ($config, $tenant) {
$config->set('logging.channels.single.path', storage_path("logs/override-{$tenant->id}.log"));
},
];
tenancy()->initialize($tenant);
expect(config('logging.channels.slack.url'))->toBe('tenant-slack');
expect(config('logging.channels.single.path'))->toEndWith('storage/logs/override-tenant1.log');
tenancy()->end();
expect(config('logging.channels.slack.url'))->toBe($originalSlackUrl);
expect(config('logging.channels.single.path'))->toBe($originalSinglePath);
});
test('channels are forgotten and re-resolved during bootstrap and revert', function () { test('channels are forgotten and re-resolved during bootstrap and revert', function () {
config([ config([
'tenancy.bootstrappers' => [ 'tenancy.bootstrappers' => [