Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/Http/Faking/MockClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
23 changes: 17 additions & 6 deletions tests/Unit/MockClientTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
});
});

Expand Down
Loading