Skip to content

Remove deprecated at matcher from tests #1240

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

Merged
merged 2 commits into from
Aug 2, 2022
Merged

Remove deprecated at matcher from tests #1240

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f69d9a9
Remove deprecated at matcher from tests
come-nc Aug 1, 2022
abdd2fc
Fix CS
nickvergessen Aug 2, 2022
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
140 changes: 73 additions & 67 deletions tests/Unit/PushTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,22 +549,7 @@ public function testPushToDeviceSending($isDebug) {
->with('has_internet_connection', true)
->willReturn(true);

$e = new \Exception();
$client->expects($this->at(0))
->method('post')
->with('proxyserver1/notifications', [
'body' => [
'notifications' => ['["Payload"]', '["Payload"]'],
],
])
->willThrowException($e);

$this->logger->expects($this->at(0))
->method('error')
->with($e->getMessage(), [
'exception' => $e,
]);

// Call 1
/** @var ResponseInterface|MockObject $response1 */
$response1 = $this->createMock(ResponseInterface::class);
$response1->expects($this->once())
Expand All @@ -578,26 +563,11 @@ public function testPushToDeviceSending($isDebug) {
$response1->expects($this->once())
->method('getBody')
->willReturn($body1);
$e = $this->createMock(ClientException::class);
$e->method('getResponse')
$exception1 = $this->createMock(ClientException::class);
$exception1->method('getResponse')
->willReturn($response1);
$client->expects($this->at(1))
->method('post')
->with('badrequest/notifications', [
'body' => [
'notifications' => ['["Payload"]'],
],
])
->willThrowException($e);

$this->logger->expects($this->at(1))
->method('warning')
->with('Could not send notification to push server [{url}]: {error}', [
'error' => 'no reason given',
'url' => 'badrequest',
'app' => 'notifications',
]);

// Call 2
/** @var ResponseInterface|MockObject $response1 */
$response2 = $this->createMock(ResponseInterface::class);
/** @var StreamInterface|MockObject $body2 */
Expand All @@ -608,26 +578,12 @@ public function testPushToDeviceSending($isDebug) {
$response2->expects($this->once())
->method('getBody')
->willReturn($body2);
$e = $this->createMock(ServerException::class);
$e->method('getResponse')
$exception2 = $this->createMock(ServerException::class);
$exception2->method('getResponse')
->willReturn($response2);
$client->expects($this->at(2))
->method('post')
->with('unavailable/notifications', [
'body' => [
'notifications' => ['["Payload"]'],
],
])
->willThrowException($e);

$this->logger->expects($this->at(2))
->method('debug')
->with('Could not send notification to push server [{url}]: {error}', [
'error' => 'Maintenance',
'url' => 'unavailable',
'app' => 'notifications',
]);

// Call 3
/** @var IResponse|MockObject $response1 */
$response3 = $this->createMock(IResponse::class);
$response3->expects($this->once())
Expand All @@ -637,15 +593,8 @@ public function testPushToDeviceSending($isDebug) {
$body3 = $this->createMock(StreamInterface::class);
$response3->method('getBody')
->willReturn('');
$client->expects($this->at(3))
->method('post')
->with('ok/notifications', [
'body' => [
'notifications' => ['["Payload"]'],
],
])
->willReturn($response3);

// Call 4
/** @var ResponseInterface|MockObject $response1 */
$response4 = $this->createMock(ResponseInterface::class);
$response4->expects($this->once())
Expand All @@ -664,17 +613,74 @@ public function testPushToDeviceSending($isDebug) {
$response4->expects($this->once())
->method('getBody')
->willReturn($body4);
$e = $this->createMock(ClientException::class);
$e->method('getResponse')
$exception4 = $this->createMock(ClientException::class);
$exception4->method('getResponse')
->willReturn($response4);
$client->expects($this->at(4))

$exception0 = new \Exception();
$client->expects($this->exactly(5))
->method('post')
->with('badrequest-with-devices/notifications', [
'body' => [
'notifications' => ['["Payload"]'],
->withConsecutive(
[
'proxyserver1/notifications',
[
'body' => [
'notifications' => ['["Payload"]', '["Payload"]'],
]
]
],
[
'badrequest/notifications',
[
'body' => [
'notifications' => ['["Payload"]'],
]
]
],
[
'unavailable/notifications',
[
'body' => [
'notifications' => ['["Payload"]'],
]
],
],
])
->willThrowException($e);
[
'ok/notifications',
[
'body' => [
'notifications' => ['["Payload"]'],
]
],
]
)
->willReturnOnConsecutiveCalls(
$this->throwException($exception0),
$this->throwException($exception1),
$this->throwException($exception2),
$response3,
$this->throwException($exception4),
);

$this->logger->expects($this->atLeastOnce())
->method('error')
->with($exception0->getMessage(), [
'exception' => $exception0,
]);
$this->logger->expects($this->once())
->method('warning')
->with('Could not send notification to push server [{url}]: {error}', [
'error' => 'no reason given',
'url' => 'badrequest',
'app' => 'notifications',
]);
$this->logger->expects($this->once())
->method('debug')
->with('Could not send notification to push server [{url}]: {error}', [
'error' => 'Maintenance',
'url' => 'unavailable',
'app' => 'notifications',
]);

$this->notificationManager->method('isFairUseOfFreePushService')
->willReturn(true);
Expand Down