nock 7.7.3 → 8.0.0

package/tests/test_back.js

@@ -25,7 +25,7 @@ function testNock (t) {
     }, function(res) {
 
       t.equal(res.statusCode, 200);
-      res.on('end', function() {
+      res.once('end', function() {
           t.ok(dataCalled);
           scope.done();
           t.end();
@@ -55,6 +55,11 @@ function nockBackWithFixture (t, scopesLoaded) {
   });
 }
 
+function setOriginalModeOnEnd(t, nockBack) {
+  t.once('end', function() {
+    nockBack.setMode(originalMode);
+  });
+}
 
 
 
@@ -87,21 +92,15 @@ tap.test('nockBack wild tests', function (nw) {
     testNock(t);
   });
 
-
   nw.test('nock back doesn\'t do anything', function (t) {
     nockBackWithFixture(t, false);
   });
 
-})
-.on('end', function () {
-
-  nockBack.setMode(originalMode);
+  setOriginalModeOnEnd(nw, nockBack);
 
+  nw.end();
 });
 
-
-
-
 tap.test('nockBack dryrun tests', function (nw) {
 
   //  Manually disable net connectivity to confirm that dryrun enables it.
@@ -179,7 +178,7 @@ tap.test('nockBack dryrun tests', function (nw) {
 
         });
 
-      req.on('error', function(err) {
+      req.once('error', function(err) {
         if (err.code !== 'ECONNREFUSED') {
           throw err;
         }
@@ -189,16 +188,12 @@ tap.test('nockBack dryrun tests', function (nw) {
       req.end();
     });
   });
-})
-.on('end', function () {
 
-  nockBack.setMode(originalMode);
+  setOriginalModeOnEnd(nw, nockBack);
 
+  nw.end();
 });
 
-
-
-
 tap.test('nockBack record tests', function (nw) {
   nockBack.setMode('record');
 
@@ -318,16 +313,10 @@ tap.test('nockBack record tests', function (nw) {
   });
 
   nw.end();
-})
-.on('end', function () {
-
-  nockBack.setMode(originalMode);
 
+  setOriginalModeOnEnd(nw, nockBack);
 });
 
-
-
-
 tap.test('nockBack lockdown tests', function (nw) {
   nockBack.fixtures = __dirname + '/fixtures';
   nockBack.setMode('lockdown');
@@ -358,9 +347,8 @@ tap.test('nockBack lockdown tests', function (nw) {
 
     req.end();
   });
-})
-.on('end', function () {
 
-  nockBack.setMode(originalMode);
+  setOriginalModeOnEnd(nw, nockBack);
 
+  nw.end();
 });

package/tests/test_back_2.js

@@ -10,6 +10,12 @@ var fs = require('fs');
 var originalMode;
 var fixture;
 
+function rimrafOnEnd(t) {
+  t.once('end', function() {
+    rimraf.sync(fixture);
+  });
+}
+
 test('setup', function(t) {
   originalMode = nockBack.currentMode;
 
@@ -41,8 +47,8 @@ test('recording', function(t) {
       res.resume();
     });
   });
-}).once('end', function() {
-  rimraf.sync(fixture);
+
+  rimrafOnEnd(t);
 });
 
 test('passes custom options to recorder', function(t) {
@@ -60,9 +66,8 @@ test('passes custom options to recorder', function(t) {
       // See https://nodejs.org/api/stream.html#stream_class_stream_readable
       res.resume();
     });
-  })
-}).once('end', function() {
-  rimraf.sync(fixture);
+  });
+  rimrafOnEnd(t);
 });
 
 test('teardown', function(t) {

package/tests/test_events.js

@@ -23,7 +23,7 @@ test('emits request and replied events', function(t) {
 });
 
 test('emits no match when no match and no mock', function(t) {
-  nock.emitter.on('no match', function(req) {
+  nock.emitter.once('no match', function(req) {
     t.end();
   });
 

package/tests/test_intercept.js

@@ -15,15 +15,15 @@ var restify = require('restify');
 var domain  = require('domain');
 var hyperquest = require('hyperquest');
 var _ = require('lodash');
+var async = require('async');
 
 var globalCount;
 
 nock.enableNetConnect();
 
-test("setup", function(t) {
-  globalCount = Object.keys(global).length;
-  t.end();
-});
+globalCount = Object.keys(global).length;
+var acceptableLeaks = [
+  '_key', '__core-js_shared__', 'fetch', 'Response', 'Headers', 'Request'];
 
 test("double activation throws exception", function(t) {
   nock.restore();
@@ -288,7 +288,6 @@ test("post", function(t) {
 });
 
 
-
 test("post with empty response body", function(t) {
   var scope = nock('http://www.google.com')
      .post('/form')
@@ -1107,6 +1106,8 @@ test("body data is differentiating", function(t) {
     req.end('def');
   });
 
+  t.end();
+
 });
 
 test("chaining", function(t) {
@@ -1117,41 +1118,30 @@ test("chaining", function(t) {
      .post('/form')
      .reply(201, "OK!");
 
-   function endOne(t) {
-     repliedCount += 1;
-     if (t === 2) {
-       scope.done();
-     }
-     t.end();
-   }
+  t.tearDown(scope.done.bind(scope));
 
-   t.test("post", function(t) {
-     var dataCalled;
-     var req = http.request({
-         host: "www.spiffy.com"
-       , method: 'POST'
-       , path: '/form'
-       , port: 80
-     }, function(res) {
+  t.test("post", function(t) {
+   var req = http.request({
+       host: "www.spiffy.com"
+     , method: 'POST'
+     , path: '/form'
+     , port: 80
+   }, function(res) {
 
-       t.equal(res.statusCode, 201);
-       res.on('end', function() {
-         t.ok(dataCalled);
-         endOne(t);
-       });
-       res.on('data', function(data) {
-         dataCalled = true;
-         t.ok(data instanceof Buffer, "data should be buffer");
-         t.equal(data.toString(), "OK!", "response should match");
-       });
+     t.equal(res.statusCode, 201);
+     res.once('data', function(data) {
+       t.ok(data instanceof Buffer, "data should be buffer");
+       t.equal(data.toString(), "OK!", "response should match");
 
+       res.once('end', t.end.bind(t));
      });
 
-     req.end();
    });
 
+   req.end();
+  });
+
    t.test("get", function(t) {
-     var dataCalled;
      var req = http.request({
          host: "www.spiffy.com"
        , method: 'GET'
@@ -1160,21 +1150,19 @@ test("chaining", function(t) {
      }, function(res) {
 
        t.equal(res.statusCode, 200);
-       res.on('end', function() {
-         t.ok(dataCalled);
-         scope.done();
-         t.end();
-       });
-       res.on('data', function(data) {
-         dataCalled = true;
+       res.once('data', function(data) {
          t.ok(data instanceof Buffer, "data should be buffer");
          t.equal(data.toString(), "Hello World!", "response should match");
+
+         res.once('end', t.end.bind(t));
        });
 
      });
 
      req.end();
    });
+
+   t.end();
 });
 
 test("encoding", function(t) {
@@ -1526,7 +1514,6 @@ test("abort request", function(t) {
     res.on('close', function(err) {
       t.equal(err.code, 'aborted');
       scope.done();
-      t.end();
     });
 
     res.on('end', function() {
@@ -1535,6 +1522,7 @@ test("abort request", function(t) {
 
     req.once('error', function(err) {
       t.equal(err.code, 'ECONNRESET');
+      t.end();
     });
 
     req.abort();
@@ -2457,8 +2445,6 @@ test('persists interceptors', function(t) {
 });
 
 test("persist reply with file", function(t) {
-  var dataCalled = false
-
   var scope = nock('http://www.filereplier.com')
     .persist()
     .get('/')
@@ -2466,7 +2452,8 @@ test("persist reply with file", function(t) {
     .get('/test')
     .reply(200, 'Yay!');
 
-  for (var i=0; i < 2; i++) {
+  async.each([1,2], function(_, cb) {
+    var dataCalled = false;
     var req = http.request({
         host: "www.filereplier.com"
       , path: '/'
@@ -2474,8 +2461,9 @@ test("persist reply with file", function(t) {
     }, function(res) {
 
       t.equal(res.statusCode, 200);
-      res.on('end', function() {
+      res.once('end', function() {
         t.ok(dataCalled);
+        cb();
       });
       res.on('data', function(data) {
         dataCalled = true;
@@ -2484,11 +2472,10 @@ test("persist reply with file", function(t) {
 
     });
     req.end();
-  }
-  t.end();
-
+  }, t.end.bind(t));
 });
 
+
 test('(re-)activate after restore', function(t) {
   var scope = nock('http://google.com')
     .get('/')
@@ -2728,9 +2715,9 @@ test('enable real HTTP request only for google.com, via string', function(t) {
     throw "should not deliver this request"
   }).on('error', function (err) {
     t.equal(err.message, 'Nock: Not allow net connect for "www.amazon.com:80/"');
+    t.end();
   });
 
-  t.end();
   nock.enableNetConnect();
 });
 
@@ -2761,10 +2748,10 @@ test('repeating once', function(t) {
 
   http.get('http://zombo.com', function(res) {
     t.equal(200, res.statusCode, 'first request');
+    t.end();
   });
 
   nock.cleanAll()
-  t.end();
 
   nock.enableNetConnect();
 });
@@ -2777,16 +2764,12 @@ test('repeating twice', function(t) {
     .twice()
     .reply(200, "Hello World!");
 
-  for (var i=0; i < 2; i++) {
+  async.each([1,2], function(_, cb) {
     http.get('http://zombo.com', function(res) {
-      t.equal(200, res.statusCode, 'first request');
+      t.equal(200, res.statusCode);
+      cb();
     });
-  };
-
-  nock.cleanAll()
-  t.end();
-
-  nock.enableNetConnect();
+  }, t.end.bind(t));
 });
 
 test('repeating thrice', function(t) {
@@ -2797,16 +2780,12 @@ test('repeating thrice', function(t) {
     .thrice()
     .reply(200, "Hello World!");
 
-  for (var i=0; i < 3; i++) {
+  async.each([1,2,3], function(_, cb) {
     http.get('http://zombo.com', function(res) {
-      t.equal(200, res.statusCode, 'first request');
+      t.equal(200, res.statusCode);
+      cb();
     });
-  };
-
-  nock.cleanAll()
-  t.end();
-
-  nock.enableNetConnect();
+  }, t.end.bind(t));
 });
 
 test('repeating response 4 times', function(t) {
@@ -2817,19 +2796,14 @@ test('repeating response 4 times', function(t) {
     .times(4)
     .reply(200, "Hello World!");
 
-  for (var i=0; i < 4; i++) {
+  async.each([1,2,3,4], function(_, cb) {
     http.get('http://zombo.com', function(res) {
       t.equal(200, res.statusCode, 'first request');
+      cb();
     });
-  };
-
-  nock.cleanAll()
-  t.end();
-
-  nock.enableNetConnect();
+  }, t.end.bind(t));
 });
 
-
 test('superagent works', function(t) {
   var responseText = 'Yay superagent!';
   var headers = { 'Content-Type': 'text/plain'};
@@ -2927,7 +2901,10 @@ test('response is an http.IncomingMessage instance', function(t) {
 function checkDuration(t, ms) {
   var _end = t.end;
   var start = process.hrtime();
+  var ended = false;
   t.end = function () {
+    if (ended) return;
+    ended = true;
     var fin = process.hrtime(start);
     var finMs =
       (fin[0] * 1e+9) +  // seconds -> ms
@@ -2942,72 +2919,65 @@ function checkDuration(t, ms) {
 }
 
 test('calling delay could cause mikealRequest timeout error', function(t) {
-    var scope = nock('http://funk')
-        .get('/')
-        .delay({
-            head: 300
-        })
-        .reply(200, 'OK');
+  var scope = nock('http://funk')
+    .get('/')
+    .delay({
+        head: 300
+    })
+    .reply(200, 'OK');
 
-    mikealRequest({
-        uri: 'http://funk',
-        method: 'GET',
-        timeout: 100
-    }, function (err) {
-        scope.done();
-        t.equal(err && err.code, "ETIMEDOUT");
-        t.end();
-    });
+  mikealRequest({
+    uri: 'http://funk',
+    method: 'GET',
+    timeout: 100
+  }, function (err) {
+    scope.done();
+    t.equal(err && err.code, "ETIMEDOUT");
+    t.end();
+  });
 });
 
-test('Body delay does not have impact on timeoput', function(t) {
-    var scope = nock('http://funk')
-        .get('/')
-        .delay({
-            head: 300,
-            body: 300
-        })
-        .reply(200, 'OK');
+test('Body delay does not have impact on timeout', function(t) {
+  var scope = nock('http://funk')
+    .get('/')
+    .delay({
+        head: 300,
+        body: 300
+    })
+    .reply(200, 'OK');
 
-    mikealRequest({
-        uri: 'http://funk',
-        method: 'GET',
-        timeout: 500
-    }, function (err, r, body) {
-        t.equal(err, null);
-        t.equal(body, 'OK');
-        t.equal(r.statusCode, 200);
-        scope.done();
-        t.end();
-    });
+  mikealRequest({
+    uri: 'http://funk',
+    method: 'GET',
+    timeout: 500
+  }, function (err, r, body) {
+    t.equal(err, null);
+    t.equal(body, 'OK');
+    t.equal(r.statusCode, 200);
+    scope.done();
+    t.end();
+  });
 });
 
 test('calling delay with "body" and "head" delays the response', function (t) {
-    checkDuration(t, 600);
-
-    nock('http://funk')
-        .get('/')
-        .delay({
-            head: 300,
-            body: 300
-        })
-        .reply(200, 'OK');
-
-    http.get('http://funk/', function (res) {
-        res.setEncoding('utf8');
-
-        var body = '';
+  checkDuration(t, 600);
 
-        res.on('data', function(chunk) {
-            body += chunk;
-        });
+  nock('http://funk')
+    .get('/')
+    .delay({
+        head: 300,
+        body: 300
+    })
+    .reply(200, 'OK');
 
-        res.once('end', function() {
-            t.equal(body, 'OK');
-            t.end();
-        });
+  http.get('http://funk/', function (res) {
+    res.once('data', function(data) {
+      t.equal(data.toString(), 'OK');
+      res.once('end', t.end.bind(t));
     });
+  });
 });
+
 test('calling delay with "body" delays the response body', function (t) {
     checkDuration(t, 100);
 
@@ -3469,6 +3439,7 @@ test('define() works with binary buffers', function(t) {
 });
 
 test('issue #163 - Authorization header isn\'t mocked', function(t) {
+  nock.enableNetConnect();
   function makeRequest(cb) {
     var r = http.request(
       {
@@ -4038,6 +4009,7 @@ test('response readable pull stream works as expected', function(t) {
       , port: 80
     }, function(res) {
 
+      var ended = false;
       var responseBody = '';
       t.equal(res.statusCode, 200);
       res.on('readable', function() {
@@ -4045,7 +4017,8 @@ test('response readable pull stream works as expected', function(t) {
         while (null !== (chunk = res.read())) {
           responseBody += chunk.toString();
         }
-        if (chunk === null) {
+        if (chunk === null && ! ended) {
+          ended = true;
           t.equal(responseBody, "this is the response body yeah");
           t.end();
         }
@@ -4408,7 +4381,7 @@ test('remove interceptor removes given interceptor for regex path', function(t)
     res.setEncoding('utf8');
     t.equal(res.statusCode, 202);
 
-    res.on('data', function(data) {
+    res.once('data', function(data) {
       t.equal(data, 'other-content');
     });
 
@@ -4480,28 +4453,37 @@ test('you must setup an interceptor for each request', function(t) {
 
 test('calling socketDelay will emit a timeout', function (t) {
     nock('http://www.example.com')
-        .get('/')
-        .socketDelay(10000)
-        .reply(200, 'OK');
+      .get('/')
+      .socketDelay(10000)
+      .reply(200, 'OK');
+
+    var timedout = false;
+    var ended = false;
 
     var req = http.request('http://www.example.com', function (res) {
-        res.setEncoding('utf8');
+      res.setEncoding('utf8');
 
-        var body = '';
+      var body = '';
 
-        res.on('data', function(chunk) {
-            body += chunk;
-        });
+      res.on('data', function(chunk) {
+        body += chunk;
+      });
 
-        res.once('end', function() {
-            t.fail('socket did not timeout when idle');
-            t.end();
-        });
+      res.once('end', function() {
+        ended = true;
+        if (! timedout) {
+          t.fail('socket did not timeout when idle');
+          t.end();
+        }
+      });
     });
 
     req.setTimeout(5000, function () {
+      timedout = true;
+      if (! ended) {
         t.ok(true);
         t.end();
+      }
     });
 
     req.end();
@@ -4871,9 +4853,10 @@ test("teardown", function(t) {
   var leaks = Object.keys(global)
     .splice(globalCount, Number.MAX_VALUE);
 
-  if (leaks.length == 1 && leaks[0] == '_key') {
-    leaks = [];
-  }
+  leaks = leaks.filter(function(key) {
+    return acceptableLeaks.indexOf(key) == -1;
+  });
+
   t.deepEqual(leaks, [], 'No leaks');
   t.end();
 });