fixes for latest tap version

nock · Apr 6, 2016 · 149d7ab · 149d7ab
1 parent 5d8e77d
commit 149d7ab
Show file tree

Hide file tree

Showing 5 changed files with 153 additions and 178 deletions.
diff --git a/package.json b/package.json
@@ -189,7 +189,7 @@
     "restler": "3.2.2",
     "rimraf": "^2.3.2",
     "superagent": "^1.4.0",
-    "tap": "^0.7.1",
+    "tap": "^5.7.0",
     "zombie": "^4.2.1"
   },
   "scripts": {

diff --git a/tests/test_back.js b/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();
 });
diff --git a/tests/test_back_2.js b/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) {

diff --git a/tests/test_events.js b/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();
   });