X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a3ead5062acc169ae3486d90ac2befe3db86bfe6..refs/pull/3593/head:/tests/Actions/WebhookCallTest.php diff --git a/tests/Actions/WebhookCallTest.php b/tests/Actions/WebhookCallTest.php index 958d33d9d..d9f9ddad5 100644 --- a/tests/Actions/WebhookCallTest.php +++ b/tests/Actions/WebhookCallTest.php @@ -15,7 +15,6 @@ use Tests\TestCase; class WebhookCallTest extends TestCase { - public function test_webhook_listening_to_all_called_on_event() { $this->newWebhook([], ['all']); @@ -54,11 +53,33 @@ class WebhookCallTest extends TestCase Http::fake([ '*' => Http::response('', 500), ]); - $this->newWebhook(['active' => true, 'endpoint' => 'https://wh.example.com'], ['all']); + $webhook = $this->newWebhook(['active' => true, 'endpoint' => 'https://wh.example.com'], ['all']); + $this->assertNull($webhook->last_errored_at); $this->runEvent(ActivityType::ROLE_CREATE); $this->assertTrue($logger->hasError('Webhook call to endpoint https://wh.example.com failed with status 500')); + + $webhook->refresh(); + $this->assertEquals('Response status from endpoint was 500', $webhook->last_error); + $this->assertNotNull($webhook->last_errored_at); + } + + public function test_webhook_call_exception_is_caught_and_logged() + { + Http::shouldReceive('asJson')->andThrow(new \Exception('Failed to perform request')); + + $logger = $this->withTestLogger(); + $webhook = $this->newWebhook(['active' => true, 'endpoint' => 'https://wh.example.com'], ['all']); + $this->assertNull($webhook->last_errored_at); + + $this->runEvent(ActivityType::ROLE_CREATE); + + $this->assertTrue($logger->hasError('Webhook call to endpoint https://wh.example.com failed with error "Failed to perform request"')); + + $webhook->refresh(); + $this->assertEquals('Failed to perform request', $webhook->last_error); + $this->assertNotNull($webhook->last_errored_at); } public function test_webhook_call_data_format() @@ -73,8 +94,9 @@ class WebhookCallTest extends TestCase $this->runEvent(ActivityType::PAGE_UPDATE, $page, $editor); - Http::assertSent(function(Request $request) use ($editor, $page, $webhook) { + Http::assertSent(function (Request $request) use ($editor, $page, $webhook) { $reqData = $request->data(); + return $request->isJson() && $reqData['event'] === 'page_update' && $reqData['text'] === ($editor->name . ' updated page "' . $page->name . '"') @@ -88,7 +110,6 @@ class WebhookCallTest extends TestCase }); } - protected function runEvent(string $event, $detail = '', ?User $user = null) { if (is_null($user)) { @@ -112,5 +133,4 @@ class WebhookCallTest extends TestCase return $webhook; } - -} \ No newline at end of file +}