fix: make interceptors work in any order even when filteringScope (#1819)

salmanm · paulmelnikow · commit bd39dffe9468 · 2020-01-02T20:14:21.000-05:00
Closes #1818
diff --git a/lib/intercept.js b/lib/intercept.js
@@ -160,7 +160,9 @@ function interceptorsFor(options) {
 
         // Keep the filtered scope (its key) to signal the rest of the module
         // that this wasn't an exact but filtered match.
-        interceptor.__nock_filteredScope = interceptor.__nock_scopeKey
+        interceptors.forEach(ic => {
+          ic.__nock_filteredScope = ic.__nock_scopeKey
+        })
         return interceptors
       }
     }
diff --git a/tests/test_intercept.js b/tests/test_intercept.js
@@ -918,6 +918,52 @@ test('match multiple interceptors with regexp domain', async t => {
   })
 })
 
+test('interceptors should work in any order', async t => {
+  nock('http://some.test')
+    .get('/path1?query=1')
+    .reply(200, 'response for path1/query1')
+    .get('/path2?query=2')
+    .reply(200, 'response for path2/query2')
+
+  // Calling second request before first
+  const response2 = await got('http://some.test/path2?query=2')
+  expect(response2).to.include({
+    statusCode: 200,
+    body: 'response for path2/query2',
+  })
+
+  // Calling first request after second
+  const response1 = await got('http://some.test/path1?query=1')
+  expect(response1).to.include({
+    statusCode: 200,
+    body: 'response for path1/query1',
+  })
+})
+
+test('interceptors should work in any order with filteringScope', async t => {
+  nock('http://some.test', {
+    filteringScope: scope => true,
+  })
+    .get('/path1?query=1')
+    .reply(200, 'response for path1/query1')
+    .get('/path2?query=2')
+    .reply(200, 'response for path2/query2')
+
+  // Calling second request before first
+  const response2 = await got('http://other.test/path2?query=2')
+  expect(response2).to.include({
+    statusCode: 200,
+    body: 'response for path2/query2',
+  })
+
+  // Calling first request after second
+  const response1 = await got('http://other.test/path1?query=1')
+  expect(response1).to.include({
+    statusCode: 200,
+    body: 'response for path1/query1',
+  })
+})
+
 // FIXME: This marked as { todo: true } because it is an existing bug.
 // https://github.com/nock/nock/issues/1108
 test(

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,9 @@ function interceptorsFor(options) {`
`160`	`160`
`161`	`161`	`// Keep the filtered scope (its key) to signal the rest of the module`
`162`	`162`	`// that this wasn't an exact but filtered match.`
`163`		`- interceptor.__nock_filteredScope = interceptor.__nock_scopeKey`
	`163`	`+ interceptors.forEach(ic => {`
	`164`	`+ ic.__nock_filteredScope = ic.__nock_scopeKey`
	`165`	`+ })`
`164`	`166`	`return interceptors`
`165`	`167`	`}`
`166`	`168`	`}`