Skip to content

armgit / mocha

Public Imported from GitHub
0

☕️ Classic, reliable, trusted test framework for Node.js and the browser

Added quick hook error reporting

Tj Holowaychuk3b4bf098e1de
diff --git a/lib/runner.js b/lib/runner.js
index 2ff0a064..fddccc32 100644
--- a/lib/runner.js
+++ b/lib/runner.js
@@ -3,7 +3,9 @@
* Module dependencies.
*/
-var EventEmitter = require('events').EventEmitter;
+var EventEmitter = require('events').EventEmitter
+ , Test = require('./test')
+ , noop = function(){};
/**
* Expose `Runner`.
@@ -52,6 +54,22 @@ Runner.prototype.fail = function(test, err){
this.emit('fail', test, err);
};
+/**
+ * Fail the given `hook` name.
+ *
+ * @param {String} hook
+ * @param {Error} err
+ * @api private
+ */
+
+Runner.prototype.failHook = function(hook, err){
+ var test = new Test(hook + ' hook', noop);
+ test.parent = this.suite;
+ this.fail(test, err);
+ this.emit('end');
+ process.exit(0);
+};
+
/**
* Run hook `name` callbacks and then invoke `fn(err)`.
*
@@ -134,10 +152,7 @@ Runner.prototype.runTests = function(suite, fn){
function next(err) {
// error handling
- if (err) {
- if (!test) throw err;
- self.fail(test, err);
- }
+ if (err) return self.fail(test, err);
// next test
test = tests.shift();
@@ -148,13 +163,17 @@ Runner.prototype.runTests = function(suite, fn){
// execute test and hook(s)
self.emit('test', self.test = test);
self.hook('beforeEach', function(err){
- if (err) return next(err);
+ if (err) return self.failHook('beforeEach', err);
self.runTest(function(err){
if (err) return next(err);
self.emit('pass', test);
test.passed = true;
self.emit('test end', test);
- self.hook('afterEach', next);
+ if (err) return self.failHook('beforeEach', err);
+ self.hook('afterEach', function(err){
+ if (err) return self.failHook('afterEach', err);
+ next();
+ });
});
});
}
@@ -184,8 +203,13 @@ Runner.prototype.runSuite = function(suite, fn){
}
this.hook('beforeAll', function(err){
+ // TODO: use interface names
+ if (err) return self.failHook('beforeAll', err);
self.runTests(suite, function(err){
- self.hook('afterAll', next);
+ self.hook('afterAll', function(err){
+ if (err) return self.failHook('afterAll', err);
+ next();
+ });
});
});
};
diff --git a/test/unit/uncaught.js b/test/unit/uncaught.js
index 86ef8b7a..e1964da7 100644
--- a/test/unit/uncaught.js
+++ b/test/unit/uncaught.js
@@ -1,9 +1,5 @@
describe('uncaught', function(){
- before(function(){
- throw new Error('test')
- })
-
it('should report properly', function(done){
process.nextTick(function(){
// if you uncomment this :)