[11.x] Test improvements (#54879)

crynobone · web-flow · commit c666f89566d6 · 2025-03-04T08:53:37.000-06:00
* [11.x] Test Improvements

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

* 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;

* wip

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": "^9.9.4",
+        "orchestra/testbench-core": "^9.11.2",
         "pda/pheanstalk": "^5.0.6",
         "php-http/discovery": "^1.15",
         "phpstan/phpstan": "^2.0",
diff --git a/tests/Integration/Cache/DynamoDbStoreTest.php b/tests/Integration/Cache/DynamoDbStoreTest.php
@@ -65,7 +65,7 @@ public function testLocksCanBeAcquired()
      * @param  \Illuminate\Foundation\Application  $app
      * @return void
      */
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         if (! env('DYNAMODB_CACHE_TABLE')) {
             $this->markTestSkipped('DynamoDB not configured.');
diff --git a/tests/Integration/Cookie/CookieTest.php b/tests/Integration/Cookie/CookieTest.php
@@ -42,7 +42,7 @@ public function test_cookie_is_sent_back_with_proper_expire_time_with_respect_to
         $this->assertEquals(Carbon::now()->getTimestamp() + 60, $response->headers->getCookies()[1]->getExpiresTime());
     }
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $app->instance(
             ExceptionHandler::class,
diff --git a/tests/Integration/Database/EloquentTransactionWithAfterCommitUsingDatabaseTransactionsTest.php b/tests/Integration/Database/EloquentTransactionWithAfterCommitUsingDatabaseTransactionsTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
         }
     }
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $connection = $app->make('config')->get('database.default');
 
