@tryghost/express-test 0.7.1 → 0.8.0

package/lib/agent.js

@@ -59,6 +59,7 @@ class Agent {
             method,
             url: this._makeUrl(url),
             headers: Object.assign({}, this.defaults.headers, options.headers),
+            // Set this to an empty object for ease, as express.json will do this anyway
             body: Object.assign({}, this.defaults.body, options.body)
         });
     }

package/lib/expect-request.js

@@ -77,6 +77,18 @@ class ExpectRequest extends Request {
         return this;
     }
 
+    expectEmptyBody() {
+        const assertion = {
+            fn: this._assertEmptyBody,
+            expected: {},
+            type: 'body'
+        };
+
+        this._addAssertion(assertion);
+
+        return this;
+    }
+
     matchBodySnapshot(properties = {}) {
         let assertion = {
             fn: this._assertSnapshot,
@@ -217,18 +229,28 @@ class ExpectRequest extends Request {
         }
     }
 
-    _assertSnapshot(result, assertion) {
+    _assertEmptyBody(response, assertion) {
+        const {error, expected} = assertion;
+        const actual = response.body;
+
+        error.actual = actual;
+        error.message = `Expected body to be empty, got "${actual}" ${error.contextString}`;
+
+        assert.deepEqual(actual, expected, error);
+    }
+
+    _assertSnapshot(response, assertion) {
         const {properties, field, error} = assertion;
 
-        if (!result[field]) {
+        if (!response[field]) {
             error.message = `Unable to match snapshot on undefined field ${field} ${error.contextString}`;
             error.expected = field;
             error.actual = 'undefined';
-            assert.notEqual(result[field], undefined, error);
+            assert.notEqual(response[field], undefined, error);
         }
 
         const hint = `[${field}]`;
-        const match = snapshotManager.match(result[field], properties, hint);
+        const match = snapshotManager.match(response[field], properties, hint);
 
         Object.keys(properties).forEach((prop) => {
             const errorMessage = `"response.${field}" is missing the expected property "${prop}"`;
@@ -237,7 +259,7 @@ class ExpectRequest extends Request {
             error.actual = 'undefined';
             error.showDiff = false; // Disable mocha's diff output as it's already present in match.message()
 
-            assert.notEqual(result[field][prop], undefined, error);
+            assert.notEqual(response[field][prop], undefined, error);
         });
 
         if (match.pass !== true) {

package/lib/request.js

@@ -36,11 +36,11 @@ class Request {
     then(resolve, reject) {
         const self = this;
         this._fullfilledPromise = new Promise((_resolve, _reject) => {
-            self.finalize((error, result) => {
+            self.finalize((error, response) => {
                 if (error) {
                     return _reject(error);
                 }
-                return _resolve(result);
+                return _resolve(response);
             });
         });
 
@@ -64,12 +64,7 @@ class Request {
     _getReqRes() {
         const {app, reqOptions} = this;
 
-        const {req, res} = reqresnext(Object.assign({}, reqOptions, {app}), {app});
-
-        // This is needed to make error handling work
-        // @TODO: remove once https://github.com/antongolub/reqresnext/issues/31 is solved
-        req.socket.destroy = () => { };
-        return {req, res};
+        return reqresnext(Object.assign({}, reqOptions, {app}), {app});
     }
 
     _buildResponse(res) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@tryghost/express-test",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "repository": "https://github.com/TryGhost/framework/tree/main/packages/express-test",
   "author": "Ghost Foundation",
   "license": "MIT",
   "main": "index.js",
   "scripts": {
     "dev": "echo \"Implement me!\"",
-    "test": "NODE_ENV=testing c8 --all --reporter text --reporter cobertura mocha --require ./test/utils/overrides.js './test/**/*.test.js'",
+    "test": "NODE_ENV=testing c8 mocha --require ./test/utils/overrides.js './test/**/*.test.js'",
     "lint": "eslint . --ext .js --cache",
     "posttest": "yarn lint"
   },
@@ -26,9 +26,9 @@
     "sinon": "13.0.1"
   },
   "dependencies": {
-    "@tryghost/jest-snapshot": "^0.3.7",
+    "@tryghost/jest-snapshot": "^0.3.8",
     "cookiejar": "^2.1.3",
     "reqresnext": "^1.7.0"
   },
-  "gitHead": "782447b7c96a800387ef83ad4a2a330615918399"
+  "gitHead": "5eac4d7d103691f639b4c2b58494c26c85f4b22a"
 }