[12.x] Test Improvements (#54782)

crynobone · web-flow · commit 3ea6180a99ed · 2025-02-25T17:26:23.000+08:00
* [12.x] Test Improvements

Signed-off-by: Mior Muhammad Zaki &lt;crynobone@gmail.com&gt;

* wip

Signed-off-by: Mior Muhammad Zaki &lt;crynobone@gmail.com&gt;

* wip

Signed-off-by: Mior Muhammad Zaki &lt;crynobone@gmail.com&gt;

---------

Signed-off-by: Mior Muhammad Zaki &lt;crynobone@gmail.com&gt;
diff --git a/composer.json b/composer.json
@@ -111,7 +111,7 @@
         "league/flysystem-read-only": "^3.25.1",
         "league/flysystem-sftp-v3": "^3.25.1",
         "mockery/mockery": "^1.6.10",
-        "orchestra/testbench-core": "^10.0",
+        "orchestra/testbench-core": "^10.0.0",
         "pda/pheanstalk": "^5.0.6",
         "php-http/discovery": "^1.15",
         "phpstan/phpstan": "^2.0",
diff --git a/tests/Integration/Cache/Psr6RedisTest.php b/tests/Integration/Cache/Psr6RedisTest.php
@@ -21,9 +21,9 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        parent::tearDown();
-
         $this->tearDownRedis();
+
+        parent::tearDown();
     }
 
     #[DataProvider('redisClientDataProvider')]
diff --git a/tests/Integration/Cache/RedisStoreTest.php b/tests/Integration/Cache/RedisStoreTest.php
@@ -25,10 +25,9 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        parent::tearDown();
-
         $this->tearDownRedis();
-        m::close();
+
+        parent::tearDown();
     }
 
     public function testCacheTtl(): void
diff --git a/tests/Integration/Console/CallbackSchedulingTest.php b/tests/Integration/Console/CallbackSchedulingTest.php
@@ -45,13 +45,6 @@ public function store($name = null)
         $container->instance(SchedulingMutex::class, new CacheSchedulingMutex($cache));
     }
 
-    protected function tearDown(): void
-    {
-        Container::setInstance(null);
-
-        parent::tearDown();
-    }
-
     public function testExecutionOrder()
     {
         $event = $this->app->make(Schedule::class)
diff --git a/tests/Integration/Console/Scheduling/ScheduleListCommandTest.php b/tests/Integration/Console/Scheduling/ScheduleListCommandTest.php
@@ -156,11 +156,9 @@ public function testClosureCommandsMayBeScheduled()
 
     protected function tearDown(): void
     {
-        parent::tearDown();
-
         putenv('SHELL_VERBOSITY');
 
-        ScheduleListCommand::resolveTerminalWidthUsing(null);
+        parent::tearDown();
     }
 }
 
