Addressed additional unsupported array spread operation

[bookstack] / tests / Actions / WebhookCallTest.php

diff --git a/tests/Actions/WebhookCallTest.php b/tests/Actions/WebhookCallTest.php
index 958d33d9d6d247b1f232d42aef8801743b8abb62..7ca190200eb9286aad40fd34d2ecc2f77ada71cb 100644 (file)
--- a/tests/Actions/WebhookCallTest.php
+++ b/tests/Actions/WebhookCallTest.php
@@ -7,7 +7,6 @@ use BookStack\Actions\ActivityType;
 use BookStack\Actions\DispatchWebhookJob;
 use BookStack\Actions\Webhook;
 use BookStack\Auth\User;
-use BookStack\Entities\Models\Page;
 use Illuminate\Http\Client\Request;
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Http;
@@ -15,7 +14,6 @@ use Tests\TestCase;
 
 class WebhookCallTest extends TestCase
 {
-
     public function test_webhook_listening_to_all_called_on_event()
     {
         $this->newWebhook([], ['all']);
@@ -54,11 +52,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()
@@ -67,14 +87,14 @@ class WebhookCallTest extends TestCase
             '*' => Http::response('', 200),
         ]);
         $webhook = $this->newWebhook(['active' => true, 'endpoint' => 'https://wh.example.com'], ['all']);
-        /** @var Page $page */
-        $page = Page::query()->first();
+        $page = $this->entities->page();
         $editor = $this->getEditor();
 
         $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 +108,6 @@ class WebhookCallTest extends TestCase
         });
     }
 
-
     protected function runEvent(string $event, $detail = '', ?User $user = null)
     {
         if (is_null($user)) {
@@ -112,5 +131,4 @@ class WebhookCallTest extends TestCase
 
         return $webhook;
     }
-
-}
\ No newline at end of file
+}