diff --git a/tests/Integration/Database/MariaDb/DatabaseEmulatePreparesMariaDbConnectionTest.php b/tests/Integration/Database/MariaDb/DatabaseEmulatePreparesMariaDbConnectionTest.php
@@ -10,9 +10,9 @@
 #[RequiresPhpExtension('pdo_mysql')]
 class DatabaseEmulatePreparesMariaDbConnectionTest extends DatabaseMariaDbConnectionTest
 {
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
-        parent::getEnvironmentSetUp($app);
+        parent::defineEnvironment($app);
 
         $app['config']->set('database.connections.mariadb.options', [
             PDO::ATTR_EMULATE_PREPARES => true,
diff --git a/tests/Integration/Database/MySql/DatabaseEmulatePreparesMySqlConnectionTest.php b/tests/Integration/Database/MySql/DatabaseEmulatePreparesMySqlConnectionTest.php
@@ -10,9 +10,9 @@
 #[RequiresPhpExtension('pdo_mysql')]
 class DatabaseEmulatePreparesMySqlConnectionTest extends DatabaseMySqlConnectionTest
 {
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
-        parent::getEnvironmentSetUp($app);
+        parent::defineEnvironment($app);
 
         $app['config']->set('database.connections.mysql.options', [
             PDO::ATTR_EMULATE_PREPARES => true,
diff --git a/tests/Integration/Database/Postgres/PostgresSchemaBuilderTest.php b/tests/Integration/Database/Postgres/PostgresSchemaBuilderTest.php
@@ -13,9 +13,9 @@
 #[RequiresPhpExtension('pdo_pgsql')]
 class PostgresSchemaBuilderTest extends PostgresTestCase
 {
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
-        parent::getEnvironmentSetUp($app);
+        parent::defineEnvironment($app);
 
         $app['config']->set('database.connections.pgsql.search_path', 'public,private');
     }
diff --git a/tests/Integration/Mail/SendingMarkdownMailTest.php b/tests/Integration/Mail/SendingMarkdownMailTest.php
@@ -12,7 +12,7 @@
 
 class SendingMarkdownMailTest extends TestCase
 {
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $app['config']->set('mail.driver', 'array');
 
diff --git a/tests/Integration/Mail/SendingQueuedMailTest.php b/tests/Integration/Mail/SendingQueuedMailTest.php
@@ -11,7 +11,7 @@
 
 class SendingQueuedMailTest extends TestCase
 {
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $app['config']->set('mail.driver', 'array');
 
diff --git a/tests/Integration/Queue/JobEncryptionTest.php b/tests/Integration/Queue/JobEncryptionTest.php
@@ -21,9 +21,9 @@ class JobEncryptionTest extends DatabaseTestCase
 {
     use DatabaseMigrations;
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
-        parent::getEnvironmentSetUp($app);
+        parent::defineEnvironment($app);
 
         $app['config']->set('app.key', Str::random(32));
         $app['config']->set('queue.default', 'database');
diff --git a/tests/Integration/Queue/ModelSerializationTest.php b/tests/Integration/Queue/ModelSerializationTest.php
@@ -18,7 +18,7 @@ class ModelSerializationTest extends TestCase
 {
     use RefreshDatabase;
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $app['config']->set('database.connections.custom', [
             'driver' => 'sqlite',
diff --git a/tests/Integration/Queue/QueueConnectionTest.php b/tests/Integration/Queue/QueueConnectionTest.php
@@ -8,17 +8,14 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Support\Facades\Bus;
 use Mockery as m;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 use Throwable;
 
+#[WithConfig('queue.default', 'sqs')]
+#[WithConfig('queue.connections.sqs.after_commit', true)]
 class QueueConnectionTest extends TestCase
 {
-    protected function getEnvironmentSetUp($app)
-    {
-        $app['config']->set('queue.default', 'sqs');
-        $app['config']->set('queue.connections.sqs.after_commit', true);
-    }
-
     protected function tearDown(): void
     {
         QueueConnectionTestJob::$ran = false;
diff --git a/tests/Integration/View/BladeAnonymousComponentTest.php b/tests/Integration/View/BladeAnonymousComponentTest.php
@@ -41,7 +41,7 @@ public function test_anonymous_components_with_custom_paths_cant_be_rendered_as_
         $view = View::make('panel')->render();
     }
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $app['config']->set('view.paths', [__DIR__.'/anonymous-components-templates']);
     }
diff --git a/tests/Integration/View/BladeTest.php b/tests/Integration/View/BladeTest.php
@@ -210,7 +210,7 @@ public function testViewCacheCommandHandlesConfiguredBladeExtensions()
         $this->artisan('view:clear');
     }
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $app['config']->set('view.paths', [__DIR__.'/templates']);
     }
diff --git a/tests/Integration/View/RenderableViewExceptionTest.php b/tests/Integration/View/RenderableViewExceptionTest.php
@@ -21,7 +21,7 @@ public function testRenderMethodOfExceptionThrownInViewGetsHandled()
         $response->assertSee('This is a renderable exception.');
     }
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $app['config']->set('view.paths', [__DIR__.'/templates']);
     }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function testLocksCanBeAcquired()`
`65`	`65`	`* @param \Illuminate\Foundation\Application $app`
`66`	`66`	`* @return void`
`67`	`67`	`*/`
`68`		`- protected function getEnvironmentSetUp($app)`
	`68`	`+ protected function defineEnvironment($app)`
`69`	`69`	`{`
`70`	`70`	`if (! env('DYNAMODB_CACHE_TABLE')) {`
`71`	`71`	`$this->markTestSkipped('DynamoDB not configured.');`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function test_cookie_is_sent_back_with_proper_expire_time_with_respect_to`
`42`	`42`	`$this->assertEquals(Carbon::now()->getTimestamp() + 60, $response->headers->getCookies()[1]->getExpiresTime());`
`43`	`43`	`}`
`44`	`44`
`45`		`- protected function getEnvironmentSetUp($app)`
	`45`	`+ protected function defineEnvironment($app)`
`46`	`46`	`{`
`47`	`47`	`$app->instance(`
`48`	`48`	`ExceptionHandler::class,`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected function setUp(): void`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`- protected function getEnvironmentSetUp($app)`
	`35`	`+ protected function defineEnvironment($app)`
`36`	`36`	`{`
`37`	`37`	`$connection = $app->make('config')->get('database.default');`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@`
`10`	`10`	`#[RequiresPhpExtension('pdo_mysql')]`
`11`	`11`	`class DatabaseEmulatePreparesMariaDbConnectionTest extends DatabaseMariaDbConnectionTest`
`12`	`12`	`{`
`13`		`- protected function getEnvironmentSetUp($app)`
	`13`	`+ protected function defineEnvironment($app)`
`14`	`14`	`{`
`15`		`- parent::getEnvironmentSetUp($app);`
	`15`	`+ parent::defineEnvironment($app);`
`16`	`16`
`17`	`17`	`$app['config']->set('database.connections.mariadb.options', [`
`18`	`18`	`PDO::ATTR_EMULATE_PREPARES => true,`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@`
`13`	`13`	`#[RequiresPhpExtension('pdo_pgsql')]`
`14`	`14`	`class PostgresSchemaBuilderTest extends PostgresTestCase`
`15`	`15`	`{`
`16`		`- protected function getEnvironmentSetUp($app)`
	`16`	`+ protected function defineEnvironment($app)`
`17`	`17`	`{`
`18`		`- parent::getEnvironmentSetUp($app);`
	`18`	`+ parent::defineEnvironment($app);`
`19`	`19`
`20`	`20`	`$app['config']->set('database.connections.pgsql.search_path', 'public,private');`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`class SendingMarkdownMailTest extends TestCase`
`14`	`14`	`{`
`15`		`- protected function getEnvironmentSetUp($app)`
	`15`	`+ protected function defineEnvironment($app)`
`16`	`16`	`{`
`17`	`17`	`$app['config']->set('mail.driver', 'array');`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`class SendingQueuedMailTest extends TestCase`
`13`	`13`	`{`
`14`		`- protected function getEnvironmentSetUp($app)`
	`14`	`+ protected function defineEnvironment($app)`
`15`	`15`	`{`
`16`	`16`	`$app['config']->set('mail.driver', 'array');`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ class JobEncryptionTest extends DatabaseTestCase`
`21`	`21`	`{`
`22`	`22`	`use DatabaseMigrations;`
`23`	`23`
`24`		`- protected function getEnvironmentSetUp($app)`
	`24`	`+ protected function defineEnvironment($app)`
`25`	`25`	`{`
`26`		`- parent::getEnvironmentSetUp($app);`
	`26`	`+ parent::defineEnvironment($app);`
`27`	`27`
`28`	`28`	`$app['config']->set('app.key', Str::random(32));`
`29`	`29`	`$app['config']->set('queue.default', 'database');`