improve test logic

src/Commands/Up.php

@@ -13,7 +13,7 @@ class Up extends Command
 
     protected $signature = 'tenants:up';
 
-    protected $description = 'Put tenants out of maintenance';
+    protected $description = 'Put tenants out of maintenance mode.';
 
     public function handle(): void
     {

tests/MaintenanceModeTest.php

@@ -4,13 +4,12 @@ declare(strict_types=1);
 
 use Illuminate\Support\Facades\Artisan;
 use Stancl\Tenancy\Database\Concerns\MaintenanceMode;
-use Symfony\Component\HttpKernel\Exception\HttpException;
 use Illuminate\Support\Facades\Route;
 use Stancl\Tenancy\Middleware\CheckTenantForMaintenanceMode;
 use Stancl\Tenancy\Middleware\InitializeTenancyByDomain;
 use Stancl\Tenancy\Tests\Etc\Tenant;
 
-test('tenant can be in maintenance mode', function () {
+test('tenants can be in maintenance mode', function () {
     Route::get('/foo', function () {
         return 'bar';
     })->middleware([InitializeTenancyByDomain::class, CheckTenantForMaintenanceMode::class]);
@@ -20,27 +19,20 @@ test('tenant can be in maintenance mode', function () {
         'domain' => 'acme.localhost',
     ]);
 
-    pest()->get('http://acme.localhost/foo')
+    pest()->get('http://acme.localhost/foo')->assertStatus(200);
-        ->assertSuccessful();
-
-    tenancy()->end(); // Flush stored tenant instance
 
     $tenant->putDownForMaintenance();
 
+    tenancy()->end(); // End tenancy before making a request
     pest()->get('http://acme.localhost/foo')->assertStatus(503);
 
-    tenancy()->end();
-
     $tenant->bringUpFromMaintenance();
 
-    tenancy()->end();
+    tenancy()->end(); // End tenancy before making a request
-
+    pest()->get('http://acme.localhost/foo')->assertStatus(200);
-    pest()->get('http://acme.localhost/foo')
-        ->assertSuccessful()
-        ->assertSeeText('bar');
 });
 
-test('tenant can be in maintenance mode from command', function() {
+test('tenants can be put into maintenance mode using artisan commands', function() {
     Route::get('/foo', function () {
         return 'bar';
     })->middleware([InitializeTenancyByDomain::class, CheckTenantForMaintenanceMode::class]);
@@ -50,24 +42,17 @@ test('tenant can be in maintenance mode from command', function() {
         'domain' => 'acme.localhost',
     ]);
 
-    pest()->get('http://acme.localhost/foo')
+    pest()->get('http://acme.localhost/foo')->assertStatus(200);
-        ->assertSuccessful();
-
-    tenancy()->end(); // Flush stored tenant instance
 
     Artisan::call('tenants:down');
 
+    tenancy()->end(); // End tenancy before making a request
     pest()->get('http://acme.localhost/foo')->assertStatus(503);
 
-    tenancy()->end();
-
     Artisan::call('tenants:up');
 
-    tenancy()->end();
+    tenancy()->end(); // End tenancy before making a request
-
+    pest()->get('http://acme.localhost/foo')->assertStatus(200);
-    pest()->get('http://acme.localhost/foo')
-        ->assertSuccessful()
-        ->assertSeeText('bar');
 });
 
 class MaintenanceTenant extends Tenant