Merge pull request #859 from aearly/bug/bail-hooks

Prevent subsequent hooks from being called if we are `--bail`ing.
mochajs · May 23, 2013 · 7f124a2 · 7f124a2
2 parents cdf1162 + 3f2d701
commit 7f124a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/lib/runner.js b/lib/runner.js
@@ -232,6 +232,7 @@ Runner.prototype.hook = function(name, fn){
   function next(i) {
     var hook = hooks[i];
     if (!hook) return fn();
+    if (self.failures && suite.bail()) return fn();
     self.currentRunnable = hook;
 
     self.emit('hook', hook);

diff --git a/test/acceptance/misc/bail.js b/test/acceptance/misc/bail.js
@@ -10,6 +10,11 @@ describe('bail', function(){
 })
 
 describe('bail-2', function(){
+
+	before(function (done) {
+    throw new Error('this hook should not be displayed');
+	})
+
   it('should not display this error', function(done){
     throw new Error('this should not be displayed');
   })