nock 10.0.2 → 10.0.3

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/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/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "10.0.2",
+  "version": "10.0.3",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",
@@ -46,7 +46,7 @@
     "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": {