Merge pull request #327 from saloonphp/fix/v2-mock-client-assertions-with-fixtures

Fix | V2 - MockClient assertions with fixtures

Author: Sammyjo20

src/Http/Middleware/DetermineMockResponse.php

@@ -51,7 +51,7 @@ public function __invoke(PendingRequest $pendingRequest): PendingRequest|MockRes
         // middleware on the response to record the response.
 
         if (is_null($mockResponse) && $mockObject instanceof Fixture) {
-            $pendingRequest->middleware()->onResponse(new RecordFixture($mockObject), true, 'recordFixture');
+            $pendingRequest->middleware()->onResponse(new RecordFixture($mockObject, $mockClient), true, 'recordFixture');
         }
 
         return $pendingRequest;

src/Http/Middleware/RecordFixture.php

@@ -6,6 +6,7 @@
 
 use Saloon\Contracts\Response;
 use Saloon\Http\Faking\Fixture;
+use Saloon\Contracts\MockClient;
 use Saloon\Helpers\ResponseRecorder;
 use Saloon\Contracts\ResponseMiddleware;
 
@@ -18,14 +19,21 @@ class RecordFixture implements ResponseMiddleware
      */
     protected Fixture $fixture;
 
+    /**
+     * Mock Client
+     */
+    protected MockClient $mockClient;
+
     /**
      * Constructor
      *
      * @param \Saloon\Http\Faking\Fixture $fixture
+     * @param \Saloon\Contracts\MockClient $mockClient
      */
-    public function __construct(Fixture $fixture)
+    public function __construct(Fixture $fixture, MockClient $mockClient)
     {
         $this->fixture = $fixture;
+        $this->mockClient = $mockClient;
     }
 
     /**
@@ -34,6 +42,7 @@ public function __construct(Fixture $fixture)
      * @param \Saloon\Contracts\Response $response
      * @return void
      * @throws \JsonException
+     * @throws \Saloon\Exceptions\FixtureException
      * @throws \Saloon\Exceptions\UnableToCreateDirectoryException
      * @throws \Saloon\Exceptions\UnableToCreateFileException
      */
@@ -42,5 +51,7 @@ public function __invoke(Response $response): void
         $this->fixture->store(
             ResponseRecorder::record($response)
         );
+
+        $this->mockClient->recordResponse($response);
     }
 }

tests/Feature/MockRequestTest.php

@@ -687,3 +687,13 @@ function (PendingRequest $pendingRequest): MockResponse {
         'twitter' => '**REDACTED-TWITTER**',
     ], JSON_THROW_ON_ERROR));
 });
+
+test('fixtures are still recorded on the first request', function () {
+    $mockClient = new MockClient([
+        MockResponse::fixture('user'), // Test Exact Route
+    ]);
+
+    connector()->send(new UserRequest, $mockClient);
+
+    $mockClient->assertSent(UserRequest::class);
+});