@tryghost/express-test 0.1.1 → 0.2.0

package/lib/agent.js

@@ -37,7 +37,7 @@ class Agent {
     }
 }
 
-['get', 'post', 'put', 'del'].forEach((method) => {
+['get', 'post', 'put', 'patch', 'delete', 'options', 'head'].forEach((method) => {
     Agent.prototype[method] = function (url, options) {
         if (!url) {
             throw new Error('Cannot make a request without supplying a url'); /* eslint-disable-line no-restricted-syntax */

package/lib/expect-request.js

@@ -7,6 +7,12 @@ class ExpectRequest extends Request {
     }
 
     expect(callback) {
+        if (typeof callback !== 'function') {
+            throw new Error(/* eslint-disable-line no-restricted-syntax */
+                'express-test expect() requires a callback function, did you mean expectStatus or expectHeader?'
+            );
+        }
+
         const wrapperFn = (response, assertion) => {
             try {
                 callback(response);
@@ -47,6 +53,7 @@ class ExpectRequest extends Request {
 
         return this;
     }
+
     finalize(callback) {
         super.finalize((error, response) => {
             if (error) {
@@ -96,17 +103,25 @@ class ExpectRequest extends Request {
     _assertHeader(response, assertion) {
         const {expectedField, expectedValue, error} = assertion;
         const actual = response.headers[expectedField];
+
         const expectedHeaderString = `${expectedField}: ${expectedValue}`;
         const actualHeaderString = `${expectedField}: ${actual}`;
 
         error.expected = expectedHeaderString;
         error.actual = actualHeaderString;
 
-        error.message = `Expected header "${expectedHeaderString}" to exist but got ${JSON.stringify(response.headers)} ${error.contextString}`;
+        error.message = `Expected header "${expectedHeaderString}" to exist, got headers: ${JSON.stringify(response.headers)} ${error.contextString}`;
         assert.notStrictEqual(actual, undefined, error);
 
-        error.message = `Expected header "${expectedHeaderString}", got ${actualHeaderString} ${error.contextString}`;
-        assert.equal(expectedHeaderString, actualHeaderString, error);
+        if (expectedValue instanceof RegExp) {
+            error.expected = expectedValue;
+            error.actual = actual;
+            error.message = `Expected header "${expectedField}" to have value matching "${expectedValue}", got "${actual}" ${error.contextString}`;
+            assert.equal(expectedValue.test(actual), true, error);
+        } else {
+            error.message = `Expected header "${expectedHeaderString}", got "${actualHeaderString}" ${error.contextString}`;
+            assert.equal(expectedHeaderString, actualHeaderString, error);
+        }
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/express-test",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "repository": "https://github.com/TryGhost/framework/tree/main/packages/express-test",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -29,5 +29,5 @@
     "cookiejar": "^2.1.3",
     "reqresnext": "^1.6.6"
   },
-  "gitHead": "81312a5f57f2c71f189457b9e4e4e1fa1f749b0e"
+  "gitHead": "ba2449737cd3a66d811e34b5b28b86f5d3538396"
 }