diff --git a/src/tests/Feature/Controller/SkusTest.php b/src/tests/Feature/Controller/SkusTest.php --- a/src/tests/Feature/Controller/SkusTest.php +++ b/src/tests/Feature/Controller/SkusTest.php @@ -5,6 +5,7 @@ use App\Entitlement; use App\Http\Controllers\API\V4\SkusController; use App\Sku; +use App\Tenant; use Tests\TestCase; class SkusTest extends TestCase @@ -55,7 +56,8 @@ 'cost' => 100, 'handler_class' => 'App\Handlers\Mailbox', ]); - $nsku->tenant_id = 2; + $tenant = Tenant::whereNotIn('id', [\config('app.tenant_id')])->first(); + $nsku->tenant_id = $tenant->id; $nsku->save(); $response = $this->actingAs($user)->get("api/v4/skus"); @@ -98,7 +100,8 @@ 'cost' => 100, 'handler_class' => 'App\Handlers\Mailbox', ]); - $nsku->tenant_id = 2; + $tenant = Tenant::whereNotIn('id', [\config('app.tenant_id')])->first(); + $nsku->tenant_id = $tenant->id; $nsku->save(); $response = $this->actingAs($user)->get("api/v4/users/{$user->id}/skus"); diff --git a/src/tests/Feature/DomainTest.php b/src/tests/Feature/DomainTest.php --- a/src/tests/Feature/DomainTest.php +++ b/src/tests/Feature/DomainTest.php @@ -6,6 +6,7 @@ use App\Entitlement; use App\Sku; use App\User; +use App\Tenant; use Illuminate\Support\Facades\Queue; use Tests\TestCase; @@ -130,7 +131,8 @@ $this->assertContains('public-active.com', $public_domains); // Domains of other tenants should not be returned - $domain->tenant_id = 2; + $tenant = Tenant::whereNotIn('id', [\config('app.tenant_id')])->first(); + $domain->tenant_id = $tenant->id; $domain->save(); $public_domains = Domain::getPublicDomains(); diff --git a/src/tests/Feature/TenantTest.php b/src/tests/Feature/TenantTest.php --- a/src/tests/Feature/TenantTest.php +++ b/src/tests/Feature/TenantTest.php @@ -39,7 +39,7 @@ $this->assertSame(\config('app.env'), Tenant::getConfig(null, 'app.env')); $this->assertSame(null, Tenant::getConfig(null, 'app.unknown')); - $tenant = Tenant::whereNotIn('id', [1])->first(); + $tenant = Tenant::whereNotIn('id', [\config('app.tenant_id')])->first(); $tenant->setSetting('app.test', 'test'); // Tenant specified @@ -54,7 +54,7 @@ */ public function testWallet(): void { - $tenant = Tenant::find(1); + $tenant = Tenant::find(\config('app.tenant_id')); $user = \App\User::where('email', 'reseller@' . \config('app.domain'))->first(); $wallet = $tenant->wallet();