@tryghost/webhook-mock-receiver 0.1.2 → 0.2.0

package/lib/webhook-mock-receiver.js

@@ -1,22 +1,25 @@
 const {AssertionError} = require('assert');
-const util = require('util');
 const {URL} = require('url');
 const nock = require('nock');
-const setTimeoutPromise = util.promisify(setTimeout);
+const pWaitFor = require('p-wait-for');
 
 class WebhookMockReceiver {
     constructor({snapshotManager}) {
-        this.bodyResponse;
-        this.receiver;
+        this.body;
+        this.headers;
+        this._receiver;
         this.snapshotManager = snapshotManager;
-        this.recordBodyResponse = this.recordBodyResponse.bind(this);
+        this.recordRequest = this.recordRequest.bind(this);
     }
 
-    recordBodyResponse(body) {
-        this.bodyResponse = {body};
+    recordRequest(body, options) {
+        this.body = {body};
+        this.headers = {headers: options.headers};
+    }
 
-        // let the nock continue with the response
-        return true;
+    async receivedRequest() {
+        // @NOTE: figure out a better waiting mechanism here, don't allow it to hang forever
+        await pWaitFor(() => this._receiver.isDone());
     }
 
     /**
@@ -26,9 +29,14 @@ class WebhookMockReceiver {
      */
     mock(url) {
         const parsedURL = new URL(url);
+        const recordRequest = this.recordRequest;
 
-        this.receiver = nock(parsedURL.origin)
-            .post(parsedURL.pathname, this.recordBodyResponse)
+        this._receiver = nock(parsedURL.origin)
+            .post(parsedURL.pathname, function (body) {
+                recordRequest(body, this);
+                // let the nock continue with the response
+                return true;
+            })
             .reply(200, {status: 'OK'});
 
         return this;
@@ -36,16 +44,12 @@ class WebhookMockReceiver {
 
     reset() {
         nock.cleanAll();
-        this.receiver = undefined;
-        this.bodyResponse = undefined;
+        this._receiver = undefined;
+        this.body = undefined;
+        this.headers = undefined;
     }
 
-    async matchBodySnapshot(properties = {}) {
-        // @TODO: figure out a better waiting mechanism here, don't allow it to hang forever
-        while (!this.receiver.isDone()) {
-            await setTimeoutPromise(10);
-        }
-
+    matchBodySnapshot(properties = {}) {
         const error = new AssertionError({});
         let assertion = {
             properties: properties,
@@ -54,7 +58,23 @@ class WebhookMockReceiver {
             error
         };
 
-        this.snapshotManager.assertSnapshot(this.bodyResponse, assertion);
+        this.snapshotManager.assertSnapshot(this.body, assertion);
+
+        return this;
+    }
+
+    matchHeaderSnapshot(properties = {}) {
+        const error = new AssertionError({});
+        let assertion = {
+            properties: properties,
+            field: 'headers',
+            type: 'header',
+            error
+        };
+
+        this.snapshotManager.assertSnapshot(this.headers, assertion);
+        
+        return this;
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/webhook-mock-receiver",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "repository": "https://github.com/TryGhost/framework/tree/main/packages/webhook-mock-receiver",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -24,7 +24,10 @@
     "c8": "7.12.0",
     "got": "9.6.0",
     "mocha": "10.0.0",
-    "sinon": "14.0.0"
+    "sinon": "14.0.1"
   },
-  "gitHead": "cc9195ea06015d9711ed1fa65267ff85c19edb05"
+  "dependencies": {
+    "p-wait-for": "3.1.0"
+  },
+  "gitHead": "f3dbb6472357449036db1a79f458d0fdfd53640b"
 }