nock 9.6.1 → 10.0.3

package/.github/ISSUE_TEMPLATE/01_bug_report.md

@@ -0,0 +1,26 @@
+---
+name: 🐛 Bug report
+about: If something isn't working 🤕
+
+---
+
+**What is the expected behavior?**
+
+**What is the actual behavior?**
+
+**Possible solution**
+
+**How to reproduce the issue**
+
+Runkit: *[Example link](https://runkit.com/gr2m/node-nock-nock-768)*
+
+_Having problem producing a test case? Try and ask the community for help. If the test case cannot be reproduced, the Nock community might not be able to help you._
+
+**Does the bug have a test case?**
+
+**Versions**
+
+| Software | Version(s) |
+|----------|------------|
+| Nock     |            |
+| Node     |            |

package/.github/ISSUE_TEMPLATE/02_feature_request.md

@@ -0,0 +1,21 @@
+---
+name: 🚀 Feature request
+about: Let us know if you have a feature request 💡
+
+---
+
+**Context**
+
+What are you trying to do and how would you want to do it differently? Is it something you currently you cannot do? Is this related to an issue/problem?
+
+**Alternatives**
+
+Can you achieve the same result doing it in an alternative way? Is the alternative considerable?
+
+**Has the feature been requested before?**
+
+Please provide a link to the issue.
+
+**If the feature request is accepted, would you be willing to submit a PR?**
+
+Yes / No _(Help can be provided if you need assistance submitting a PR)_

package/.github/ISSUE_TEMPLATE/03_support.md

@@ -0,0 +1,24 @@
+---
+name: ❓ Support
+about: If you need support, check out Nock on StackOverflow
+
+---
+
+<!--                 👆 Click "Preview" for a nicer view! -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+We primarily use GitHub as an issue tracker; for usage and support questions we primairly use StackOverflow. Please tag the questions with `nock` so the community can easily find it. [Go to StackOverflow](https://stackoverflow.com/questions/tagged/nock).
+
+If you want to submit a feature request you can do that [here](https://github.com/nock/nock/issues/new?template=feature_request.md) or bug reports [here](https://github.com/nock/nock/issues/new?template=bug_report.md).

package/.github/ISSUE_TEMPLATE/04_thanks.md

@@ -0,0 +1,21 @@
+---
+name: ❤️ Say thank you
+about: Tell us how you use nock & support our efforts in maintaining Nock
+
+---
+
+# ❤️ I'm using Nock
+
+If you (or your company) are using Nock - please let us know. We'd love to hear from you!
+
+Nock is a community driven project, which means it's not maintained by a company. If you would like to help Nock - any of the following is greatly appreciated.
+
+- [ ] Give the repository a star ⭐️
+- [ ] Help out with issues
+- [ ] Review pull requests
+- [ ] Blog about Nock
+- [ ] Make tutorials
+- [ ] Give talks
+- [ ] Support us on [https://opencollective.com/nock](https://opencollective.com/nock)
+
+Thank you! 💐

package/.github/lock.yml

@@ -0,0 +1,19 @@
+# Configuration for lock-threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 14
+
+# Issues and pull requests with these labels will not be locked. Set to `[]` to disable
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: >
+  This thread has been automatically locked since there has not been
+  any recent activity after it was closed. Please open a new issue and
+  add a reference to this one if it’s related. Thank you!
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true

package/.github/stale.yml

@@ -0,0 +1,25 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. We try to
+  do our best, but nock is maintained by volunteers and there is only so much
+  we can do at a time. Thank you for your contributions.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30

package/.travis.yml

@@ -23,14 +23,12 @@ jobs:
       env: linting
       script: npm run lint
     - stage: test
-      node_js: 9
+      node_js: 10
       script: npm run unit
     - node_js: 8
       script: npm run unit
     - node_js: 6
       script: npm run unit
-    - node_js: 4
-      script: npm run unit
     - stage: release
       node_js: lts/*
       env: semantic-release
@@ -38,5 +36,5 @@ jobs:
     - node_js: lts/*
       env: coverage
       script:
-        - npm run coverage
-        - npm run coveralls
+        - npm run test
+        - npm run coverage:upload

package/CONTRIBUTING.md

@@ -12,6 +12,8 @@ Please note that this project is released with a [Contributor Code of Conduct](.
 - [Generate README TOC](#generate-readme-toc)
 - [Running tests](#running-tests)
   * [Airplane mode](#airplane-mode)
+- [Release Process](#release-process)
+- [GitHub Apps](#github-apps)
 - [Becoming a maintainer](#becoming-a-maintainer)
 
 <!-- tocstop -->
@@ -60,6 +62,18 @@ $ export AIRPLANE=true
 $ npm test
 ```
 
+## Release Process
+
+All of our releases are automated using [semantic-release](https://github.com/semantic-release/semantic-release). The commit messages pushed to the master branch trigger new releases. Semantic-release requires that commits follow certain conventions, [described above](#commit-message-conventions). semantic-release creates a GitHub release, adds release notes and publishes the new version to npm. This is why we do not store release notes in the [`CHANGELOG`](CHANGELOG.md) file - they're already on GitHub.
+
+We use @nockbot as a separate account for releases, because npm tokens cannot be scoped to a single package. This improves our security model in case of a data breach involving npm tokens. @nockbot's credentials were set up by @gr2m; contact him if for any reason you need to change this in the future.
+
+## GitHub Apps
+
+We use several GitHub apps to help maintain this repository. While we would like to address every issue and while we would like to be on hand to support every person, Nock is pretty much entirely volunteer run, and we simply don't have the time to do everything. Please don't be offended if an automated app posts in your issue! We're doing what we can with with we have.
+
+Currently, we use the [Stale](https://github.com/apps/stale) and [Lock](https://github.com/apps/lock) apps to mark old issues as stale, and to lock issues which have been closed to stop drive-by comments. You can see the configuration files for these in [.github/](.github).
+
 ## Becoming a maintainer
 
 So you want to do more than file a bug or submit a PR? Awesome!
@@ -76,3 +90,22 @@ Here are some things you can do today to actively show the Nock team that you're
 * **Refactor.** This is one of the hardest things to do, but one of the most useful. Go through the code, and find examples where it could be written better - with better variable names, more useful abstractions, and more elegant patterns. Taking away ten lines of code that are unnecessary is more valuable than submitting a hundred new lines, sometimes. Open a PR or a comment and defend your position; ask for feedback.
 
 Once you've been around for a bit, ask a current Maintainer - one of [the team members](https://github.com/orgs/nock/people) - whether you can be elevated to Maintainer status and given permissions to close issues and merge PRs. We're interested in how well you know what Nock is about, and how involved you are in the community - not where you're from, how good your English is, or whether or not you can pass a whiteboard test blindfolded. If you think that you've been helpful, let us know. We're friendly, promise. :)
+
+## Generating the CONTRIBUTORS.md file
+
+We use [`name-your-contributors`](https://github.com/mntnr/name-your-contributors) to generate the CONTRIBUTORS file, which contains the names of everyone who have submitted code to the Nock codebase, or commented on an issue, or opened a pull request, or reviewed anyone else's code. After all, all contributions are welcome, and anyone who works with Nock is part of our community.
+
+To generate this file, download `name-your-contributors` and set up a GitHub authorization token.
+
+```sh
+# Generate a JSON file of the members. This may take a while.
+$ name-your-contributors -r nock -u nock > contributors.json
+```
+
+To parse that file, we suggest using [`jq`](https://stedolan.github.io/jq/), although other options are clearly possible:
+
+```sh
+cat contribs.json | jq '.[][]' | jq '"\(if (.name | length) > 0 then .name else null end) @\(.login) \(.url)"' | jq '. | tostring' | jq -s . | jq unique | jq .[] > CONTRIBUTORS.md
+```
+
+Note: This is a convoluted and time-intensive process, and could be updated in several ways. For one, `name-your-contributors` accepts a date flag, which could be used to only catch recent entries. Another way would be to use a bot to automate this at some regular interval. Any help on this would be appreciated.

package/README.md

@@ -3,6 +3,8 @@
 [![Build Status](https://travis-ci.org/nock/nock.svg?branch=master)](https://travis-ci.org/nock/nock)
 [![Coverage Status](https://coveralls.io/repos/github/nock/nock/badge.svg?branch=master)](https://coveralls.io/github/nock/nock?branch=master)
 [![Greenkeeper](https://badges.greenkeeper.io/nock/nock.svg)](https://greenkeeper.io/)
+[![Backers on Open Collective](https://opencollective.com/nock/backers/badge.svg)](#backers)
+[![Sponsors on Open Collective](https://opencollective.com/nock/sponsors/badge.svg)](#sponsors)
 
 > HTTP server mocking and expectations library for Node.js
 
@@ -47,7 +49,7 @@ For instance, if a module performs HTTP requests to a CouchDB server or makes HT
   * [Request Body filtering](#request-body-filtering)
   * [Request Headers Matching](#request-headers-matching)
   * [Optional Requests](#optional-requests)
-  * [Allow __unmocked__ requests on a mocked hostname](#allow-__unmocked__-requests-on-a-mocked-hostname)
+  * [Allow __unmocked__ requests on a mocked hostname](#allow-unmocked-requests-on-a-mocked-hostname)
 - [Expectations](#expectations)
   * [.isDone()](#isdone)
   * [.cleanAll()](#cleanall)
@@ -59,7 +61,10 @@ For instance, if a module performs HTTP requests to a CouchDB server or makes HT
 - [Restoring](#restoring)
 - [Activating](#activating)
 - [Turning Nock Off (experimental!)](#turning-nock-off-experimental)
-- [Enable/Disable real HTTP request](#enabledisable-real-http-request)
+- [Enable/Disable real HTTP requests](#enabledisable-real-http-requests)
+  * [Disabling requests](#disabling-requests)
+  * [Enabling requests](#enabling-requests)
+  * [Resetting NetConnect](#resetting-netconnect)
 - [Recording](#recording)
   * [`dont_print` option](#dont_print-option)
   * [`output_objects` option](#output_objects-option)
@@ -76,8 +81,9 @@ For instance, if a module performs HTTP requests to a CouchDB server or makes HT
     + [Options](#options-1)
     + [Modes](#modes)
 - [Debugging](#debugging)
-- [PROTIP](#protip)
 - [Contributing](#contributing)
+- [Backers](#backers)
+- [Sponsors](#sponsors)
 - [License](#license)
 
 <!-- tocstop -->
@@ -94,14 +100,19 @@ $ npm install --save nock
 
 ### Node version support
 
+The latest version of nock supports all currently maintained Node versions, see [Node Release Schedule](https://github.com/nodejs/Release#release-schedule)
+
+Here is a list of past nock versions with respective node version support
+
 | node | nock |
 |---|---|
 | 0.10 | up to 8.x |
 | 0.11 | up to 8.x |
 | 0.12 | up to 8.x |
-| 4 | 9.x |
+| 4 | up to 9.x |
 | 5 | up to 8.x |
-| 6 | 9.x |
+| 7 | up to 9.x |
+| 9 | up to 9.x |
 
 ## Usage
 
@@ -221,7 +232,7 @@ nock('http://www.example.com')
 
 ```js
 nock('http://www.example.com')
-  .post('/login', function(body) { 
+  .post('/login', function(body) {
     return body.username && body.password;
   })
   .reply(200, { id: '123ABC' });
@@ -629,7 +640,7 @@ nock('http://my.server.com')
   .reply(200, '<html></html>')
 ```
 
-NOTE: the [`'response'`](http://nodejs.org/api/http.html#http_event_response) event will occur immediately, but the [IncomingMessage](http://nodejs.org/api/http.html#http_http_incomingmessage) will not emit it's `'end'` event until after the delay.
+NOTE: the [`'response'`](http://nodejs.org/api/http.html#http_event_response) event will occur immediately, but the [IncomingMessage](http://nodejs.org/api/http.html#http_http_incomingmessage) will not emit its `'end'` event until after the delay.
 
 ### Delay the response
 
@@ -788,6 +799,17 @@ var scope = nock('http://api.myservice.com')
                 .reply(201, 'OK');
 ```
 
+If you don't want to match the request body you can return a wildcard match:
+
+```js
+var scope = nock('http://api.myservice.com')
+  .filteringRequestBody(function(body) {
+    return '*';
+  })
+  .post('/some_uri', '*')
+  .reply(200, 'OK');
+```
+
 ### Request Headers Matching
 
 If you need to match requests only if certain request headers match, you can.
@@ -1009,7 +1031,7 @@ Only for cases where nock has been deactivated using [nock.restore()](#restoring
 nock.activate();
 ```
 
-**note**: To check if nock HTTP interceptor is active or deactive, use [nock.isActive()](#isactive).
+**note**: To check if nock HTTP interceptor is active or inactive, use [nock.isActive()](#isactive).
 
 ## Turning Nock Off (experimental!)
 
@@ -1021,17 +1043,19 @@ This way you can have your tests hit the real servers just by switching on this
 $ NOCK_OFF=true node my_test.js
 ```
 
-## Enable/Disable real HTTP request
+## Enable/Disable real HTTP requests
 
 By default, any requests made to a host that is not mocked will be executed normally. If you want to block these requests, nock allows you to do so.
 
+### Disabling requests
+
 For disabling real http requests.
 
 ```js
 nock.disableNetConnect();
 ```
 
-So, if you try to request any host not 'nocked', it will thrown an `NetConnectNotAllowedError`.
+So, if you try to request any host not 'nocked', it will throw a `NetConnectNotAllowedError`.
 
 ```js
 nock.disableNetConnect();
@@ -1041,40 +1065,45 @@ req.on('error', function(err){
 });
 // The returned `http.ClientRequest` will emit an error event (or throw if you're not listening for it)
 // This code will log a NetConnectNotAllowedError with message:
-// Nock: Not allow net connect for "google.com:80"
+// Nock: Disallowed net connect for "google.com:80"
 ```
 
-For enabling real HTTP requests (the default behaviour).
+### Enabling requests
+
+For enabling any real HTTP requests (the default behavior):
 
 ```js
 nock.enableNetConnect();
 ```
 
-You could allow real HTTP request for certain host names by providing a string or a regular expression for the hostname:
+You could allow real HTTP requests for certain host names by providing a string or a regular expression for the hostname:
 
 ```js
-// using a string
+// Using a string
 nock.enableNetConnect('amazon.com');
 
-// or a RegExp
-nock.enableNetConnect(/(amazon|github).com/);
+// Or a RegExp
+nock.enableNetConnect(/(amazon|github)\.com/);
 
 http.get('http://www.amazon.com/');
-http.get('http://github.com/'); // only for second example
+http.get('http://github.com/');
 
-// This request will be done!
 http.get('http://google.com/');
-// this will throw NetConnectNotAllowedError with message:
-// Nock: Not allow net connect for "google.com:80"
+// This will throw NetConnectNotAllowedError with message:
+// Nock: Disallowed net connect for "google.com:80"
 ```
 
-A common use case when testing local endpoints would be to disable all but local host, then adding in additional nocks for external requests:
+A common use case when testing local endpoints would be to disable all but localhost, then add in additional nocks for external requests:
 
 ```js
 nock.disableNetConnect();
-nock.enableNetConnect('127.0.0.1'); //Allow localhost connections so we can test local routes and mock servers.
+// Allow localhost connections so we can test local routes and mock servers.
+nock.enableNetConnect('127.0.0.1');
 ```
-Then when you're done with the test, you probably want to set everything back to normal:
+
+### Resetting NetConnect
+
+When you're done with the test, you probably want to set everything back to normal:
 
 ```js
 nock.cleanAll();
@@ -1115,7 +1144,7 @@ var nockCalls = nock.recorder.play();
 
 The `nockCalls` var will contain an array of strings representing the generated code you need.
 
-Copy and paste that code into your tests, customize at will, and you're done! You can call `nock.recorder.reset()` to remove already recorded calls from the array that `nock.recorder.play()` returns.
+Copy and paste that code into your tests, customize at will, and you're done! You can call `nock.recorder.clear()` to remove already recorded calls from the array that `nock.recorder.play()` returns.
 
 (Remember that you should do this one test at a time).
 
@@ -1184,7 +1213,7 @@ var nocks = nock.define(nockDefs);
 
 ### `enable_reqheaders_recording` option
 
-Recording request headers by default is deemed more trouble than its worth as some of them depend on the timestamp or other values that may change after the tests have been recorder thus leading to complex postprocessing of recorded tests. Thus by default the request headers are not recorded.
+Recording request headers by default is deemed more trouble than it's worth as some of them depend on the timestamp or other values that may change after the tests have been recorder thus leading to complex postprocessing of recorded tests. Thus by default the request headers are not recorded.
 
 The genuine use cases for recording request headers (e.g. checking authorization) can be handled manually or by using `enable_reqheaders_recording` in `recorder.rec()` options.
 
@@ -1213,7 +1242,7 @@ nock.recorder.rec({
 
 ### `use_separator` option
 
-By default, nock will wrap it's output with the separator string `<<<<<<-- cut here -->>>>>>` before and after anything it prints, whether to the console or a custom log function given with the `logging` option.
+By default, nock will wrap its output with the separator string `<<<<<<-- cut here -->>>>>>` before and after anything it prints, whether to the console or a custom log function given with the `logging` option.
 
 To disable this, set `use_separator` to false.
 
@@ -1268,11 +1297,11 @@ nock.emitter.on('no match', function(req) {
 
 ## Nock Back
 
-fixture recording support and playback
+Fixture recording support and playback.
 
 ### Setup
 
-**You must specify a fixture directory before using, for example:
+You must specify a fixture directory before using, for example:
 
 In your test helper
 
@@ -1304,24 +1333,6 @@ nockBack.setMode('record');
 
 nockBack.fixtures = __dirname + '/nockFixtures'; //this only needs to be set once in your test helper
 
-var before = function(scope) {
-  scope.filteringRequestBody = function(body, aRecordedBody) {
-    if (typeof(body) !== 'string' || typeof(aRecordedBody) !== 'string') {
-      return body;
-    }
-
-    var recordedBodyResult = /timestamp:([0-9]+)/.exec(aRecordedBody);
-    if (!recordedBodyResult) {
-      return body;
-    }
-
-    var recordedTimestamp = recordedBodyResult[1];
-    return body.replace(/(timestamp):([0-9]+)/g, function(match, key, value) {
-      return key + ':' + recordedTimestamp;
-    });
-  };
-}
-
 // recording of the fixture
 nockBack('zomboFixture.json', function(nockDone) {
   request.get('http://zombo.com', function(err, res, body) {
@@ -1361,10 +1372,38 @@ As an optional second parameter you can pass the following options
 - `afterRecord`: a postprocessing function, gets called after recording. Is passed the array of scopes recorded and should return the array scopes to save to the fixture
 - `recorder`: custom options to pass to the recorder
 
+##### Example
+
+```javascript
+var beforeFunc = function(scope) {
+  scope.filteringRequestBody = function(body, aRecordedBody) {
+    if (typeof(body) !== 'string' || typeof(aRecordedBody) !== 'string') {
+      return body;
+    }
+
+    var recordedBodyResult = /timestamp:([0-9]+)/.exec(aRecordedBody);
+    if (!recordedBodyResult) {
+      return body;
+    }
+
+    var recordedTimestamp = recordedBodyResult[1];
+    return body.replace(/(timestamp):([0-9]+)/g, function(match, key, value) {
+      return key + ':' + recordedTimestamp;
+    });
+  };
+}
+
+nockBack('zomboFixture.json', { before: beforeFunc }, function(nockDone) {
+  request.get('http://zombo.com', function(err, res, body) {
+    // do your tests
+    nockDone();
+  }
+}
+```
 
 #### Modes
 
-to set the mode call `nockBack.setMode(mode)` or run the tests with the `NOCK_BACK_MODE` environment variable set before loading nock. If the mode needs to be changed programatically, the following is valid: `nockBack.setMode(nockBack.currentMode)`
+To set the mode call `nockBack.setMode(mode)` or run the tests with the `NOCK_BACK_MODE` environment variable set before loading nock. If the mode needs to be changed programmatically, the following is valid: `nockBack.setMode(nockBack.currentMode)`
 
 - wild: all requests go out to the internet, don't replay anything, doesn't record anything
 
@@ -1375,32 +1414,41 @@ to set the mode call `nockBack.setMode(mode)` or run the tests with the `NOCK_BA
 - lockdown: use recorded nocks, disables all http calls even when not nocked, doesn't record
 
 ## Debugging
-Nock uses debug, so just run with environmental variable DEBUG set to nock.*
 
-```js
-$ DEBUG=nock.* node my_test.js
-```
-
-## PROTIP
-
-If you don't want to match the request body you can use this trick (by @theycallmeswift):
+Nock uses [`debug`](https://github.com/visionmedia/debug), so just run with environmental variable `DEBUG` set to `nock.*`.
 
 ```js
-var scope = nock('http://api.myservice.com')
-  .filteringRequestBody(function(body) {
-    return '*';
-  })
-  .post('/some_uri', '*')
-  .reply(200, 'OK');
+$ DEBUG=nock.* node my_test.js
 ```
 
 ## Contributing
 
 Thanks for wanting to contribute! Take a look at our [Contributing Guide](CONTRIBUTING.md) for notes on our commit message conventions and how to run tests.
 
-Please note that this project is released with a [Contributor Code of Conduct](./CODE_OF_CONDUCT.md).
+Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md).
 By participating in this project you agree to abide by its terms.
 
+## Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/nock#backer)]
+
+<a href="https://opencollective.com/nock#backers" target="_blank"><img src="https://opencollective.com/nock/backers.svg?width=890"></a>
+
+## Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/nock#sponsor)]
+
+<a href="https://opencollective.com/nock/sponsor/0/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/1/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/2/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/3/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/4/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/5/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/6/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/7/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/8/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/9/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/9/avatar.svg"></a>
+
 ## License
 
 [MIT](LICENSE)

package/lib/common.js

@@ -50,7 +50,7 @@ var isBinaryBuffer = function(buffer) {
 
   //  Test if the buffer can be reconstructed verbatim from its utf8 encoding.
   var utfEncodedBuffer = buffer.toString('utf8');
-  var reconstructedBuffer = new Buffer(utfEncodedBuffer, 'utf8');
+  var reconstructedBuffer = Buffer.from(utfEncodedBuffer, 'utf8');
   var compareBuffers = function(lhs, rhs) {
     if(lhs.length !== rhs.length) {
       return false;
@@ -80,7 +80,7 @@ var isBinaryBuffer = function(buffer) {
 var mergeChunks = function(chunks) {
 
   if(_.isEmpty(chunks)) {
-    return new Buffer(0);
+    return Buffer.alloc(0);
   }
 
   //  We assume that all chunks are Buffer objects if the first is buffer object.

package/lib/intercept.js

@@ -33,7 +33,7 @@ function NetConnectNotAllowedError(host, path) {
 
   this.name    = 'NetConnectNotAllowedError';
   this.code    = 'ENETUNREACH'
-  this.message = 'Nock: Not allow net connect for "' + host + path + '"';
+  this.message = 'Nock: Disallowed net connect for "' + host + path + '"';
 
   Error.captureStackTrace(this, this.constructor);
 }

package/lib/interceptor.js

@@ -405,7 +405,7 @@ Interceptor.prototype.basicAuth = function basicAuth(options) {
     var username = options['user'];
     var password = options['pass'] || '';
     var name = 'authorization';
-    var value = 'Basic ' + new Buffer(username + ':' + password).toString('base64');
+    var value = 'Basic ' + Buffer.from(username + ':' + password).toString('base64');
     this.interceptorMatchHeaders.push({ name: name, value: value });
     return this;
 };

package/lib/match_body.js

@@ -10,12 +10,19 @@ function matchBody(spec, body) {
   if (typeof spec === 'undefined') {
     return true;
   }
+
   var options = this || {};
 
   if (Buffer.isBuffer(body)) {
     body = body.toString();
   }
 
+  if (spec instanceof RegExp) {
+    if (typeof body === "string") {
+      return body.match(spec);
+    }
+  }
+
   if (Buffer.isBuffer(spec)) {
     if (common.isBinaryBuffer(spec)) {
       spec = spec.toString('hex');
@@ -54,14 +61,6 @@ function matchBody(spec, body) {
     body = body.replace(/\r?\n|\r/g, '');
   }
 
-  if (spec instanceof RegExp) {
-    if (typeof body === "string") {
-      return body.match(spec);
-    } else {
-      return qs.stringify(body).match(spec);
-    }
-  }
-
   if (!isMultipart && typeof spec === "string") {
     spec = spec.replace(/\r?\n|\r/g, '');
   }

package/lib/recorder.js

@@ -56,7 +56,7 @@ var getBodyFromChunks = function(chunks, headers) {
       body: _.map(chunks, function(chunk) {
         if(!Buffer.isBuffer(chunk)) {
           if (typeof chunk === 'string') {
-            chunk = new Buffer(chunk);
+            chunk = Buffer.from(chunk);
           } else {
             throw new Error('content-encoded responses must all be binary buffers');
           }
@@ -330,7 +330,7 @@ function record(rec_options) {
       res.push = function(data) {
         if (data) {
           if (encoding) {
-            data = new Buffer(data, encoding);
+            data = Buffer.from(data, encoding);
           }
           dataChunks.push(data);
         }
@@ -358,7 +358,7 @@ function record(rec_options) {
         if (data) {
           debug(thisRecordingId, 'new', proto, 'body chunk');
           if (! Buffer.isBuffer(data)) {
-            data = new Buffer(data, encoding);
+            data = Buffer.from(data, encoding);
           }
           bodyChunks.push(data);
         }
@@ -373,7 +373,7 @@ function record(rec_options) {
         if (data) {
           debug(thisRecordingId, 'new', proto, 'body chunk');
           if (! Buffer.isBuffer(data)) {
-            data = new Buffer(data, encoding);
+            data = Buffer.from(data, encoding);
           }
           bodyChunks.push(data);
         }

package/lib/request_overrider.js

@@ -111,7 +111,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
 
   /// options.auth
   if (options.auth && (! options.headers || ! options.headers.authorization)) {
-    setHeader(req, 'Authorization', 'Basic ' + (new Buffer(options.auth)).toString('base64'));
+    setHeader(req, 'Authorization', 'Basic ' + (Buffer.from(options.auth)).toString('base64'));
   }
 
   if (! req.connection) {
@@ -131,7 +131,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
     if (!req.aborted) {
       if (buffer) {
         if (!Buffer.isBuffer(buffer)) {
-          buffer = new Buffer(buffer, encoding);
+          buffer = Buffer.from(buffer, encoding);
         }
         requestBodyBuffers.push(buffer);
       }
@@ -318,13 +318,13 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
             emitError(new Error('Gzip encoding is currently not supported in this version of Node.'));
             return;
           }
-          requestBody = String(zlib.gunzipSync(new Buffer(requestBody, 'hex')), 'hex')
+          requestBody = String(zlib.gunzipSync(Buffer.from(requestBody, 'hex')), 'hex')
         } else if (requestBody && common.contentEncoding(req.headers, 'deflate')) {
           if (typeof zlib.deflateSync !== 'function') {
             emitError(new Error('Deflate encoding is currently not supported in this version of Node.'));
             return;
           }
-          requestBody = String(zlib.inflateSync(new Buffer(requestBody, 'hex')), 'hex')
+          requestBody = String(zlib.inflateSync(Buffer.from(requestBody, 'hex')), 'hex')
         }
 
         requestBody = JSON.parse(requestBody);
@@ -356,7 +356,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
         }
 
         responseBuffers = _.map(buffers, function(buffer) {
-          return new Buffer(buffer, 'hex');
+          return Buffer.from(buffer, 'hex');
         });
 
       } else {
@@ -368,7 +368,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
         if(isBinaryRequestBodyBuffer && typeof(responseBody) === 'string') {
           //  Try to create the buffer from the interceptor's body response as hex.
           try {
-            responseBody = new Buffer(responseBody, 'hex');
+            responseBody = Buffer.from(responseBody, 'hex');
           } catch(err) {
             debug('exception during Buffer construction from hex data:', responseBody, '-', err);
           }
@@ -376,7 +376,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
           // Creating buffers does not necessarily throw errors, check for difference in size
           if (!responseBody || (interceptor.body.length > 0 && responseBody.length === 0)) {
             //  We fallback on constructing buffer from utf8 representation of the body.
-            responseBody = new Buffer(interceptor.body, 'utf8');
+            responseBody = Buffer.from(interceptor.body, 'utf8');
           }
         }
       }
@@ -402,23 +402,27 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
       if (responseBody) {
         debug('transform the response body');
 
-        if (Array.isArray(responseBody) &&
-            responseBody.length >= 2 &&
-            responseBody.length <= 3 &&
-            typeof responseBody[0] == 'number')
-        {
+        if (Array.isArray(responseBody)) {
           debug('response body is array: %j', responseBody);
-          response.statusCode = Number(responseBody[0]);
-          debug('new headers: %j', responseBody[2]);
-          if (! response.headers) response.headers = {};
-          _.assign(response.headers, responseBody[2] || {});
-          debug('response.headers after: %j', response.headers);
-          responseBody = responseBody[1];
-
-          response.rawHeaders = response.rawHeaders || [];
-          Object.keys(response.headers).forEach(function(key) {
-            response.rawHeaders.push(key, response.headers[key]);
-          });
+
+          if (!isNaN(Number(responseBody[0])))
+          {
+            response.statusCode = Number(responseBody[0]);
+          }
+
+          if (responseBody.length >= 2 && responseBody.length <= 3)
+          {
+            debug('new headers: %j', responseBody[2]);
+            if (!response.headers) response.headers = {};
+            _.assign(response.headers, responseBody[2] || {});
+            debug('response.headers after: %j', response.headers);
+            responseBody = responseBody[1];
+
+            response.rawHeaders = response.rawHeaders || [];
+            Object.keys(response.headers).forEach(function(key) {
+              response.rawHeaders.push(key, response.headers[key]);
+            });
+          }
         }
 
         if (interceptor.delayInMs) {
@@ -442,7 +446,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
           });
         } else if (responseBody && !Buffer.isBuffer(responseBody)) {
           if (typeof responseBody === 'string') {
-            responseBody = new Buffer(responseBody);
+            responseBody = Buffer.from(responseBody);
           } else {
             responseBody = JSON.stringify(responseBody);
             response.headers['content-type'] = 'application/json';

package/lib/scope.js

@@ -332,9 +332,12 @@ function define(nockDefs) {
           nock.matchHeader(k, reqheaders[k]);
         }
       }
-      if (nockDef.filteringRequestBody) {
-        nock.filteringRequestBody(nockDef.filteringRequestBody);
-      }
+      var acceptableFilters = ['filteringRequestBody', 'filteringPath'];
+      acceptableFilters.forEach((filter) => {
+        if (nockDef[filter]) {
+          nock[filter](nockDef[filter]);
+        }
+      });
       nock.intercept(npath, method, body).reply(status, response, rawHeaders);
     }
 

package/lib/socket.js

@@ -58,7 +58,7 @@ Socket.prototype.applyDelay = function applyDelay(delayMs) {
 };
 
 Socket.prototype.getPeerCertificate = function getPeerCertificate() {
-  return new Buffer((Math.random() * 10000 + Date.now()).toString()).toString('base64');
+  return Buffer.from((Math.random() * 10000 + Date.now()).toString()).toString('base64');
 };
 
 Socket.prototype.destroy = function destroy() {

package/package.json

@@ -7,154 +7,8 @@
     "testing",
     "isolation"
   ],
-  "version": "9.6.1",
+  "version": "10.0.3",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
-  "contributors": [
-    {
-      "name": "Bin Chang",
-      "url": "https://github.com/BinChang"
-    },
-    {
-      "name": "Roman Hotsiy",
-      "url": "https://github.com/RomanGotsiy"
-    },
-    {
-      "name": "Jeffrey Jagoda",
-      "url": "https://github.com/jagoda"
-    },
-    {
-      "name": "Hidenari Nozaki",
-      "url": "https://github.com/ghiden"
-    },
-    {
-      "name": "Ken Sheedlo",
-      "url": "https://github.com/ksheedlo"
-    },
-    {
-      "name": "Douglas Eggleton",
-      "url": "https://github.com/douglaseggleton"
-    },
-    {
-      "name": "José F. Romaniello",
-      "url": "https://github.com/jfromaniello"
-    },
-    {
-      "name": "Benjamin Urban",
-      "url": "https://github.com/benurb"
-    },
-    {
-      "name": "Justin",
-      "url": "https://github.com/justincy"
-    },
-    {
-      "name": "Brett Porter"
-    },
-    {
-      "name": "Matt Olson"
-    },
-    {
-      "name": "Rémy HUBSCHER"
-    },
-    {
-      "name": "Roly Fentanes"
-    },
-    {
-      "name": "Alexander Simmerl"
-    },
-    {
-      "name": "Pedro Teixeira"
-    },
-    {
-      "name": "Nuno Job"
-    },
-    {
-      "name": "Ian Young"
-    },
-    {
-      "name": "nilsbunger"
-    },
-    {
-      "name": "bacchusrx",
-      "email": "bacchusrx@eightstar.ca"
-    },
-    {
-      "name": "Fabiano França"
-    },
-    {
-      "name": "Sascha Drews"
-    },
-    {
-      "name": "Mike Swift"
-    },
-    {
-      "name": "James Herdman"
-    },
-    {
-      "name": "David Björklund"
-    },
-    {
-      "name": "Andrew Kramolisch"
-    },
-    {
-      "name": "Balazs Nagy"
-    },
-    {
-      "name": "Brian J Brennan"
-    },
-    {
-      "name": "Attila Incze"
-    },
-    {
-      "name": "Mac Angell"
-    },
-    {
-      "name": "Tom Hosford"
-    },
-    {
-      "name": "Aurélien Thieriot"
-    },
-    {
-      "name": "Alex Zylman"
-    },
-    {
-      "name": "Celestino Gomes",
-      "email": "contact@tinogomes.com"
-    },
-    {
-      "name": "David Rousselie"
-    },
-    {
-      "name": "spenceralger"
-    },
-    {
-      "name": "Ivan Erceg",
-      "url": "https://github.com/ierceg",
-      "email": "ivan@softwaremarbles.com"
-    },
-    {
-      "name": "Keith Laban",
-      "url": "https://github.com/kelaban",
-      "email": "kelaban17@gmail.com"
-    },
-    {
-      "name": "Rui Marinho",
-      "url": "https://github.com/ruimarinho",
-      "email": "ruipmarinho@gmail.com"
-    },
-    {
-      "name": "David Pate",
-      "url": "https://github.com/DavidTPate",
-      "email": "davidtpate@gmail.com"
-    },
-    {
-      "name": "Matt Oakes",
-      "url": "https://github.com/matto1990"
-    },
-    {
-      "name": "Ian Walker-Sperber",
-      "url": "https://github.com/ianwsperber"
-    }
-  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/nock/nock.git"
@@ -168,7 +22,7 @@
   "main": "./index",
   "dependencies": {
     "chai": "^4.1.2",
-    "debug": "^3.1.0",
+    "debug": "^4.1.0",
     "deep-equal": "^1.0.0",
     "json-stringify-safe": "^5.0.1",
     "lodash": "^4.17.5",
@@ -192,16 +46,16 @@
     "restify-clients": "^2.2.0",
     "rimraf": "^2.6.2",
     "semantic-release": "^15.0.0",
-    "superagent": "^3.8.2",
+    "superagent": "^4.0.0",
     "tap": "^12.0.0"
   },
   "scripts": {
-    "unit": "tap --harmony ./tests/test_*.js",
+    "unit": "tap --coverage ./tests/test_*.js",
     "pretest": "npm run -s lint",
     "test": "npm run -s unit",
-    "coverage": "nyc tap --harmony ./tests/test_*.js",
-    "coveralls": "cat ./coverage/lcov.info | coveralls",
-    "lint": "eslint '**/*.js'",
+    "coverage": "tap --coverage-report=html && open coverage/lcov-report/index.html",
+    "coverage:upload": "tap --coverage-report=text-lcov | coveralls",
+    "lint": "eslint \"**/*.js\"",
     "toc": "markdown-toc -i README.md && markdown-toc -i CONTRIBUTING.md ",
     "semantic-release": "semantic-release"
   },