node-tdd 3.5.2 → 3.5.4

package/lib/modules/request-recorder.js

@@ -6,8 +6,8 @@ import Joi from 'joi-strict';
 import nock from 'nock';
 import get from 'lodash.get';
 import cloneDeep from 'lodash.clonedeep';
-import compareUrls from 'compare-urls';
 import nockCommon from 'nock/lib/common.js';
+import compareUrls from '../util/compare-urls.js';
 import nockListener from './request-recorder/nock-listener.js';
 import nockMock from './request-recorder/nock-mock.js';
 import healSqsSendMessageBatch from './request-recorder/heal-sqs-send-message-batch.js';
@@ -177,6 +177,9 @@ export default (opts) => {
                 if (!compareUrls(pendingMocks[idx].record.path, requestPath)) {
                   pendingMocks[idx].record.path = requestPath;
                 }
+                if (compareUrls(pendingMocks[idx].record.path, scope.path)) {
+                  pendingMocks[idx].record.path = scope.path;
+                }
                 return scope.path;
               }
               return requestPath;

package/lib/util/compare-urls.js

@@ -0,0 +1,11 @@
+import normalizeUrl from 'normalize-url';
+
+export default (firstUrl, secondUrl) => {
+  if (firstUrl === secondUrl) {
+    return true;
+  }
+  const options = {
+    removeTrailingSlash: false
+  };
+  return normalizeUrl(firstUrl, options) === normalizeUrl(secondUrl, options);
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-tdd",
   "type": "module",
-  "version": "3.5.2",
+  "version": "3.5.4",
   "description": "Drop in extension for mocha to abstract commonly used test setups",
   "main": "lib/index.js",
   "scripts": {
@@ -75,13 +75,13 @@
   ],
   "dependencies": {
     "callsites": "4.0.0",
-    "compare-urls": "2.0.0",
     "joi-strict": "2.0.1",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "4.4.2",
     "lru-cache-ext": "3.0.2",
     "minimist": "1.2.8",
     "nock": "13.3.2",
+    "normalize-url": "2.0.1",
     "object-scan": "18.5.1",
     "smart-fs": "3.0.1",
     "timekeeper": "2.2.0",