fix test

laravel · Dec 8, 2024 · 291915a · 291915a
1 parent 0e833a1
commit 291915a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/src/Servers/Reverb/Publishing/RedisPubSubProvider.php b/src/Servers/Reverb/Publishing/RedisPubSubProvider.php
@@ -27,24 +27,24 @@ public function __construct(
      */
     public function connect(LoopInterface $loop): void
     {
-        $this->subscribingClient = new RedisClient(
+        $this->publishingClient = new RedisClient(
             $loop,
             $this->clientFactory,
             $this->channel,
-            'subscriber',
-            $this->server,
-            fn () => $this->subscribe()
+            'publisher',
+            $this->server
         );
-        $this->subscribingClient->connect();
+        $this->publishingClient->connect();
 
-        $this->publishingClient = new RedisClient(
+        $this->subscribingClient = new RedisClient(
             $loop,
             $this->clientFactory,
             $this->channel,
-            'publisher',
-            $this->server
+            'subscriber',
+            $this->server,
+            fn () => $this->subscribe()
         );
-        $this->publishingClient->connect();
+        $this->subscribingClient->connect();
     }
 
     /**

diff --git a/tests/Unit/Servers/Reverb/Publishing/RedisPubSubProviderTest.php b/tests/Unit/Servers/Reverb/Publishing/RedisPubSubProviderTest.php
@@ -5,6 +5,7 @@
 use Laravel\Reverb\Servers\Reverb\Publishing\RedisClientFactory;
 use Laravel\Reverb\Servers\Reverb\Publishing\RedisPubSubProvider;
 use React\EventLoop\LoopInterface;
+use React\Promise\Promise;
 
 it('resubscribes to the scaling channel on unsubscribe event', function () {
     $channel = 'reverb';
@@ -21,6 +22,10 @@
         ->with('message', Mockery::any())
         ->zeroOrMoreTimes();
 
+    $subscribingClient->shouldReceive('on')
+        ->with('close', Mockery::any())
+        ->zeroOrMoreTimes();
+
     $subscribingClient->shouldReceive('subscribe')
         ->twice()
         ->with($channel);
@@ -30,17 +35,15 @@
     // The first call to make() will return a publishing client
     $clientFactory->shouldReceive('make')
         ->once()
-        ->andReturn(Mockery::mock(Client::class));
+        ->andReturn(new Promise(fn (callable $resolve) => $resolve));
 
     $clientFactory->shouldReceive('make')
         ->once()
-        ->andReturn($subscribingClient);
+        ->andReturn(new Promise(fn (callable $resolve) => $resolve($subscribingClient)));
 
     $provider = new RedisPubSubProvider($clientFactory, Mockery::mock(PubSubIncomingMessageHandler::class), $channel);
     $provider->connect(Mockery::mock(LoopInterface::class));
-
-    $provider->subscribe();
-})->skip();
+});
 
 it('can successfully reconnect', function () {})->todo();