[10.x] Test Improvements for Encryption, Events, Filesystem, Foundation, Redis & Session tests (#50686)

* [10.x] Test Improvements for Encryption, Events, Filesystem, Redis &
Session tests

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

* wip

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

* wip

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

* wip

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

---------

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

Author: crynobone

tests/Integration/Encryption/EncryptionTest.php

@@ -3,22 +3,13 @@
 namespace Illuminate\Tests\Integration\Encryption;
 
 use Illuminate\Encryption\Encrypter;
-use Illuminate\Encryption\EncryptionServiceProvider;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 use RuntimeException;
 
+#[WithConfig('app.key', 'base64:IUHRqAQ99pZ0A1MPjbuv1D6ff3jxv0GIvS2qIW4JNU4=')]
 class EncryptionTest extends TestCase
 {
-    protected function getEnvironmentSetUp($app)
-    {
-        $app['config']->set('app.key', 'base64:IUHRqAQ99pZ0A1MPjbuv1D6ff3jxv0GIvS2qIW4JNU4=');
-    }
-
-    protected function getPackageProviders($app)
-    {
-        return [EncryptionServiceProvider::class];
-    }
-
     public function testEncryptionProviderBind()
     {
         $this->assertInstanceOf(Encrypter::class, $this->app->make('encrypter'));

tests/Integration/Events/EventFakeTest.php

@@ -7,6 +7,7 @@
 use Illuminate\Contracts\Events\ShouldDispatchAfterCommit;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
@@ -16,10 +17,10 @@
 
 class EventFakeTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
+    use LazilyRefreshDatabase;
 
+    protected function afterRefreshingDatabase()
+    {
         Schema::create('posts', function (Blueprint $table) {
             $table->increments('id');
             $table->string('title');
@@ -28,11 +29,9 @@ protected function setUp(): void
         });
     }
 
-    protected function tearDown(): void
+    protected function beforeRefreshingDatabase()
     {
         Schema::dropIfExists('posts');
-
-        parent::tearDown();
     }
 
     public function testNonFakedEventGetsProperlyDispatched()

tests/Integration/Events/ListenerTest.php

@@ -14,7 +14,7 @@ protected function tearDown(): void
         ListenerTestListener::$ran = false;
         ListenerTestListenerAfterCommit::$ran = false;
 
-        m::close();
+        parent::tearDown();
     }
 
     public function testClassListenerRunsNormallyIfNoTransactions()

tests/Integration/Events/ShouldDispatchAfterCommitEventTest.php

@@ -5,7 +5,6 @@
 use Illuminate\Contracts\Events\ShouldDispatchAfterCommit;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
-use Mockery as m;
 use Orchestra\Testbench\TestCase;
 
 class ShouldDispatchAfterCommitEventTest extends TestCase
@@ -16,7 +15,7 @@ protected function tearDown(): void
         ShouldDispatchAfterCommitTestEvent::$ran = false;
         AnotherShouldDispatchAfterCommitTestEvent::$ran = false;
 
-        m::close();
+        parent::tearDown();
     }
 
     public function testEventIsDispatchedIfThereIsNoTransaction()

tests/Integration/Filesystem/FilesystemTest.php

@@ -4,11 +4,10 @@
 
 use Illuminate\Support\Facades\File;
 use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\Attributes\RequiresOperatingSystem;
 use Symfony\Component\Process\Process;
 
-/**
- * @requires OS Linux|Darwin
- */
+#[RequiresOperatingSystem('Linux|DAR')]
 class FilesystemTest extends TestCase
 {
     protected $stubFile;

tests/Integration/Filesystem/StorageTest.php

@@ -5,11 +5,10 @@
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
 use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\Attributes\RequiresOperatingSystem;
 use Symfony\Component\Process\Process;
 
-/**
- * @requires OS Linux|Darwin
- */
+#[RequiresOperatingSystem('Linux|DAR')]
 class StorageTest extends TestCase
 {
     protected $stubFile;

tests/Integration/Foundation/MaintenanceModeTest.php

@@ -19,16 +19,15 @@ class MaintenanceModeTest extends TestCase
 {
     protected function setUp(): void
     {
+        $this->beforeApplicationDestroyed(function () {
+            @unlink(storage_path('framework/down'));
+        });
+
         parent::setUp();
 
         $this->withoutMiddleware(TestbenchPreventRequestsDuringMaintenance::class);
     }
 
-    protected function tearDown(): void
-    {
-        @unlink(storage_path('framework/down'));
-    }
-
     public function testBasicMaintenanceModeResponse()
     {
         file_put_contents(storage_path('framework/down'), json_encode([
@@ -172,8 +171,6 @@ public function testCanCreateBypassCookies()
 
         Carbon::setTestNow(now()->addMonths(6));
         $this->assertFalse(MaintenanceModeBypassCookie::isValid($cookie->getValue(), 'test-key'));
-
-        Carbon::setTestNow(null);
     }
 
     public function testDispatchEventWhenMaintenanceModeIsEnabled()

tests/Integration/Foundation/Testing/Concerns/InteractsWithAuthenticationTest.php

@@ -3,40 +3,40 @@
 namespace Illuminate\Tests\Integration\Foundation\Testing\Concerns;
 
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Foundation\Auth\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Schema;
+use Orchestra\Testbench\Attributes\WithMigration;
 use Orchestra\Testbench\TestCase;
 
+#[WithMigration]
 class InteractsWithAuthenticationTest extends TestCase
 {
-    protected function getEnvironmentSetUp($app)
-    {
-        $app['config']->set('auth.providers.users.model', AuthenticationTestUser::class);
+    use RefreshDatabase;
 
+    protected function defineEnvironment($app)
+    {
         $app['config']->set('auth.guards.api', [
             'driver' => 'token',
             'provider' => 'users',
             'hash' => false,
         ]);
     }
 
-    protected function setUp(): void
+    protected function afterRefreshingDatabase()
     {
-        parent::setUp();
+        Schema::table('users', function (Blueprint $table) {
+            $table->renameColumn('name', 'username');
+        });
 
-        Schema::create('users', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('email');
-            $table->string('username');
-            $table->string('password');
-            $table->string('remember_token')->default(null)->nullable();
+        Schema::table('users', function (Blueprint $table) {
             $table->tinyInteger('is_active')->default(0);
         });
 
-        AuthenticationTestUser::create([
+        User::forceCreate([
             'username' => 'taylorotwell',
             'email' => '[email protected]',
             'password' => bcrypt('password'),
@@ -50,7 +50,7 @@ public function testActingAsIsProperlyHandledForSessionAuth()
             return 'Hello '.$request->user()->username;
         })->middleware(['auth']);
 
-        $user = AuthenticationTestUser::where('username', '=', 'taylorotwell')->first();
+        $user = User::where('username', '=', 'taylorotwell')->first();
 
         $this->actingAs($user)
             ->get('/me')
@@ -68,33 +68,11 @@ public function testActingAsIsProperlyHandledForAuthViaRequest()
             return $request->user();
         });
 
-        $user = AuthenticationTestUser::where('username', '=', 'taylorotwell')->first();
+        $user = User::where('username', '=', 'taylorotwell')->first();
 
         $this->actingAs($user, 'api')
             ->get('/me')
             ->assertSuccessful()
             ->assertSeeText('Hello taylorotwell');
     }
 }
-
-class AuthenticationTestUser extends Authenticatable
-{
-    public $table = 'users';
-    public $timestamps = false;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var string[]
-     */
-    protected $guarded = [];
-
-    /**
-     * The attributes that should be hidden for arrays.
-     *
-     * @var string[]
-     */
-    protected $hidden = [
-        'password', 'remember_token',
-    ];
-}

tests/Integration/Redis/PredisConnectionTest.php

@@ -6,17 +6,14 @@
 use Illuminate\Redis\Events\CommandExecuted;
 use Illuminate\Support\Facades\Event;
 use Mockery as m;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 use Predis\Client;
 use Predis\Command\Argument\Search\SearchArguments;
 
+#[WithConfig('database.redis.client', 'predis')]
 class PredisConnectionTest extends TestCase
 {
-    protected function defineEnvironment($app)
-    {
-        $app->get('config')->set('database.redis.client', 'predis');
-    }
-
     public function testPredisCanEmitEventWithArrayableArgumentObject()
     {
         if (! class_exists(SearchArguments::class)) {

tests/Integration/Session/CookieSessionHandlerTest.php

@@ -20,7 +20,7 @@ public function testCookieSessionDriverCookiesCanExpireOnClose()
         $this->assertEquals(0, $sessionValueCookie->getExpiresTime());
     }
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $app['config']->set('app.key', Str::random(32));
         $app['config']->set('session.driver', 'cookie');

tests/Integration/Session/SessionPersistenceTest.php

@@ -31,7 +31,7 @@ public function testSessionIsPersistedEvenIfExceptionIsThrownFromRoute()
         $this->assertTrue($handler->written);
     }
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $app->instance(
             ExceptionHandler::class,