@tryghost/webhook-mock-receiver 2.3.17 → 2.3.18

package/lib/WebhookMockReceiver.js

@@ -6,6 +6,9 @@ const pWaitFor = require('p-wait-for').default;
 class WebhookMockReceiver {
     constructor({ snapshotManager }) {
         this.snapshotManager = snapshotManager;
+        // Bumped by mock() and reset() so reply callbacks from a superseded
+        // mock can't record into the current one
+        this._mockGeneration = 0;
         this.recordRequest = this.recordRequest.bind(this);
     }
 
@@ -16,7 +19,9 @@ class WebhookMockReceiver {
 
     async receivedRequest() {
         // @NOTE: figure out a better waiting mechanism here, don't allow it to hang forever
-        await pWaitFor(() => this._receiver.isDone());
+        // Nock marks the interceptor done when the request matches, before the
+        // async reply callback records it, so wait for both
+        await pWaitFor(() => this._receiver.isDone() && this.headers !== undefined);
     }
 
     /**
@@ -26,7 +31,14 @@ class WebhookMockReceiver {
      */
     mock(url) {
         const parsedURL = new URL(url);
-        const recordRequest = this.recordRequest;
+        const mockGeneration = ++this._mockGeneration;
+        const recordRequest = (...args) => {
+            if (mockGeneration === this._mockGeneration) {
+                this.recordRequest(...args);
+            }
+        };
+        this.body = undefined;
+        this.headers = undefined;
 
         this._receiver = nock(parsedURL.origin)
             .post(parsedURL.pathname)
@@ -62,6 +74,7 @@ class WebhookMockReceiver {
 
     reset() {
         nock.cleanAll();
+        this._mockGeneration += 1;
         this._receiver = undefined;
         this.body = undefined;
         this.headers = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/webhook-mock-receiver",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "license": "MIT",
   "author": "Ghost Foundation",
   "repository": {