Merge pull request #485 from markwalet/test-multiple-requests

Make sure multiple assertions can be made on the same request class

Author: Sammyjo20

src/Http/Faking/MockClient.php

@@ -463,16 +463,21 @@ private function checkClosureAgainstResponses(callable $closure, ?int $index = n
         // and call the callable accordingly. We will only fail if it returns `false`.
 
         if ($fqcn = $this->getRequestClass($closure)) {
-            /** @var Response */
+            /** @var Response $response */
             foreach ($this->getRecordedResponses() as $response) {
                 if (get_class($request = $response->getPendingRequest()->getRequest()) !== $fqcn) {
                     continue;
                 }
 
-                return $closure($request, $response) !== false;
+                $passed = $closure($request, $response) !== false;
+
+                if ($passed === true) {
+                    return true;
+                }
             }
-        }
 
+            return false;
+        }
         // Let's then check if the latest response resolves the callable
         // with a successful result.
 

tests/Unit/MockClientTest.php

@@ -267,17 +267,28 @@
 test('`assertSent` accepts the request class as a type-hint', function () {
     $mockClient = new MockClient([
         MockResponse::make(['name' => 'Sam']),
+        MockResponse::make(['name' => 'Sam']),
     ]);
 
-    $request = new UserRequest;
-    $request->headers()->add('X-Foo', 'bar');
+    $requestA = new UserRequest;
+    $requestA->headers()->add('X-Foo', 'bar');
+    $requestB = new UserRequest;
+    $requestB->headers()->add('X-Foo', 'two');
+
+    connector()->send($requestA, $mockClient);
+    connector()->send($requestB, $mockClient);
 
-    connector()->send($request, $mockClient);
+    $mockClient->assertSent(function (UserRequest $request) {
+        $header = $request->headers()->get('X-Foo');
+        expect($header)->toBeIn(['bar', 'two']);
 
+        return $header === 'bar';
+    });
     $mockClient->assertSent(function (UserRequest $request) {
-        expect($request->headers()->all())->toMatchArray([
-            'X-Foo' => 'bar',
-        ]);
+        $header = $request->headers()->get('X-Foo');
+        expect($header)->toBeIn(['bar', 'two']);
+
+        return $header === 'two';
     });
 });