nock 7.6.0 → 8.0.0

package/lib/common.js

@@ -157,7 +157,7 @@ var restoreOverriddenRequests = function() {
       override.module.request = override.request;
       debug('- restored request for', proto);
     }
-  }).value();
+  });
   requestOverride = [];
 };
 
@@ -244,7 +244,7 @@ var deleteHeadersField = function(headers, fieldNameToDelete) {
       //  We don't stop here but continue in order to remove *all* matching field names
       //  (even though if seen regorously there shouldn't be any)
     }
-  }).value();
+  });
 
 };
 

package/lib/intercept.js

@@ -110,31 +110,16 @@ function add(key, interceptor, scope, scopeOptions, host) {
 }
 
 function remove(interceptor) {
-  if (interceptor.__nock_scope.shouldPersist()) {
+  if (interceptor.__nock_scope.shouldPersist() || --interceptor.counter > 0) {
     return;
   }
 
-  interceptor.counter -= 1;
-  if (interceptor.counter > 0) {
-    return;
-  }
-
-  var key          = interceptor._key.split(' '),
-      u            = url.parse(key[1]),
-      hostKey      = u.protocol + '//' + u.host,
-      interceptors = allInterceptors[hostKey] && allInterceptors[hostKey].scopes,
-      thisInterceptor;
-
-  if (interceptors) {
-    for(var i = 0; i < interceptors.length; i++) {
-      thisInterceptor = interceptors[i];
-      if (thisInterceptor === interceptor) {
-        interceptors.splice(i, 1);
-        break;
-      }
-    }
+  var basePath = interceptor.basePath;
+  var interceptors = allInterceptors[basePath] && allInterceptors[basePath].scopes || [];
 
-  }
+  interceptors.some(function (thisInterceptor, i) {
+    return (thisInterceptor === interceptor) ? interceptors.splice(i, 1) : false;
+  });
 }
 
 function removeAll() {
@@ -246,7 +231,7 @@ function overrideClientRequest() {
     if (http.OutgoingMessage) http.OutgoingMessage.call(this);
 
     //  Filter the interceptors per request options.
-    var interceptors = interceptorsFor(options)
+    var interceptors = interceptorsFor(options);
 
     if (isOn() && interceptors) {
       debug('using', interceptors.length, 'interceptors');
@@ -383,7 +368,7 @@ function activate() {
       }
       return req;
     } else {
-      globalEmitter.emit('no match', req);
+      globalEmitter.emit('no match', options);
       if (isOff() || isEnabledForNetConnect(options)) {
         return overriddenRequest(options, callback);
       } else {

package/lib/request_overrider.js

@@ -235,7 +235,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
       //  For correct matching we need to have correct request headers - if these were specified.
       setRequestHeaders(req, options, interceptor);
     });
-      
+
     interceptor = _.find(interceptors, function(interceptor) {
       return interceptor.match(options, requestBody);
     });

package/lib/socket.js

@@ -21,10 +21,10 @@ function Socket(options) {
 
   this.writable = true;
   this.readable = true;
+  this.destroyed = false;
 
   this.setNoDelay = noop;
   this.setKeepAlive = noop;
-  this.destroy = noop;
   this.resume = noop;
 
   // totalDelay that has already been applied to the current
@@ -60,5 +60,10 @@ Socket.prototype.getPeerCertificate = function getPeerCertificate() {
   return new Buffer((Math.random() * 10000 + Date.now()).toString()).toString('base64');
 };
 
+Socket.prototype.destroy = function destroy() {
+  this.destroyed = true;
+  this.readable = this.writable = false;
+};
+
 function noop() {}
 

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "7.6.0",
+  "version": "8.0.0",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "contributors": [
     {
@@ -167,29 +167,30 @@
     "debug": "^2.2.0",
     "deep-equal": "^1.0.0",
     "json-stringify-safe": "^5.0.1",
-    "lodash": "^3.10.1",
+    "lodash": "^4.8.2",
     "mkdirp": "^0.5.0",
-    "propagate": "0.3.x",
+    "propagate": "0.4.0",
     "qs": "^6.0.2"
   },
   "devDependencies": {
+    "async": "^1.5.2",
     "aws-sdk": "^2.0.15",
-    "browserify": "^12.0.1",
+    "browserify": "^13.0.0",
     "coveralls": "^2.11.2",
-    "hyperquest": "^0.3.0",
+    "hyperquest": "^1.3.0",
     "isomorphic-fetch": "^2.2.0",
-    "istanbul": "^0.3.8",
+    "istanbul": "^0.4.2",
     "jshint": "^2.5.6",
-    "needle": "^0.7.1",
+    "needle": "^1.0.0",
     "node-static": "^0.7.7",
-    "pre-commit": "0.0.9",
-    "request": "2.61.0",
-    "request-promise": "^0.4.3",
-    "restify": "^2.8.1",
-    "restler": "3.2.2",
+    "pre-commit": "1.1.2",
+    "request": "2.70.0",
+    "request-promise": "^2.0.1",
+    "restify": "^4.0.4",
+    "restler": "3.4.0",
     "rimraf": "^2.3.2",
     "superagent": "^1.4.0",
-    "tap": "^0.7.1",
+    "tap": "^5.7.0",
     "zombie": "^4.2.1"
   },
   "scripts": {