Skip to content

Fix integration tests #10

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

Open
snapshotpl wants to merge 6 commits into
base: integration-tests-issues
Choose a base branch
from
Open

Fix integration tests #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f37b711
Fix integration tests
snapshotpl Jul 13, 2021
0c32a43
Skip 500 errors
snapshotpl Jul 13, 2021
ef7ece7
Rollback date
snapshotpl Jul 13, 2021
db4eb5e
Fix DTO
snapshotpl Jul 13, 2021
3cb0bbb
Restore Error model
snapshotpl Jul 13, 2021
036b776
Post CR improvments and remove skip 500 responses
snapshotpl Jul 14, 2021
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/Model/Organization.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ class Organization extends DataTransferObject

public ?Address $invoice_address;

public Person $contact_person;
public ?Person $contact_person;
}
4 changes: 2 additions & 2 deletions src/Response/HttpResponseProcessor/AbstractJsonContentProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ abstract class AbstractJsonContentProcessor implements ProcessorInterface
public function run(MethodInterface $method, ResponseInterface $httpResponse): ?Response
{
if (in_array($httpResponse->getStatusCode(), $this->getHttpStatusCodes())) {
$contentType = explode('; ', $httpResponse->getHeaderLine('Content-Type'));
$mediaType = reset($contentType);
$contentType = explode(';', $httpResponse->getHeaderLine('Content-Type'));
$mediaType = trim(reset($contentType));
if ($mediaType === 'application/json') {
$httpResponse->getBody()->rewind();
$data = json_decode($httpResponse->getBody()->getContents(), true);
Expand Down
6 changes: 5 additions & 1 deletion src/Response/HttpResponseProcessor/ErrorProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,15 @@ protected function getPayload(
return new Error([
'status' => $data['status'],
'error' => $data['key'],
'message' => $data['error']
'message' => $data['error'],
]);
}
return null;
}
$data['status'] ??= $httpResponse->getStatusCode();
Copy link
Copy Markdown
Owner

@michalbiarda michalbiarda Jul 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@snapshotpl Wow! I didn't know ??= operator 👍.

$data['error'] ??= $data['key'] ?? '';
$data['message'] ??= $data['error'] ?? '';

return new Error($data);
}
}
1 change: 1 addition & 0 deletions tests/Integration/Client/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ protected function assertSuccessWithFile(Response $response, DataTransferObject
if (!$response->getSuccess()) {
$this->debug(print_r($response->getPayload()->toArray(), true));
}

$this->assertTrue($response->getSuccess());
$this->assertInstanceOf(BinaryContent::class, $payload);
/** @var BinaryContent $payload */
Expand Down