@tryghost/express-test 0.6.0 → 0.7.0

package/lib/agent.js

@@ -1,6 +1,7 @@
 const {CookieJar} = require('cookiejar');
 const ExpectRequest = require('./expect-request');
 const {RequestOptions} = require('./request');
+const {normalizeURL} = require('./utils');
 
 class Agent {
     /**
@@ -19,10 +20,14 @@ class Agent {
     }
 
     _makeUrl(url) {
+        let processedURL = url;
+
         if (this.defaults.baseUrl) {
-            url = `/${this.defaults.baseUrl}/${url}`.replace(/(^|[^:])\/\/+/g, '$1/');
+            processedURL = `/${this.defaults.baseUrl}/${processedURL}`.replace(/(^|[^:])\/\/+/g, '$1/');
         }
 
+        processedURL = normalizeURL(processedURL);
+
         if (this.defaults.queryParams) {
             const searchParams = new URLSearchParams();
 
@@ -30,14 +35,14 @@ class Agent {
                 searchParams.append(key, this.defaults.queryParams[key]);
             }
 
-            if (url.includes('?')) {
-                url = `${url}&${searchParams.toString()}`;
+            if (processedURL.includes('?')) {
+                processedURL = `${processedURL}&${searchParams.toString()}`;
             } else {
-                url = `${url}?${searchParams.toString()}`;
+                processedURL = `${processedURL}?${searchParams.toString()}`;
             }
         }
 
-        return url;
+        return processedURL;
     }
 
     _mergeOptions(method, url, options = {}) {

package/lib/expect-request.js

@@ -8,7 +8,7 @@ const {makeMessageFromMatchMessage} = require('./utils');
  * @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 {'body' | 'header' | 'status'} type - The type of assertion, with following priority: body > header > status
  * @prop {import('assert').AssertionError} [error] - The error to throw if the assertion fails
  * @prop {any} [expected]
  * @prop {any} [expectedValue]
@@ -43,7 +43,8 @@ class ExpectRequest extends Request {
         };
 
         const assertion = {
-            fn: wrapperFn
+            fn: wrapperFn,
+            type: 'body'
         };
 
         this._addAssertion(assertion);
@@ -80,7 +81,8 @@ class ExpectRequest extends Request {
         let assertion = {
             fn: this._assertSnapshot,
             properties: properties,
-            field: 'body'
+            field: 'body',
+            type: 'body'
         };
 
         this._addAssertion(assertion);
@@ -139,12 +141,14 @@ class ExpectRequest extends Request {
         const headerAssertions = [];
 
         for (const assertion of this.assertions) {
-            if (!['status', 'header'].includes(assertion.type)) {
+            if (assertion.type === 'body') {
                 assertion.fn(response, assertion);
             } else if (assertion.type === 'status') {
                 statusCodeAssertions.push(assertion);
             } else if (assertion.type === 'header') {
                 headerAssertions.push(assertion);
+            } else {
+                headerAssertions.push(assertion);
             }
         }
 

package/lib/utils.js

@@ -1,3 +1,5 @@
+// const url = require('url');
+
 module.exports.isJSON = function isJSON(mime) {
     // should match /json or +json
     // but not /json-seq
@@ -9,3 +11,15 @@ module.exports.makeMessageFromMatchMessage = function makeMessageFromMatchMessag
     messageLines.splice(0, 1, errorMessage);
     return messageLines.join('\n');
 };
+
+module.exports.normalizeURL = function normalizeURL(toNormalize) {
+    const split = toNormalize.split('?');
+    const pathname = split[0];
+    let normalized = pathname + (pathname.endsWith('/') ? '' : '/');
+
+    if (split.length === 2) {
+        normalized += `?${split[1]}`;
+    }
+
+    return normalized;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/express-test",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "repository": "https://github.com/TryGhost/framework/tree/main/packages/express-test",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -22,13 +22,13 @@
     "c8": "7.11.0",
     "express": "4.17.3",
     "express-session": "1.17.2",
-    "mocha": "9.2.1",
+    "mocha": "9.2.2",
     "sinon": "13.0.1"
   },
   "dependencies": {
-    "@tryghost/jest-snapshot": "^0.3.3",
+    "@tryghost/jest-snapshot": "^0.3.6",
     "cookiejar": "^2.1.3",
     "reqresnext": "^1.7.0"
   },
-  "gitHead": "64606b3f53d3ec8e6bf988f694d9dc4bbf5fac70"
+  "gitHead": "b71a3cb711cae3a1981e925d29780c9bfaacf3c3"
 }