From e3df7ce55d92299e054a05e6a8cd44ae10aa4af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= <renee@kooi.me>
Date: Sat, 17 Feb 2018 14:49:53 +0100
Subject: [PATCH] Use tape

So we can switch to airtap later!
---
 .zuul.yml                     |  2 +-
 package.json                  |  4 ++--
 tests/common.js               |  3 ++-
 tests/index.js                |  6 ++++--
 tests/num-args.js             | 29 ++++++++++-------------------
 tests/remove-all-listeners.js | 10 ++--------
 tests/subclass.js             | 10 ++--------
 7 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/.zuul.yml b/.zuul.yml
index 46f726e..f8d0b51 100644
--- a/.zuul.yml
+++ b/.zuul.yml
@@ -1,4 +1,4 @@
-ui: mocha-qunit
+ui: tape
 concurrency: 1
 browsers:
     - name: chrome
diff --git a/package.json b/package.json
index fb7d303..626808f 100644
--- a/package.json
+++ b/package.json
@@ -24,11 +24,11 @@
   },
   "devDependencies": {
     "isarray": "^2.0.2",
-    "mocha": "^3.5.3",
+    "tape": "^4.8.0",
     "zuul": "^3.11.1"
   },
   "scripts": {
-    "test": "mocha --ui qunit -- tests/index.js",
+    "test": "node tests/index.js",
     "test:browsers": "zuul -- tests/index.js"
   },
   "license": "MIT"
diff --git a/tests/common.js b/tests/common.js
index cdd5aea..49569b0 100644
--- a/tests/common.js
+++ b/tests/common.js
@@ -19,6 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+var test = require('tape');
 var assert = require('assert');
 
 var noop = function() {};
@@ -77,7 +78,7 @@ function _mustCallInner(fn, criteria, field) {
   context[field] = criteria;
 
   // add the exit listener only once to avoid listener leak warnings
-  if (mustCallChecks.length === 0) after(function() { runCallChecks(0); });
+  if (mustCallChecks.length === 0) test.onFinish(function() { runCallChecks(0); });
 
   mustCallChecks.push(context);
 
diff --git a/tests/index.js b/tests/index.js
index ec6bd2d..29588d2 100644
--- a/tests/index.js
+++ b/tests/index.js
@@ -1,3 +1,4 @@
+var test = require('tape');
 
 require('./legacy-compat');
 
@@ -5,8 +6,9 @@ require('./legacy-compat');
 // and also have browserify be able to statically analyze this file
 var orig_require = require;
 var require = function(file) {
-    test(file, function() {
-        orig_require(file);
+    test(file, function(t) {
+        try { orig_require(file); } catch (err) { t.fail(err); }
+        t.end();
     });
 };
 
diff --git a/tests/num-args.js b/tests/num-args.js
index c5a085b..c9b0deb 100644
--- a/tests/num-args.js
+++ b/tests/num-args.js
@@ -23,13 +23,6 @@ require('./common');
 var assert = require('assert');
 var events = require('../');
 
-var after_checks = [];
-after(function() {
-  for (var i = 0 ; i < after_checks.length ; ++i) {
-    after_checks[i]();
-  }
-});
-
 var e = new events.EventEmitter();
 var num_args_emitted = [];
 
@@ -55,15 +48,13 @@ e.emit('numArgs', null, null, null, null, null);
 
 e.emit('foo', null, null, null, null);
 
-after_checks.push(function() {
-  assert.ok(Array.isArray(num_args_emitted));
-  assert.strictEqual(num_args_emitted.length, 8);
-  assert.strictEqual(num_args_emitted[0], 0);
-  assert.strictEqual(num_args_emitted[1], 1);
-  assert.strictEqual(num_args_emitted[2], 2);
-  assert.strictEqual(num_args_emitted[3], 3);
-  assert.strictEqual(num_args_emitted[4], 4);
-  assert.strictEqual(num_args_emitted[5], 5);
-  assert.strictEqual(num_args_emitted[6], 4);
-  assert.strictEqual(num_args_emitted[6], 4);
-});
+assert.ok(Array.isArray(num_args_emitted));
+assert.strictEqual(num_args_emitted.length, 8);
+assert.strictEqual(num_args_emitted[0], 0);
+assert.strictEqual(num_args_emitted[1], 1);
+assert.strictEqual(num_args_emitted[2], 2);
+assert.strictEqual(num_args_emitted[3], 3);
+assert.strictEqual(num_args_emitted[4], 4);
+assert.strictEqual(num_args_emitted[5], 5);
+assert.strictEqual(num_args_emitted[6], 4);
+assert.strictEqual(num_args_emitted[6], 4);
diff --git a/tests/remove-all-listeners.js b/tests/remove-all-listeners.js
index df29998..622941c 100644
--- a/tests/remove-all-listeners.js
+++ b/tests/remove-all-listeners.js
@@ -22,17 +22,11 @@
 var common = require('./common');
 var assert = require('assert');
 var events = require('../');
-
-var after_checks = [];
-after(function() {
-  for (var i = 0 ; i < after_checks.length ; ++i) {
-    after_checks[i]();
-  }
-});
+var test = require('tape');
 
 function expect(expected) {
   var actual = [];
-  after_checks.push(function() {
+  test.onFinish(function() {
     var sortedActual = actual.sort();
     var sortedExpected = expected.sort();
     assert.strictEqual(sortedActual.length, sortedExpected.length);
diff --git a/tests/subclass.js b/tests/subclass.js
index a727cc8..bd033ff 100644
--- a/tests/subclass.js
+++ b/tests/subclass.js
@@ -20,17 +20,11 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 var common = require('./common');
+var test = require('tape');
 var assert = require('assert');
 var EventEmitter = require('../').EventEmitter;
 var util = require('util');
 
-var after_checks = [];
-after(function() {
-  for (var i = 0 ; i < after_checks.length ; ++i) {
-    after_checks[i]();
-  }
-});
-
 util.inherits(MyEE, EventEmitter);
 
 function MyEE(cb) {
@@ -52,7 +46,7 @@ assert.throws(function() {
   new ErrorEE();
 }, /blerg/);
 
-after_checks.push(function() {
+test.onFinish(function() {
   assert.ok(!(myee._events instanceof Object));
   assert.strictEqual(Object.keys(myee._events).length, 0);
 });