diff --git a/tests/Integration/Database/EloquentBelongsToManyTest.php b/tests/Integration/Database/EloquentBelongsToManyTest.php
@@ -15,13 +15,6 @@
 
 class EloquentBelongsToManyTest extends DatabaseTestCase
 {
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-
-        Carbon::setTestNow(null);
-    }
-
     protected function afterRefreshingDatabase()
     {
         Schema::create('users', function (Blueprint $table) {
diff --git a/tests/Integration/Database/EloquentMassPrunableTest.php b/tests/Integration/Database/EloquentMassPrunableTest.php
@@ -2,7 +2,6 @@
 
 namespace Illuminate\Tests\Integration\Database;
 
-use Illuminate\Container\Container;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Database\Eloquent\MassPrunable;
 use Illuminate\Database\Eloquent\Model;
@@ -19,13 +18,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        Container::setInstance($container = new Container);
-
-        $container->singleton(Dispatcher::class, function () {
+        $this->app->singleton(Dispatcher::class, function () {
             return m::mock(Dispatcher::class);
         });
 
-        $container->alias(Dispatcher::class, 'events');
+        $this->app->alias(Dispatcher::class, 'events');
     }
 
     protected function afterRefreshingDatabase()
@@ -93,15 +90,6 @@ public function testPrunesSoftDeletedRecords()
         $this->assertEquals(0, MassPrunableSoftDeleteTestModel::count());
         $this->assertEquals(2000, MassPrunableSoftDeleteTestModel::withTrashed()->count());
     }
-
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-
-        Container::setInstance(null);
-
-        m::close();
-    }
 }
 
 class MassPrunableTestModel extends Model
diff --git a/tests/Integration/Events/ListenerTest.php b/tests/Integration/Events/ListenerTest.php
@@ -11,8 +11,6 @@ class ListenerTest extends TestCase
 {
     protected function tearDown(): void
     {
-        parent::tearDown();
-
         ListenerTestListener::$ran = false;
         ListenerTestListenerAfterCommit::$ran = false;
 
diff --git a/tests/Integration/Foundation/Console/OptimizeCommandTest.php b/tests/Integration/Foundation/Console/OptimizeCommandTest.php
@@ -14,6 +14,7 @@ class OptimizeCommandTest extends TestCase
     protected $files = [
         'bootstrap/cache/config.php',
         'bootstrap/cache/events.php',
+        'bootstrap/cache/routes-v7.php',
     ];
 
     protected function getPackageProviders($app): array
diff --git a/tests/Integration/Foundation/Support/Providers/RouteServiceProviderHealthTest.php b/tests/Integration/Foundation/Support/Providers/RouteServiceProviderHealthTest.php
@@ -4,8 +4,10 @@
 
 use Illuminate\Foundation\Application;
 use Illuminate\Support\Str;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 
+#[WithConfig('filesystems.disks.local.serve', false)]
 class RouteServiceProviderHealthTest extends TestCase
 {
     /**
diff --git a/tests/Integration/Foundation/Support/Providers/RouteServiceProviderTest.php b/tests/Integration/Foundation/Support/Providers/RouteServiceProviderTest.php
@@ -8,8 +8,10 @@
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Testing\Assert;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 
+#[WithConfig('filesystems.disks.local.serve', false)]
 class RouteServiceProviderTest extends TestCase
 {
     /**
diff --git a/tests/Integration/Migration/MigratorTest.php b/tests/Integration/Migration/MigratorTest.php
@@ -32,8 +32,9 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        parent::tearDown();
         Migrator::withoutMigrations([]);
+
+        parent::tearDown();
     }
 
     public function testMigrate()
diff --git a/tests/Integration/Queue/DeleteModelWhenMissingTest.php b/tests/Integration/Queue/DeleteModelWhenMissingTest.php
@@ -38,9 +38,9 @@ protected function destroyDatabaseMigrations()
     #[\Override]
     protected function tearDown(): void
     {
-        parent::tearDown();
-
         DeleteMissingModelJob::$handled = false;
+
+        parent::tearDown();
     }
 
     public function test_deleteModelWhenMissing_and_display_name(): void
diff --git a/tests/Integration/Queue/WorkCommandTest.php b/tests/Integration/Queue/WorkCommandTest.php
@@ -7,7 +7,6 @@
 use Illuminate\Database\UniqueConstraintViolationException;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
-use Illuminate\Queue\Console\WorkCommand;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Exceptions;
@@ -34,13 +33,6 @@ protected function setUp(): void
         $this->markTestSkippedWhenUsingSyncQueueDriver();
     }
 
-    protected function tearDown(): void
-    {
-        WorkCommand::flushState();
-
-        parent::tearDown();
-    }
-
     public function testRunningOneJob()
     {
         Queue::push(new FirstJob);
diff --git a/tests/Integration/Routing/ImplicitModelRouteBindingTest.php b/tests/Integration/Routing/ImplicitModelRouteBindingTest.php
@@ -9,9 +9,11 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Schema;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\Concerns\InteractsWithPublishedFiles;
 use Orchestra\Testbench\TestCase;
 
+#[WithConfig('app.key', 'AckfSECXIvnK5r28GVIWUAxmbBSjTsmF')]
 class ImplicitModelRouteBindingTest extends TestCase
 {
     use InteractsWithPublishedFiles;
@@ -20,18 +22,6 @@ class ImplicitModelRouteBindingTest extends TestCase
         'routes/testbench.php',
     ];
 
-    protected function tearDown(): void
-    {
-        $this->tearDownInteractsWithPublishedFiles();
-
-        parent::tearDown();
-    }
-
-    protected function defineEnvironment($app): void
-    {
-        $app['config']->set(['app.key' => 'AckfSECXIvnK5r28GVIWUAxmbBSjTsmF']);
-    }
-
     protected function defineDatabaseMigrations(): void
     {
         Schema::create('users', function (Blueprint $table) {
diff --git a/tests/Integration/Routing/UrlSigningTest.php b/tests/Integration/Routing/UrlSigningTest.php
@@ -14,13 +14,6 @@
 
 class UrlSigningTest extends TestCase
 {
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-
-        Carbon::setTestNow(null);
-    }
-
     protected function defineEnvironment($app): void
     {
         $app['config']->set(['app.key' => 'AckfSECXIvnK5r28GVIWUAxmbBSjTsmF']);
diff --git a/tests/Testing/Console/RouteListCommandTest.php b/tests/Testing/Console/RouteListCommandTest.php
@@ -9,8 +9,10 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Facade;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 
+#[WithConfig('filesystems.disks.local.serve', false)]
 class RouteListCommandTest extends TestCase
 {
     use InteractsWithDeprecationHandling;

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ protected function setUp(): void`
`21`	`21`
`22`	`22`	`protected function tearDown(): void`
`23`	`23`	`{`
`24`		`- parent::tearDown();`
`25`		`-`
`26`	`24`	`$this->tearDownRedis();`
	`25`	`+`
	`26`	`+ parent::tearDown();`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`#[DataProvider('redisClientDataProvider')]`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,9 @@ protected function setUp(): void`
`25`	`25`
`26`	`26`	`protected function tearDown(): void`
`27`	`27`	`{`
`28`		`- parent::tearDown();`
`29`		`-`
`30`	`28`	`$this->tearDownRedis();`
`31`		`- m::close();`
	`29`	`+`
	`30`	`+ parent::tearDown();`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`public function testCacheTtl(): void`
Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,6 @@ public function store($name = null)`
`45`	`45`	`$container->instance(SchedulingMutex::class, new CacheSchedulingMutex($cache));`
`46`	`46`	`}`
`47`	`47`
`48`		`- protected function tearDown(): void`
`49`		`- {`
`50`		`- Container::setInstance(null);`
`51`		`-`
`52`		`- parent::tearDown();`
`53`		`- }`
`54`		`-`
`55`	`48`	`public function testExecutionOrder()`
`56`	`49`	`{`
`57`	`50`	`$event = $this->app->make(Schedule::class)`
Original file line number	Diff line number	Diff line change
`@@ -156,11 +156,9 @@ public function testClosureCommandsMayBeScheduled()`
`156`	`156`
`157`	`157`	`protected function tearDown(): void`
`158`	`158`	`{`
`159`		`- parent::tearDown();`
`160`		`-`
`161`	`159`	`putenv('SHELL_VERBOSITY');`
`162`	`160`
`163`		`- ScheduleListCommand::resolveTerminalWidthUsing(null);`
	`161`	`+ parent::tearDown();`
`164`	`162`	`}`
`165`	`163`	`}`
`166`	`164`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,6 @@`
`15`	`15`
`16`	`16`	`class EloquentBelongsToManyTest extends DatabaseTestCase`
`17`	`17`	`{`
`18`		`- protected function tearDown(): void`
`19`		`- {`
`20`		`- parent::tearDown();`
`21`		`-`
`22`		`- Carbon::setTestNow(null);`
`23`		`- }`
`24`		`-`
`25`	`18`	`protected function afterRefreshingDatabase()`
`26`	`19`	`{`
`27`	`20`	`Schema::create('users', function (Blueprint $table) {`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ class ListenerTest extends TestCase`
`11`	`11`	`{`
`12`	`12`	`protected function tearDown(): void`
`13`	`13`	`{`
`14`		`- parent::tearDown();`
`15`		`-`
`16`	`14`	`ListenerTestListener::$ran = false;`
`17`	`15`	`ListenerTestListenerAfterCommit::$ran = false;`
`18`	`16`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,10 @@`
`4`	`4`
`5`	`5`	`use Illuminate\Foundation\Application;`
`6`	`6`	`use Illuminate\Support\Str;`
	`7`	`+use Orchestra\Testbench\Attributes\WithConfig;`
`7`	`8`	`use Orchestra\Testbench\TestCase;`
`8`	`9`
	`10`	`+#[WithConfig('filesystems.disks.local.serve', false)]`
`9`	`11`	`class RouteServiceProviderHealthTest extends TestCase`
`10`	`12`	`{`
`11`	`13`	`/**`