[NockBack] Record "unmatched" requests only.

lib/back.js

@@ -163,7 +163,6 @@ var record = {
     recorder.clear();
     nock.cleanAll();
     nock.activate();
-    nock.disableNetConnect();
   },
 
 
@@ -172,15 +171,12 @@ var record = {
       throw new Error('no fs');
     }
     var context = load(fixture, options);
-
-    if( !context.isLoaded ) {
       recorder.record(_.assign({
         dont_print: true,
         output_objects: true
       }, options && options.recorder));
 
       context.isRecording = true;
-    }
 
     return context;
   },
@@ -194,11 +190,14 @@ var record = {
         outputs = options.afterRecord(outputs);
       }
 
-      outputs = JSON.stringify(outputs, null, 4);
       debug('recorder outputs:', outputs);
 
       mkdirp.sync(path.dirname(fixture));
-      fs.writeFileSync(fixture, outputs);
+      var existingOutputs = []
+      if (fs.existsSync(fixture)) {
+        existingOutputs = JSON.parse(fs.readFileSync(fixture))
+      }
+      fs.writeFileSync(fixture, JSON.stringify(existingOutputs.concat(outputs), null, 4));
     }
   }
 

lib/common.js

@@ -110,41 +110,43 @@ var requestOverride = [];
  *   - options - the options of the issued request
  *   - callback - the callback of the issued request
  */
-var overrideRequests = function(newRequest) {
-  debug('overriding requests');
+var secondLayer
 
-  ['http', 'https'].forEach(function(proto) {
+var overrideRequests = function (newRequest) {
+
+  ['http', 'https'].forEach(function (proto) {
     debug('- overriding request for', proto);
 
     var moduleName = proto, // 1 to 1 match of protocol and module is fortunate :)
-        module = {
-          http: require('http'),
-          https: require('https')
-        }[moduleName],
-        overriddenRequest = module.request,
-        overriddenGet = module.get;
-
-    if(requestOverride[moduleName]) {
-      throw new Error('Module\'s request already overridden for ' + moduleName + ' protocol.');
-    }
-
+      module = {
+        http: require('http'),
+        https: require('https')
+      }[moduleName],
+      overriddenRequest = module.request,
+      overriddenGet = module.get;
+
+    if (requestOverride[moduleName]) {
+      debug('set recorder as second layer')
+      secondLayer = newRequest
+    } else {
     //  Store the properties of the overridden request so that it can be restored later on.
-    requestOverride[moduleName] = {
-      module: module,
-      request: overriddenRequest,
-      get: overriddenGet
-    };
-
-    module.request = function(options, callback) {
-      // debug('request options:', options);
-      return newRequest(proto, overriddenRequest.bind(module), options, callback);
-    };
-
-    if (semver.satisfies(process.version, '>=8')) {
-      module.get = function(options, callback) {
-        var req = newRequest(proto, overriddenRequest.bind(module), options, callback);
-        req.end();
-        return req;
+      requestOverride[moduleName] = {
+        module: module,
+        request: overriddenRequest,
+        get: overriddenGet
+      };
+
+      module.request = function (options, callback) {
+        // debug('request options:', options);
+        return newRequest(proto, overriddenRequest.bind(module), options, callback, secondLayer);
+      };
+
+      if (semver.satisfies(process.version, '>=8')) {
+        module.get = function (options, callback) {
+          var req = newRequest(proto, overriddenRequest.bind(module), options, callback, secondLayer);
+          req.end();
+          return req;
+        }
       }
     }
 

lib/intercept.js

@@ -351,7 +351,7 @@ function activate() {
 
   // ----- Overriding http.request and https.request:
 
-  common.overrideRequests(function(proto, overriddenRequest, options, callback) {
+  common.overrideRequests(function(proto, overriddenRequest, options, callback, secondLayer) {
     //  NOTE: overriddenRequest is already bound to its module.
     var req,
         res;
@@ -402,7 +402,11 @@ function activate() {
     } else {
       globalEmitter.emit('no match', options);
       if (isOff() || isEnabledForNetConnect(options)) {
+        if (secondLayer) {
+          return secondLayer(proto, overriddenRequest, options, callback)
+        } else {
         return overriddenRequest(options, callback);
+        }
       } else {
         var error = new NetConnectNotAllowedError(options.host, options.path);
         return new ErroringClientRequest(error);

lib/recorder.js

@@ -230,9 +230,9 @@ function record(rec_options) {
   //  we restore any requests that may have been overridden by other parts of nock (e.g. intercept)
   //  NOTE: This is hacky as hell but it keeps the backward compatibility *and* allows correct
   //    behavior in the face of other modules also overriding ClientRequest.
-  common.restoreOverriddenRequests();
+  // common.restoreOverriddenRequests();
   //  We restore ClientRequest as it messes with recording of modules that also override ClientRequest (e.g. xhr2)
-  intercept.restoreOverriddenClientRequest();
+  // intercept.restoreOverriddenClientRequest();
 
   //  We override the requests so that we can save information on them before executing.
   common.overrideRequests(function(proto, overriddenRequest, options, callback) {