Fixed: recover from uncaught exceptions for tests. Closes #94

mochajs · Dec 15, 2011 · f83c4c7 · f83c4c7
1 parent a14226f
commit f83c4c7
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/lib/runner.js b/lib/runner.js
@@ -313,14 +313,15 @@ Runner.prototype.runTests = function(suite, fn){
           return self.hookUp('afterEach', next);
         }
 
-        self.emit('pass', test);
         test.passed = true;
+        self.emit('pass', test);
         self.emit('test end', test);
         self.hookUp('afterEach', next);
       });
     });
   }
 
+  this.next = next;
   next();
 };
 
@@ -394,8 +395,15 @@ Runner.prototype.run = function(fn){
     debug('uncaught exception');
     runnable.clearTimeout();
     self.fail(runnable, err);
-    if ('test' == runnable.type) self.emit('test end', runnable);
-    self.emit('end');
+
+    // recover from test
+    if ('test' == runnable.type) {
+      self.emit('test end', runnable);
+      self.hookUp('afterEach', self.next);
+    // bail on hooks
+    } else {
+      self.emit('end');
+    }
   }
 
   process.on('uncaughtException', uncaught);