[10.x] Test Improvements (#46659)

* Test Improvements Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * Update composer.json --------- Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
laravel · Apr 2, 2023 · cc3ccc3 · cc3ccc3
1 parent 8fcd8c2
commit cc3ccc3
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -103,7 +103,7 @@
         "league/flysystem-read-only": "^3.3",
         "league/flysystem-sftp-v3": "^3.0",
         "mockery/mockery": "^1.5.1",
-        "orchestra/testbench-core": "^8.1",
+        "orchestra/testbench-core": "^8.3",
         "pda/pheanstalk": "^4.0",
         "phpstan/phpdoc-parser": "^1.15",
         "phpstan/phpstan": "^1.4.7",

diff --git a/tests/Integration/Console/CommandEventsTest.php b/tests/Integration/Console/CommandEventsTest.php
@@ -7,7 +7,6 @@
 use Illuminate\Contracts\Console\Kernel as ConsoleKernel;
 use Illuminate\Events\Dispatcher;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Env;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
 use Orchestra\Testbench\Foundation\Application as Testbench;
@@ -148,7 +147,7 @@ public function testCommandEventsReceiveParsedInputFromBackground()
             'CommandFinished', 'taylor', 'otwell', 'coding',
         );
 
-        Env::getRepository()->clear('APP_DEBUG');
+        $laravel->terminate();
     }
 
     protected function assertLogged(...$messages)

diff --git a/tests/Integration/Console/EnvironmentDecryptCommandTest.php b/tests/Integration/Console/EnvironmentDecryptCommandTest.php
@@ -116,7 +116,7 @@ public function testItGeneratesTheEnvironmentFileWithUserProvidedKey()
 
     public function testItGeneratesTheEnvironmentFileWithKeyFromEnvironment()
     {
-        putenv('LARAVEL_ENV_ENCRYPTION_KEY=ponmlkjihgfedcbaponmlkjihgfedcba');
+        $_SERVER['LARAVEL_ENV_ENCRYPTION_KEY'] = 'ponmlkjihgfedcbaponmlkjihgfedcba';
 
         $this->filesystem->shouldReceive('exists')
             ->once()
@@ -137,6 +137,8 @@ public function testItGeneratesTheEnvironmentFileWithKeyFromEnvironment()
 
         $this->filesystem->shouldHaveReceived('put')
             ->with(base_path('.env'), 'APP_NAME="Laravel Three"');
+
+        unset($_SERVER['LARAVEL_ENV_ENCRYPTION_KEY']);
     }
 
     public function testItGeneratesTheEnvironmentFileWhenForcing()

diff --git a/tests/Integration/Routing/ImplicitBackedEnumRouteBindingTest.php b/tests/Integration/Routing/ImplicitBackedEnumRouteBindingTest.php
@@ -9,6 +9,11 @@
 
 class ImplicitBackedEnumRouteBindingTest extends TestCase
 {
+    protected function defineEnvironment($app): void
+    {
+        $app['config']->set(['app.key' => 'AckfSECXIvnK5r28GVIWUAxmbBSjTsmF']);
+    }
+
     public function testWithRouteCachingEnabled()
     {
         $this->defineCacheRoutes(<<<PHP

diff --git a/tests/Integration/Routing/ImplicitModelRouteBindingTest.php b/tests/Integration/Routing/ImplicitModelRouteBindingTest.php
@@ -27,6 +27,11 @@ protected function tearDown(): void
         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
@@ -21,6 +21,11 @@ protected function tearDown(): void
         Carbon::setTestNow(null);
     }
 
+    protected function defineEnvironment($app): void
+    {
+        $app['config']->set(['app.key' => 'AckfSECXIvnK5r28GVIWUAxmbBSjTsmF']);
+    }
+
     public function testSigningUrl()
     {
         Route::get('/foo/{id}', function (Request $request, $id) {

diff --git a/tests/Testing/AssertRedirectToSignedRouteTest.php b/tests/Testing/AssertRedirectToSignedRouteTest.php
@@ -37,6 +37,11 @@ protected function setUp(): void
         $this->urlGenerator = $this->app->make(UrlGenerator::class);
     }
 
+    protected function defineEnvironment($app): void
+    {
+        $app['config']->set(['app.key' => 'AckfSECXIvnK5r28GVIWUAxmbBSjTsmF']);
+    }
+
     public function testAssertRedirectToSignedRouteWithoutRouteName()
     {
         $this->router->get('test-route', function () {