Promisification

index.js

@@ -48,7 +48,10 @@ function stack(results) {
 	});
 }
 
-function exit(stats, results) {
+function exit() {
+	var stats = runner.stats;
+	var results = runner.results;
+
 	if (stats.testCount > 0) {
 		log.write();
 	}
@@ -70,7 +73,7 @@ function exit(stats, results) {
 
 setImmediate(function () {
 	runner.on('test', test);
-	runner.run(exit);
+	runner.run().then(exit);
 });
 
 module.exports = runner.addTest.bind(runner);

lib/runner.js

@@ -1,8 +1,7 @@
 'use strict';
+var Promise = require('bluebird');
 var util = require('util');
 var EventEmitter = require('events').EventEmitter;
-var each = require('each-async');
-var eachSerial = require('async-each-series');
 var Test = require('./test');
 
 function Runner(opts) {
@@ -44,67 +43,73 @@ Runner.prototype.addAfterHook = function (title, cb) {
 	this.tests.after.push(new Test(title, cb));
 };
 
-Runner.prototype.concurrent = function (tests, cb) {
-	each(tests, function (test, i, next) {
-		test.run(function (err, duration) {
-			if (err) {
-				this.stats.failCount++;
-			}
+Runner.prototype.concurrent = function (tests) {
+	// run all tests
+	tests = tests.map(function (test) {
+		// in case of error, don't reject a promise
+		return test.run().catch(function () {
+			return;
+		}).then(function () {
+			this._addTestResult(test);
+		}.bind(this));
+	}, this);
 
-			this.results.push({
-				duration: duration,
-				title: test.title,
-				error: err
-			});
+	return Promise.all(tests);
+};
 
-			this.emit('test', err, test.title, duration);
-			next();
-		}.bind(this));
-	}.bind(this), cb);
+Runner.prototype.serial = function (tests) {
+	return Promise.resolve(tests).each(function (test) {
+		return test.run()
+			.catch(function () {
+				return;
+			})
+			.then(function () {
+				this._addTestResult(test);
+			}.bind(this));
+	}.bind(this));
 };
 
-Runner.prototype.serial = function (tests, cb) {
-	eachSerial(tests, function (test, next) {
-		test.run(function (err, duration) {
-			if (err) {
-				this.stats.failCount++;
-			}
+Runner.prototype._addTestResult = function (test) {
+	if (test.assertError) {
+		this.stats.failCount++;
+	}
 
-			this.results.push({
-				duration: duration,
-				title: test.title,
-				error: err
-			});
+	this.results.push({
+		duration: test.duration,
+		title: test.title,
+		error: test.assertError
+	});
 
-			this.emit('test', err, test.title, duration);
-			next();
-		}.bind(this));
-	}.bind(this), cb);
+	this.emit('test', test.assertError, test.title, test.duration);
 };
 
-Runner.prototype.run = function (cb) {
+Runner.prototype.run = function () {
 	var concurrent = this.tests.concurrent;
 	var serial = this.tests.serial;
 	var before = this.tests.before;
 	var after = this.tests.after;
 
-	// TODO: refactor this bullshit
-	this.serial(before, function () {
-		if (this.stats.failCount > 0) {
-			return this.end(cb);
-		}
-
-		this.serial(serial, function () {
-			this.concurrent(concurrent, function () {
-				this.serial(after, function () {
-					this.end(cb);
-				}.bind(this));
-			}.bind(this));
-		}.bind(this));
-	}.bind(this));
-};
+	var self = this;
 
-Runner.prototype.end = function (cb) {
-	this.stats.passCount = this.stats.testCount - this.stats.failCount;
-	cb(this.stats, this.results);
+	return this.serial(before)
+		.then(function () {
+			if (self.stats.failCount > 0) {
+				return Promise.reject();
+			}
+		})
+		.then(function () {
+			return self.serial(serial);
+		})
+		.then(function () {
+			return self.concurrent(concurrent);
+		})
+		.then(function () {
+			return self.serial(after);
+		})
+		.catch(function () {
+			return;
+		})
+		.then(function () {
+			self.stats.passCount = self.stats.testCount - self.stats.failCount;
+		});
 };

lib/test.js

@@ -1,4 +1,5 @@
 'use strict';
+var Promise = require('bluebird');
 var setImmediate = require('set-immediate-shim');
 var util = require('util');
 var assert = require('assert');
@@ -66,34 +67,40 @@ Test.prototype.skip = function () {
 	this.skipTest = true;
 };
 
-Test.prototype.run = function (cb) {
-	this.cb = cb;
+Test.prototype.run = function () {
+	this.promise = {};
 
-	if (!this.fn || this.skipTest) {
-		this.exit();
-	}
-
-	this._timeStart = Date.now();
+	// TODO: refactor this to avoid storing the promise
+	return new Promise(function (resolve, reject) {
+		this.promise.resolve = resolve;
+		this.promise.reject = reject;
 
-	try {
-		var ret = this.fn(this);
+		if (!this.fn || this.skipTest) {
+			return this.exit();
+		}
 
-		if (ret && typeof ret.then === 'function') {
-			ret.then(this.exit.bind(this)).catch(function (err) {
-				this.assertError = new assert.AssertionError({
-					actual: err,
-					message: 'Promise rejected → ' + err,
-					operator: 'promise',
-					stackStartFunction: this
-				});
+		this._timeStart = Date.now();
 
-				this.exit();
-			}.bind(this));
+		try {
+			var ret = this.fn(this);
+
+			if (ret && typeof ret.then === 'function') {
+				ret.then(this.exit.bind(this)).catch(function (err) {
+					this.assertError = new assert.AssertionError({
+						actual: err,
+						message: 'Promise rejected → ' + err,
+						operator: 'promise',
+						stackStartFunction: this
+					});
+
+					this.exit();
+				}.bind(this));
+			}
+		} catch (err) {
+			this.assertError = err;
+			this.exit();
 		}
-	} catch (err) {
-		this.assertError = err;
-		this.exit();
-	}
+	}.bind(this));
 };
 
 Test.prototype.end = function () {
@@ -124,7 +131,11 @@ Test.prototype.exit = function () {
 		this.ended = true;
 
 		setImmediate(function () {
-			this.cb(this.assertError, this.duration);
+			if (this.assertError) {
+				return this.promise.reject(this.assertError);
+			}
+
+			this.promise.resolve(this);
 		}.bind(this));
 	}
 };

package.json

@@ -45,12 +45,11 @@
     "jasmine"
   ],
   "dependencies": {
-    "async-each-series": "^1.0.0",
     "ava-init": "^0.1.0",
     "babel-core": "^5.8.23",
+    "bluebird": "^2.9.34",
     "chalk": "^1.0.0",
     "claim": "^1.3.0",
-    "each-async": "^1.0.0",
     "figures": "^1.3.5",
     "fn-name": "^2.0.0",
     "globby": "^3.0.1",
@@ -63,7 +62,6 @@
     "update-notifier": "^0.5.0"
   },
   "devDependencies": {
-    "pinkie-promise": "^1.0.0",
     "tap-dot": "^1.0.0",
     "tape": "^4.0.0",
     "xo": "*"

test/es2015.js

@@ -1,12 +1,6 @@
-import test from 'tape';
-import ava from '../lib/test';
+import test from '../';
 
 test('run test', t => {
-	ava('foo', a => {
-		a.true(false);
-		a.end();
-	}).run(err => {
-		t.true(err);
-		t.end();
-	});
+	t.true(false);
+	t.end();
 });