nock 13.2.6 → 13.2.9

package/README.md

@@ -846,11 +846,24 @@ If you need to match requests only if certain request headers match, you can.
 
 ```js
 const scope = nock('http://api.myservice.com')
+  // Interceptors created after here will only match when the header `accept` equals `application/json`.
   .matchHeader('accept', 'application/json')
   .get('/')
   .reply(200, {
     data: 'hello world',
   })
+  .get('/')
+  // Only this interceptor will match the header value `x-my-action` with `MyFirstAction`
+  .matchHeader('x-my-action', 'MyFirstAction')
+  .reply(200, {
+    data: 'FirstActionResponse',
+  })
+  .get('/')
+  // Only this interceptor will match the header value `x-my-action` with `MySecondAction`
+  .matchHeader('x-my-action', 'MySecondAction')
+  .reply(200, {
+    data: 'SecondActionResponse',
+  })
 ```
 
 You can also use a regexp for the header body.

package/lib/intercepted_request_router.js

@@ -143,8 +143,11 @@ class InterceptedRequestRouter {
 
   // from docs: When write function is called with empty string or buffer, it does nothing and waits for more input.
   // However, actually implementation checks the state of finished and aborted before checking if the first arg is empty.
-  handleWrite(buffer, encoding, callback) {
+  handleWrite(...args) {
     debug('request write')
+
+    let [buffer, encoding] = args
+
     const { req } = this
 
     if (req.finished) {
@@ -171,6 +174,9 @@ class InterceptedRequestRouter {
     }
     this.requestBodyBuffers.push(buffer)
 
+    // writable.write encoding param is optional
+    // so if callback is present it's the last argument
+    const callback = args.length > 1 ? args[args.length - 1] : undefined
     // can't use instanceof Function because some test runners
     // run tests in vm.runInNewContext where Function is not same
     // as that in the current context

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "13.2.6",
+  "version": "13.2.9",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",
@@ -45,11 +45,11 @@
     "mocha": "^9.1.3",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.0.0",
-    "prettier": "2.6.2",
+    "prettier": "2.7.1",
     "proxyquire": "^2.1.0",
     "rimraf": "^3.0.0",
     "semantic-release": "^19.0.2",
-    "sinon": "^13.0.1",
+    "sinon": "^14.0.0",
     "sinon-chai": "^3.7.0",
     "typescript": "^4.2.2"
   },

package/types/index.d.ts

@@ -228,8 +228,8 @@ declare namespace nock {
   }
 
   interface Definition {
-    scope: string
-    path: string
+    scope: string | RegExp
+    path: string | RegExp
     port?: number | string
     method?: string
     status?: number