Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.4] Fix inversion of expected and actual on assertHeader #19110

Merged
merged 1 commit into from
May 9, 2017
+17 −1
Merged

[5.4] Fix inversion of expected and actual on assertHeader #19110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/Testing/TestResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public function assertHeader($headerName, $value = null)

if (! is_null($value)) {
PHPUnit::assertEquals(
$this->headers->get($headerName), $value,
$value, $this->headers->get($headerName),
"Header [{$headerName}] was found, but value [{$actual}] does not match [{$value}]."
);
}
Expand Down
16 changes: 16 additions & 0 deletions tests/Foundation/FoundationTestResponseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,22 @@ public function testAssertSeeText()
$response->assertSeeText('foobar');
}

public function testAssertHeader()
{
$baseResponse = tap(new Response, function ($response) {
$response->header('Location', '/foo');
});

$response = TestResponse::fromBaseResponse($baseResponse);

try {
$response->assertHeader('Location', '/bar');
} catch (\PHPUnit_Framework_ExpectationFailedException $e) {
$this->assertEquals('/bar', $e->getComparisonFailure()->getExpected());
$this->assertEquals('/foo', $e->getComparisonFailure()->getActual());
}
}

public function testAssertJsonWithArray()
{
$response = TestResponse::fromBaseResponse(new Response(new JsonSerializableSingleResourceStub));
Expand Down