@tryghost/express-test 0.6.1 → 0.7.1

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/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.1",
+  "version": "0.7.1",
   "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.4",
+    "@tryghost/jest-snapshot": "^0.3.7",
     "cookiejar": "^2.1.3",
     "reqresnext": "^1.7.0"
   },
-  "gitHead": "3768b2b29fe5c2ae4e535264246bc78933eba372"
+  "gitHead": "782447b7c96a800387ef83ad4a2a330615918399"
 }