@tryghost/express-test 0.4.2 → 0.5.0

package/lib/expect-request.js

@@ -3,9 +3,27 @@ const {Request, RequestOptions} = require('./request');
 const {snapshotManager} = require('@tryghost/jest-snapshot');
 const {makeMessageFromMatchMessage} = require('./utils');
 
+/**
+ * @typedef {object} ExpressTestAssertion
+ * @prop {function} fn - Wrapped assertion with response context
+ * @prop {string} [message] - The message to display if the assertion fails
+ * @prop {string} [method] - The method to call on the assertion object
+ * @prop {'header' | 'status'} [type] - The type of assertion
+ * @prop {import('assert').AssertionError} [error] - The error to throw if the assertion fails
+ * @prop {any} [expected]
+ * @prop {any} [expectedValue]
+ * @prop {string} [expectedField]
+ * @prop {object} [properties]
+ */
+
 class ExpectRequest extends Request {
     constructor(...args) {
         super(...args);
+
+        /**
+         * @property {ExpressTestAssertion[]} assertions
+         */
+        this.assertions = [];
     }
 
     expect(callback) {
@@ -36,7 +54,8 @@ class ExpectRequest extends Request {
     expectStatus(expected) {
         const assertion = {
             fn: this._assertStatus,
-            expected
+            expected,
+            type: 'status'
         };
 
         this._addAssertion(assertion);
@@ -48,7 +67,8 @@ class ExpectRequest extends Request {
         const assertion = {
             fn: this._assertHeader,
             expectedField: expectedField.toLowerCase(),
-            expectedValue
+            expectedValue,
+            type: 'header'
         };
 
         this._addAssertion(assertion);
@@ -72,7 +92,8 @@ class ExpectRequest extends Request {
         let assertion = {
             fn: this._assertSnapshot,
             properties: properties,
-            field: 'headers'
+            field: 'headers',
+            type: 'header'
         };
 
         this._addAssertion(assertion);
@@ -87,7 +108,7 @@ class ExpectRequest extends Request {
             }
 
             try {
-                if (this.assertions) {
+                if (this.assertions && this.assertions.length) {
                     this._assertAll(response);
                 }
                 return callback(null, response);
@@ -97,12 +118,49 @@ class ExpectRequest extends Request {
         });
     }
 
+    /**
+     * @description Runs through the assertions queue and executes them
+     * in following order:
+     * 1. Assertions with no type, e.g: body snapshot match, generic assertions
+     * 2. Assertions of "header" type
+     * 3. Assertions of "status" type
+     *
+     * The order is here to assert the most informative assertions first and the
+     * least informative ones last. For example status code assertions, usually
+     * are setup first but give the least amount of information needed to
+     * investigate the reason of failure. Same problem with header assertions.
+     * By changing the default order of assertions it's expected to improve
+     * the developer experience creating/debugging tests.
+     *
+     * @param {Object} response - HTTP response object
+     */
     _assertAll(response) {
+        const statusCodeAssertions = [];
+        const headerAssertions = [];
+
         for (const assertion of this.assertions) {
+            if (!['status', 'header'].includes(assertion.type)) {
+                assertion.fn(response, assertion);
+            } else if (assertion.type === 'status') {
+                statusCodeAssertions.push(assertion);
+            } else if (assertion.type === 'header') {
+                headerAssertions.push(assertion);
+            }
+        }
+
+        for (const assertion of headerAssertions) {
+            assertion.fn(response, assertion);
+        }
+
+        for (const assertion of statusCodeAssertions) {
             assertion.fn(response, assertion);
         }
     }
 
+    /**
+     * Adds assertion to the queue of assertions to be performed
+     * @param {ExpressTestAssertion} assertion
+     */
     _addAssertion(assertion) {
         // We create the error here so that we get a useful stack trace
         let error = new assert.AssertionError({
@@ -114,7 +172,6 @@ class ExpectRequest extends Request {
         error.contextString = this.reqOptions.toString();
         assertion.error = error;
 
-        this.assertions = this.assertions || [];
         this.assertions.push(assertion);
     }
 

package/lib/request.js

@@ -1,14 +1,13 @@
 const {default: reqresnext} = require('reqresnext');
 const {CookieAccessInfo} = require('cookiejar');
 const {parse} = require('url');
-const {isJSON, convertKeysToLowerCase} = require('./utils');
+const {isJSON} = require('./utils');
 
 class RequestOptions {
     constructor({method, url, headers, body} = {}) {
         this.method = method || 'GET';
         this.url = url || '/';
-        // TODO: remove convertKeysToLowerCase utility once https://github.com/antongolub/reqresnext/issues/33 is fixed
-        this.headers = convertKeysToLowerCase(headers) || {};
+        this.headers = headers || {};
         this.body = body;
     }
 
@@ -30,8 +29,7 @@ class Request {
     }
 
     header(name, value) {
-        // TODO: remove toLowerCase once https://github.com/antongolub/reqresnext/issues/33 is fixed
-        this.reqOptions.headers[name.toLowerCase()] = value;
+        this.reqOptions.headers[name] = value;
         return this;
     }
 

package/lib/utils.js

@@ -9,13 +9,3 @@ module.exports.makeMessageFromMatchMessage = function makeMessageFromMatchMessag
     messageLines.splice(0, 1, errorMessage);
     return messageLines.join('\n');
 };
-
-module.exports.convertKeysToLowerCase = function (map) {
-    const newMap = {};
-
-    for (const key in map) {
-        newMap[key.toLowerCase()] = map[key];
-    }
-
-    return newMap;
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/express-test",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "repository": "https://github.com/TryGhost/framework/tree/main/packages/express-test",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -20,15 +20,15 @@
   },
   "devDependencies": {
     "c8": "7.11.0",
-    "express": "^4.17.2",
-    "express-session": "^1.17.2",
+    "express": "4.17.2",
+    "express-session": "1.17.2",
     "mocha": "9.2.0",
     "sinon": "13.0.1"
   },
   "dependencies": {
-    "@tryghost/jest-snapshot": "^0.3.1",
+    "@tryghost/jest-snapshot": "^0.3.2",
     "cookiejar": "^2.1.3",
-    "reqresnext": "^1.6.6"
+    "reqresnext": "^1.7.0"
   },
-  "gitHead": "fdec1082aa5efa81196205cbcd8a31c61b50c8fa"
+  "gitHead": "e954893434fda3f8c8de1970aaaa6f6a8b297f5d"
 }