Fixed OIDC Logout

[bookstack] / tests / Actions / WebhookCallTest.php

diff --git a/tests/Actions/WebhookCallTest.php b/tests/Actions/WebhookCallTest.php
index d9f9ddad591cd61ea26f5953e22f0bf827b003ae..fc49a524eef2c40e99b5206cca6b241c50518c47 100644 (file)
--- a/tests/Actions/WebhookCallTest.php
+++ b/tests/Actions/WebhookCallTest.php
@@ -2,12 +2,13 @@
 
 namespace Tests\Actions;
 
 
 namespace Tests\Actions;
 

-use BookStack\Actions\ActivityLogger;
-use BookStack\Actions\ActivityType;
-use BookStack\Actions\DispatchWebhookJob;
-use BookStack\Actions\Webhook;
-use BookStack\Auth\User;
-use BookStack\Entities\Models\Page;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\DispatchWebhookJob;
+use BookStack\Activity\Models\Webhook;
+use BookStack\Activity\Tools\ActivityLogger;
+use BookStack\Api\ApiToken;
+use BookStack\Entities\Models\PageRevision;
+use BookStack\Users\Models\User;

 use Illuminate\Http\Client\Request;
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Http\Client\Request;
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Http;


@@ -47,6 +48,24 @@ class WebhookCallTest extends TestCase
         Bus::assertNotDispatched(DispatchWebhookJob::class);
     }
 
         Bus::assertNotDispatched(DispatchWebhookJob::class);
     }
 

+    public function test_webhook_runs_for_delete_actions()
+    {
+        $this->newWebhook(['active' => true, 'endpoint' => 'https://wh.example.com'], ['all']);
+        Http::fake([
+            '*' => Http::response('', 500),
+        ]);
+
+        $user = $this->users->newUser();
+        $resp = $this->asAdmin()->delete($user->getEditUrl());
+        $resp->assertRedirect('/settings/users');
+
+        /** @var ApiToken $apiToken */
+        $editor = $this->users->editor();
+        $apiToken = ApiToken::factory()->create(['user_id' => $editor]);
+        $resp = $this->delete($editor->getEditUrl('/api-tokens/' . $apiToken->id));
+        $resp->assertRedirect($editor->getEditUrl('#api_tokens'));
+    }
+

     public function test_failed_webhook_call_logs_error()
     {
         $logger = $this->withTestLogger();
     public function test_failed_webhook_call_logs_error()
     {
         $logger = $this->withTestLogger();


@@ -88,9 +107,8 @@ class WebhookCallTest extends TestCase
             '*' => Http::response('', 200),
         ]);
         $webhook = $this->newWebhook(['active' => true, 'endpoint' => 'https://wh.example.com'], ['all']);
             '*' => Http::response('', 200),
         ]);
         $webhook = $this->newWebhook(['active' => true, 'endpoint' => 'https://wh.example.com'], ['all']);

-        /** @var Page $page */
-        $page = Page::query()->first();
-        $editor = $this->getEditor();
+        $page = $this->entities->page();
+        $editor = $this->users->editor();

 
         $this->runEvent(ActivityType::PAGE_UPDATE, $page, $editor);
 
 
         $this->runEvent(ActivityType::PAGE_UPDATE, $page, $editor);
 


@@ -113,7 +131,7 @@ class WebhookCallTest extends TestCase
     protected function runEvent(string $event, $detail = '', ?User $user = null)
     {
         if (is_null($user)) {
     protected function runEvent(string $event, $detail = '', ?User $user = null)
     {
         if (is_null($user)) {

-            $user = $this->getEditor();
+            $user = $this->users->editor();

         }
 
         $this->actingAs($user);
         }
 
         $this->actingAs($user);


@@ -122,7 +140,7 @@ class WebhookCallTest extends TestCase
         $activityLogger->add($event, $detail);
     }
 
         $activityLogger->add($event, $detail);
     }
 

-    protected function newWebhook(array $attrs = [], array $events = ['all']): Webhook
+    protected function newWebhook(array $attrs, array $events): Webhook

     {
         /** @var Webhook $webhook */
         $webhook = Webhook::factory()->create($attrs);
     {
         /** @var Webhook $webhook */
         $webhook = Webhook::factory()->create($attrs);