Skip to content

Commit 4e7ad0c

Browse files
committed
Make code more concise
1 parent db12ddf commit 4e7ad0c

1 file changed

Lines changed: 9 additions & 18 deletions

File tree

tests/CachedTenantResolverTest.php

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919

2020
test('tenants can be resolved using cached resolvers', function (string $resolver, bool $default) {
2121
$tenant = Tenant::create([$tenantColumn = tenantModelColumn($default) => 'acme']);
22-
$tenantParameterValue = $tenant->{$tenantColumn};
23-
24-
$tenant->createDomain($tenantParameterValue);
22+
$tenant->createDomain($tenant->{$tenantColumn});
2523

2624
expect($tenant->is(app($resolver)->resolve(getResolverArgument($resolver, $tenant, $tenantColumn))))->toBeTrue();
2725
})->with([
@@ -35,9 +33,7 @@
3533

3634
test('the underlying resolver is not touched when using the cached resolver', function (string $resolver, bool $default) {
3735
$tenant = Tenant::create([$tenantColumn = tenantModelColumn($default) => 'acme']);
38-
$tenantParameterValue = $tenant->{$tenantColumn};
39-
40-
$tenant->createDomain($tenantParameterValue);
36+
$tenant->createDomain($tenant->{$tenantColumn});
4137

4238
DB::enableQueryLog();
4339

@@ -66,9 +62,7 @@
6662

6763
test('cache is invalidated when the tenant is updated', function (string $resolver, bool $default) {
6864
$tenant = Tenant::create([$tenantColumn = tenantModelColumn($default) => 'acme']);
69-
$tenantParameterValue = $tenant->{$tenantColumn};
70-
71-
$tenant->createDomain($tenantParameterValue);
65+
$tenant->createDomain($tenant->{$tenantColumn});
7266

7367
DB::enableQueryLog();
7468

@@ -100,12 +94,9 @@
10094
]);
10195

10296
test('cache is invalidated when the tenant is deleted', function (string $resolver, bool $default) {
103-
$tenant = Tenant::create([$tenantColumn = tenantModelColumn($default) => 'acme']);
104-
$tenantParameterValue = $tenant->{$tenantColumn};
105-
10697
DB::statement('SET FOREIGN_KEY_CHECKS=0;'); // allow deleting the tenant
107-
108-
$tenant->createDomain($tenantParameterValue);
98+
$tenant = Tenant::create([$tenantColumn = tenantModelColumn($default) => 'acme']);
99+
$tenant->createDomain($tenant->{$tenantColumn});
109100

110101
DB::enableQueryLog();
111102

@@ -134,8 +125,8 @@
134125
]);
135126

136127
test('cache is invalidated when a tenants domain is changed', function () {
137-
$tenant = Tenant::create(['id' => $domain = 'acme']);
138-
$tenant->createDomain($domain);
128+
$tenant = Tenant::create(['id' => $tenantKey = 'acme']);
129+
$tenant->createDomain($tenantKey);
139130

140131
DB::enableQueryLog();
141132

@@ -160,8 +151,8 @@
160151
});
161152

162153
test('cache is invalidated when a tenants domain is deleted', function () {
163-
$tenant = Tenant::create(['id' => $domain = 'acme']);
164-
$tenant->createDomain($domain);
154+
$tenant = Tenant::create(['id' => $tenantKey = 'acme']);
155+
$tenant->createDomain($tenantKey);
165156

166157
DB::enableQueryLog();
167158

0 commit comments

Comments
 (0)