[10.x] Test Improvements for HTTP tests (#50687)

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

tests/Integration/Http/Middleware/HandleCorsTest.php

@@ -13,23 +13,8 @@ class HandleCorsTest extends TestCase
 {
     use ValidatesRequests;
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
-        $kernel = $app->make(Kernel::class);
-        $kernel->prependMiddleware(HandleCors::class);
-
-        $router = $app['router'];
-
-        $this->addWebRoutes($router);
-        $this->addApiRoutes($router);
-
-        parent::getEnvironmentSetUp($app);
-    }
-
-    protected function resolveApplicationConfiguration($app)
-    {
-        parent::resolveApplicationConfiguration($app);
-
         $app['config']['cors'] = [
             'paths' => ['api/*'],
             'supports_credentials' => false,
@@ -39,6 +24,15 @@ protected function resolveApplicationConfiguration($app)
             'exposed_headers' => [],
             'max_age' => 0,
         ];
+
+        $kernel = $app->make(Kernel::class);
+        $kernel->prependMiddleware(HandleCors::class);
+    }
+
+    protected function defineRoutes($router)
+    {
+        $this->addWebRoutes($router);
+        $this->addApiRoutes($router);
     }
 
     public function testShouldReturnHeaderAssessControlAllowOriginWhenDontHaveHttpOriginOnRequest()

tests/Integration/Http/ThrottleRequestsTest.php

@@ -9,23 +9,13 @@
 use Illuminate\Routing\Middleware\ThrottleRequests;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Route;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 use Throwable;
 
+#[WithConfig('hashing.driver', 'bcrypt')]
 class ThrottleRequestsTest extends TestCase
 {
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-
-        Carbon::setTestNow(null);
-    }
-
-    public function getEnvironmentSetUp($app)
-    {
-        $app['config']->set('hashing', ['driver' => 'bcrypt']);
-    }
-
     public function testLockOpensImmediatelyAfterDecay()
     {
         Carbon::setTestNow(Carbon::create(2018, 1, 1, 0, 0, 0));

tests/Integration/Http/ThrottleRequestsWithRedisTest.php

@@ -6,24 +6,15 @@
 use Illuminate\Routing\Middleware\ThrottleRequestsWithRedis;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Route;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 use Throwable;
 
+#[WithConfig('hashing.driver', 'bcrypt')]
 class ThrottleRequestsWithRedisTest extends TestCase
 {
     use InteractsWithRedis;
 
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-        Carbon::setTestNow(null);
-    }
-
-    public function getEnvironmentSetUp($app)
-    {
-        $app['config']->set('hashing', ['driver' => 'bcrypt']);
-    }
-
     public function testLockOpensImmediatelyAfterDecay()
     {
         $this->ifRedisAvailable(function () {