[11.x] Test Improvements (#53586)

* [11.x] Test Improvements

Correctly test Queue using `phpredis` and `predis`

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

.github/workflows/queues.yml

@@ -94,8 +94,10 @@ jobs:
 
     strategy:
       fail-fast: true
+      matrix:
+        client: ['phpredis', 'predis']
 
-    name: Redis Driver
+    name: Redis (${{ matrix.client}}) Driver
 
     steps:
       - name: Checkout code
@@ -122,6 +124,7 @@ jobs:
       - name: Execute tests
         run: vendor/bin/phpunit tests/Integration/Queue
         env:
+          REDIS_CLIENT: ${{ matrix.client }}
           QUEUE_CONNECTION: redis
 
   beanstalkd:

phpunit.xml.dist

@@ -18,6 +18,7 @@
         <ini name="memory_limit" value="2048M" />
         <env name="DB_CONNECTION" value="testing" />
         <!--
+        <env name="REDIS_CLIENT" value="phpredis" />
         <env name="REDIS_HOST" value="127.0.0.1" />
         <env name="REDIS_PORT" value="6379" />
         -->

tests/Integration/Queue/RateLimitedWithRedisTest.php

@@ -8,34 +8,19 @@
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Contracts\Queue\Job;
 use Illuminate\Contracts\Redis\Factory as Redis;
-use Illuminate\Foundation\Testing\Concerns\InteractsWithRedis;
 use Illuminate\Queue\CallQueuedHandler;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\RateLimitedWithRedis;
 use Illuminate\Support\Str;
 use Mockery as m;
+use Orchestra\Testbench\Attributes\RequiresEnv;
 use Orchestra\Testbench\TestCase;
 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 
+#[RequiresEnv('REDIS_CLIENT')]
 #[RequiresPhpExtension('redis')]
 class RateLimitedWithRedisTest extends TestCase
 {
-    use InteractsWithRedis;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->setUpRedis();
-    }
-
-    protected function tearDown(): void
-    {
-        $this->tearDownRedis();
-
-        parent::tearDown();
-    }
-
     public function testUnlimitedJobsAreExecuted()
     {
         $rateLimiter = $this->app->make(RateLimiter::class);