nock 10.0.2 → 10.0.6

package/.travis.yml

@@ -9,12 +9,15 @@ branches:
   only:
     - master
     - /^greenkeeper.*$/
+    - beta # semantic-release preview releases
+    - next # semantic-release @next releases
+    - /^\d+\.x$/ # semantic-release maintenance releases
 
 stages:
   - lint
   - test
   - name: release
-    if: branch = master AND type IN (push)
+    if: branch =~ /^(\d+\.x|master|next|beta)$/ AND type IN (push)
 
 jobs:
   include:

package/CONTRIBUTING.md

@@ -9,12 +9,16 @@ Please note that this project is released with a [Contributor Code of Conduct](.
 <!-- toc -->
 
 - [Commit Message conventions](#commit-message-conventions)
+- [Beta / Next / Maintenance releases](#beta--next--maintenance-releases)
+  * [Backport a fix / feature to a previous version](#backport-a-fix--feature-to-a-previous-version)
+  * [Submit a Beta / Next release](#submit-a-beta--next-release)
 - [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)
+- [Generating the CONTRIBUTORS.md file](#generating-the-contributorsmd-file)
 
 <!-- tocstop -->
 
@@ -39,6 +43,29 @@ Other helpful conventions are
 
 The commit message(s) of a pull request can be fixed using the `squash & merge` button.
 
+## Beta / Next / Maintenance releases
+
+We use [semantic-release](https://github.com/semantic-release/semantic-release) to automate the release of new versions based on semantic commit messages as described above. Depending on the branch that a new pull request is merged into, it is published to different versions using different [npm dist-tags](https://docs.npmjs.com/cli/dist-tag).
+
+- `master`: Publish with `@latest`, or if the commits have been merged into `next` branch before, update the `@latest` dist-tag to point at the new version
+- `next`: Publish with `@next`
+- `beta`: Publish to `X.0.0-beta.Y`, where `X` is the next breaking version and `Y` is number that gets increased with each release.
+- `[Version].x`: For example `10.x`, where `10` is the major release number. No breaking changes are allowed on this branch. Publishes fix/feature versions to `[Version]` using a `@release-@[version].x` release tag
+
+### Backport a fix / feature to a previous version
+
+If you want to **backport a fix** to version 10, and the last version released on version 10 is `10.0.4`, then you have to follow these steps
+
+1. Create the `[Version].x` branch unless it already exists. If you don’t have write access, ask one of the maintainers to do it for you. In this example, then command is `git checkout -b 10.x v10.0.4`.
+2. Push the branch to GitHub: `git push -u origin $(git symbolic-ref --short HEAD)`
+3. Create a new branch based on `10.x`
+4. Make your changes
+5. Submit the pull request against the `10.x` branch
+
+### Submit a Beta / Next release
+
+Create a new branch based off `beta` or `next`, depending on what you want. Make your changes and submit them to the same branches. If either `beta` or `next` is outdated, ask a maintainer to re-create them from `master`
+
 ## Generate README TOC
 
 Make sure to update the README's table of contents whenever you update the README using the following npm script.

package/README.md

@@ -1144,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).
 
@@ -1333,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) {
@@ -1390,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 programmatically, 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
 

package/lib/intercept.js

@@ -13,9 +13,9 @@ var RequestOverrider = require('./request_overrider'),
     URL              = require('url').URL,
     _                = require('lodash'),
     debug            = require('debug')('nock.intercept'),
-    timers           = require('timers'),
     EventEmitter     = require('events').EventEmitter,
-    globalEmitter    = require('./global_emitter');
+    globalEmitter    = require('./global_emitter'),
+    timers           = require('timers');
 
 
 /**

package/lib/interceptor.js

@@ -21,6 +21,10 @@ module.exports = Interceptor;
 function Interceptor(scope, uri, method, requestBody, interceptorOptions) {
     this.scope = scope;
     this.interceptorMatchHeaders = [];
+
+    if (typeof method === 'undefined' || !method) {
+        throw new Error('The "method" parameter is required for an intercept call.');
+    }
     this.method = method.toUpperCase();
     this.uri = uri;
     this._key = this.method + ' ' + scope.basePath + scope.basePathname + (typeof uri === 'string' ? '' : '/') + uri;

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/request_overrider.js

@@ -10,10 +10,10 @@ var EventEmitter     = require('events').EventEmitter,
     Socket           = require('./socket'),
     _                = require('lodash'),
     debug            = require('debug')('nock.request_overrider'),
-    timers           = require('timers'),
     ReadableStream   = require('stream').Readable,
     globalEmitter    = require('./global_emitter'),
-    zlib             = require('zlib');
+    zlib             = require('zlib'),
+    timers           = require('timers');
 
 function getHeader(request, name) {
   if (!request._headers) {

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "10.0.2",
+  "version": "10.0.6",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",
@@ -16,9 +16,9 @@
   "bugs": {
     "url": "http://github.com/nock/nock/issues"
   },
-  "engines": [
-    "node >= 4.0"
-  ],
+  "engines": {
+    "node": ">= 6.0"
+  },
   "main": "./index",
   "dependencies": {
     "chai": "^4.1.2",
@@ -32,12 +32,14 @@
     "semver": "^5.5.0"
   },
   "devDependencies": {
+    "acorn": "^6.0.4",
     "async": "^2.6.0",
     "aws-sdk": "^2.202.0",
     "coveralls": "^3.0.0",
     "eslint": "^5.0.0",
     "hyperquest": "^2.1.3",
     "isomorphic-fetch": "^2.2.0",
+    "lolex": "^3.0.0",
     "markdown-toc": "^1.2.0",
     "needle": "^2.2.2",
     "nyc": "^12.0.1",
@@ -45,8 +47,8 @@
     "request-promise": "^4.2.2",
     "restify-clients": "^2.2.0",
     "rimraf": "^2.6.2",
-    "semantic-release": "^15.0.0",
-    "superagent": "^3.8.2",
+    "semantic-release": "^16.0.0-beta.13",
+    "superagent": "^4.0.0",
     "tap": "^12.0.0"
   },
   "scripts": {
@@ -65,7 +67,7 @@
       "text-summary"
     ],
     "exclude": [
-      "tests/test_*.js"
+      "tests/"
     ]
   },
   "license": "MIT"

package/.coveralls.yml

@@ -1 +0,0 @@
-repo_token: sGdtRYQiEqoTvWMx1nlnyeXJfUHQQyxrw