Skip to content

Commit

Permalink
Use tape
Browse files Browse the repository at this point in the history
So we can switch to airtap later!
  • Loading branch information
goto-bus-stop committed May 18, 2018
1 parent a795d60 commit e3df7ce
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .zuul.yml
@@ -1,4 +1,4 @@
ui: mocha-qunit
ui: tape
concurrency: 1
browsers:
- name: chrome
Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion tests/common.js
Expand Up @@ -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() {};
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 4 additions & 2 deletions tests/index.js
@@ -1,12 +1,14 @@
var test = require('tape');

require('./legacy-compat');

// we do this to easily wrap each file in a mocha test
// 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();
});
};

Expand Down
29 changes: 10 additions & 19 deletions tests/num-args.js
Expand Up @@ -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 = [];

Expand All @@ -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);
10 changes: 2 additions & 8 deletions tests/remove-all-listeners.js
Expand Up @@ -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);
Expand Down
10 changes: 2 additions & 8 deletions tests/subclass.js
Expand Up @@ -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) {
Expand All @@ -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);
});
Expand Down

0 comments on commit e3df7ce

Please sign in to comment.