From 939496487da12ac41af1a9cf892da18de231f094 Mon Sep 17 00:00:00 2001 From: Naz Date: Thu, 26 May 2022 14:45:36 +0800 Subject: [PATCH] Removed subscriber-related webhook fixtures refs https://github.com/TryGhost/Toolbox/issues/308 refs https://github.com/TryGhost/Ghost/commit/0f5c22a38d6fff960fa1253cba622749eb57df5d - There is no concept of "subscriber" in the codebase any longer. Keeping removed webhooks around does not make sense --- test/e2e-api/admin/__snapshots__/webhooks.test.js.snap | 4 ++-- test/e2e-api/admin/webhooks.test.js | 4 ++-- test/regression/api/admin/webhooks.test.js | 2 +- test/utils/fixtures/data-generator.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/e2e-api/admin/__snapshots__/webhooks.test.js.snap b/test/e2e-api/admin/__snapshots__/webhooks.test.js.snap index 0f4472d4a0..82b2be6893 100644 --- a/test/e2e-api/admin/__snapshots__/webhooks.test.js.snap +++ b/test/e2e-api/admin/__snapshots__/webhooks.test.js.snap @@ -49,7 +49,7 @@ Object { Object { "api_version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/, "created_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}/, - "event": "subscriber.added", + "event": "member.added", "id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "integration_id": StringMatching /\\[a-f0-9\\]\\{24\\}/, "last_triggered_at": null, @@ -57,7 +57,7 @@ Object { "last_triggered_status": null, "name": "Edit Test", "secret": "thisissecret", - "target_url": "https://example.com/new-subscriber", + "target_url": "https://example.com/new-member", "updated_at": StringMatching /\\\\d\\{4\\}-\\\\d\\{2\\}-\\\\d\\{2\\}/, }, ], diff --git a/test/e2e-api/admin/webhooks.test.js b/test/e2e-api/admin/webhooks.test.js index 224baf16bb..58f211fe08 100644 --- a/test/e2e-api/admin/webhooks.test.js +++ b/test/e2e-api/admin/webhooks.test.js @@ -87,8 +87,8 @@ describe('Webhooks API', function () { .body({ webhooks: [{ name: 'Edit Test', - event: 'subscriber.added', - target_url: 'https://example.com/new-subscriber', + event: 'member.added', + target_url: 'https://example.com/new-member', integration_id: 'ignore_me' }] }) diff --git a/test/regression/api/admin/webhooks.test.js b/test/regression/api/admin/webhooks.test.js index eaf552dd98..520176a0b5 100644 --- a/test/regression/api/admin/webhooks.test.js +++ b/test/regression/api/admin/webhooks.test.js @@ -138,7 +138,7 @@ describe('Webhooks API (canary)', function () { .send({ webhooks: [{ name: 'Edit Test', - event: 'subscriber.added', + event: 'member.added', target_url: 'https://example.com/new-subscriber' }] }) diff --git a/test/utils/fixtures/data-generator.js b/test/utils/fixtures/data-generator.js index ce61c6c26c..7faeb7195e 100644 --- a/test/utils/fixtures/data-generator.js +++ b/test/utils/fixtures/data-generator.js @@ -630,12 +630,12 @@ DataGenerator.Content = { webhooks: [ { id: ObjectId().toHexString(), - event: 'subscriber.added', + event: 'member.added', target_url: 'https://example.com/webhooks/subscriber-added' }, { id: ObjectId().toHexString(), - event: 'subscriber.removed', + event: 'member.removed', target_url: 'https://example.com/webhooks/subscriber-removed' } ],