fix: avoid false negatives due to fixture conflicts

lib/additions.js

@@ -1,5 +1,7 @@
 module.exports = fixtureAdditions
 
+const parseUrl = require('url').parse
+
 const mapValuesDeep = require('./map-values-deep')
 
 function fixtureAdditions (state, {id, fixture}) {
@@ -13,6 +15,15 @@ function fixtureAdditions (state, {id, fixture}) {
   })
 
   fixture.headers['content-length'] = String(calculateBodyLength(fixture.response))
+
+  // We make the fixtures id part of the hostname to avoid conflicts with other
+  // mocks loaded with nock as they are global for the same process. Looking up
+  // fixtures by unique hostname is more efficient, too.
+  const {protocol, hostname, port} = parseUrl(fixture.scope)
+  const newHostame = `fixtures-${id}.${hostname}`
+  fixture.scope = `${protocol}//${newHostame}:${port}`
+  fixture.reqheaders.host = newHostame
+
   return fixture
 }
 

lib/proxy.js

@@ -10,10 +10,15 @@ const validateRequest = require('./request-validation-middleware')
 
 function proxy (state, {target}) {
   const middleware = express.Router()
-  const hostname = urlParse(target).hostname
+  const {protocol, hostname} = urlParse(target)
 
   middleware.use(`/${hostname}/:fixturesId`, validateRequest.bind(null, state), httpProxyMiddleware({
     target: target,
+    router (req) {
+      const fixturesId = req.path.split('/')[2]
+      const target = `${protocol}//fixtures-${fixturesId}.${hostname}`
+      return target
+    },
     changeOrigin: true,
     logLevel: state.logLevel,
     pathRewrite: {