nock 9.4.3 → 9.6.1

package/CHANGELOG.md

@@ -0,0 +1,3 @@
+# Changelog
+
+Nock’s changelog can be found directly in the [GitHub release notes](https://github.com/nock/nock/releases). These are automatically created by [semantic-release](https://github.com/semantic-release/semantic-release) based on their [commit message conventions](https://semantic-release.gitbook.io/semantic-release#commit-message-format).

package/CONTRIBUTING.md

@@ -12,10 +12,11 @@ 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)
+- [Becoming a maintainer](#becoming-a-maintainer)
 
 <!-- tocstop -->
 
-### Commit Message conventions
+## Commit Message conventions
 
 `nock` releases are automated using [semantic-release](https://github.com/semantic-release/semantic-release).
 To automatically calculate the correct version number as well as changelogs,
@@ -36,7 +37,7 @@ Other helpful conventions are
 
 The commit message(s) of a pull request can be fixed using the `squash & merge` button.
 
-### Generate README TOC
+## Generate README TOC
 
 Make sure to update the README's table of contents whenever you update the README using the following npm script.
 
@@ -44,17 +45,34 @@ Make sure to update the README's table of contents whenever you update the READM
 $ npm run toc
 ```
 
-### Running tests
+## Running tests
 
 ```
 $ npm test
 ```
 
-#### Airplane mode
+### Airplane mode
 
 Some of the tests depend on online connectivity. To skip them, set the `AIRPLANE` environment variable to some value.
 
 ```
 $ export AIRPLANE=true
 $ npm test
-```
+```
+
+## Becoming a maintainer
+
+So you want to do more than file a bug or submit a PR? Awesome!
+
+Nock is actively interested in having more maintainers. That means that we would love to have you (yes, you) get more involved if you want to! We don't have strict tests that you need to pass to become a maintainer. Instead, all we want is to find people who are frequent contributors, understand what Nock does, and are eager to help make this tool better.
+
+Here are some things you can do today to actively show the Nock team that you're interested in helping out in the long term:
+
+* **Triage issues!** We have more issues than we have bandwidth to deal with. For some of these issues, there are no labels, no comments suggesting how the issue could be resolved, and no follow-up after months or years of silence. It would be great if the issues actively reflected the state of the project. Go through old issues and suggesting labels in comments, ask for more information, and generally help out with the resolution process. This would be a great help!
+* **Review PRs.** We have a lot of open PRs! Some of these are probably ready to merge, and some of them probably need more work. Any extra eyes on PRs are encouraged. Comment on code patterns you think need work, suggest extra tests, and let us know if a PR 'LGTM' ("looks good to me"). The more reviewers we have, the faster we can merge issues, the better this project becomes.
+* **Help out!** If someone files a bug and no one has responded yet, see if you can resolve it! Suggest PRs, or file them yourself. While most contributors are going to only be interested in their own bugs, great maintainers help out with other people's bugs. This is one of the best ways to become an expert at Nock (and Node.js, JavaScript, or pretty much any project) - helping others.
+* **Write docs.** Are our docs missing something important? Are they not clear? Could they be better? Open a PR!
+* **Suggest examples.** Right now, we have a few examples, but we could always have more. Submit small example files and tutorials. At some point, we'll have to work on a better way to display these - for now, it's great to show others how to solve difficult mocking problems easily with Nock.
+* **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. :)

package/README.md

@@ -183,7 +183,7 @@ var scope = nock('http://www.example.com')
 
 ### Specifying request body
 
-You can specify the request body to be matched as the second argument to the `get`, `post`, `put` or `delete` specifications. There are four types of second argument allowed:
+You can specify the request body to be matched as the second argument to the `get`, `post`, `put` or `delete` specifications. There are five types of second argument allowed:
 
 **String**: nock will exact match the stringified request body with the provided string
 
@@ -193,6 +193,14 @@ nock('http://www.example.com')
   .reply(200, { id: '123ABC' });
 ```
 
+**Buffer**: nock will exact match the stringified request body with the provided buffer
+
+```js
+nock('http://www.example.com')
+  .post('/login', Buffer.from([0xff, 0x11]))
+  .reply(200, { id: '123ABC' });
+```
+
 **RegExp**: nock will test the stringified request body against the provided RegExp
 
 ```js
@@ -832,6 +840,19 @@ example.pendingMocks() // []
 
 example.get("/pathB").optionally().reply(200);
 example.pendingMocks() // []
+
+// You can also pass a boolean argument to `optionally()`. This
+// is useful if you want to conditionally make a mocked request
+// optional.
+var getMock = function(optional) {
+  return example.get("/pathC").optionally(optional).reply(200);
+}
+
+getMock(true);
+example.pendingMocks() // []
+getMock(false);
+example.pendingMocks() // ["GET http://example.com:80/pathC"]
+
 ```
 
 ### Allow __unmocked__ requests on a mocked hostname

package/lib/interceptor.js

@@ -43,8 +43,12 @@ function Interceptor(scope, uri, method, requestBody, interceptorOptions) {
     this.optional = false;
 }
 
-Interceptor.prototype.optionally = function optionally() {
-    this.optional = true;
+Interceptor.prototype.optionally = function optionally(value) {
+    // The default behaviour of optionally() with no arguments is to make the mock optional.
+    value = (typeof value === 'undefined') ? true : value;
+
+    this.optional = value;
+
     return this;
 }
 
@@ -336,6 +340,7 @@ Interceptor.prototype.match = function match(options, body, hostNameOnly) {
 
 Interceptor.prototype.matchIndependentOfBody = function matchIndependentOfBody(options) {
     var isRegex = _.isRegExp(this.path);
+    var isRegexBasePath = _.isRegExp(this.scope.basePath);
 
     var method = (options.method || 'GET').toUpperCase()
         , path = options.path
@@ -362,10 +367,14 @@ Interceptor.prototype.matchIndependentOfBody = function matchIndependentOfBody(o
     var comparisonKey = isRegex ? this.__nock_scopeKey : this._key;
     var matchKey = method + ' ' + proto + '://' + options.host + path;
 
-    if (isRegex) {
+    if (isRegex && !isRegexBasePath) {
         return !!matchKey.match(comparisonKey) && !!path.match(this.path);
     }
 
+    if(isRegexBasePath) {
+        return !!matchKey.match(this.scope.basePath) && !!path.match(this.path);
+    }
+
     return comparisonKey === matchKey;
 };
 

package/lib/match_body.js

@@ -3,6 +3,7 @@
 var deepEqual = require('deep-equal');
 var qs = require('qs');
 var _ = require('lodash')
+var common = require('./common');
 
 module.exports =
 function matchBody(spec, body) {
@@ -15,6 +16,14 @@ function matchBody(spec, body) {
     body = body.toString();
   }
 
+  if (Buffer.isBuffer(spec)) {
+    if (common.isBinaryBuffer(spec)) {
+      spec = spec.toString('hex');
+    } else {
+      spec = spec.toString('utf8');
+    }
+  }
+
   var contentType = (
     options.headers &&
     (options.headers['Content-Type'] || options.headers['content-type']) ||

package/lib/request_overrider.js

@@ -125,7 +125,6 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
   };
 
   req.socket = response.socket = Socket({ proto: options.proto });
-  req.socket.connecting = true;
 
   req.write = function(buffer, encoding, callback) {
     debug('write', arguments);

package/lib/socket.js

@@ -22,6 +22,7 @@ function Socket(options) {
   this.writable = true;
   this.readable = true;
   this.destroyed = false;
+  this.connecting = false;
 
   this.setNoDelay = noop;
   this.setKeepAlive = noop;

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "9.4.3",
+  "version": "9.6.1",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "contributors": [
     {
@@ -182,12 +182,10 @@
     "aws-sdk": "^2.202.0",
     "coveralls": "^3.0.0",
     "eslint": "^5.0.0",
-    "glob": "^7.1.1",
     "hyperquest": "^2.1.3",
     "isomorphic-fetch": "^2.2.0",
-    "istanbul": "^0.4.2",
     "markdown-toc": "^1.2.0",
-    "needle": "^2.2.0",
+    "needle": "^2.2.2",
     "nyc": "^12.0.1",
     "request": "^2.83.0",
     "request-promise": "^4.2.2",