Fixed duplicate reporting for HTML reporter. Closes #154

mochajs · Dec 18, 2011 · 8ab0d5b · 8ab0d5b
1 parent f50f98a
commit 8ab0d5b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/lib/reporters/html.js b/lib/reporters/html.js
@@ -67,7 +67,7 @@ function HTML(runner) {
   });
 
   runner.on('fail', function(test, err){
-    runner.emit('test end', test);
+    if (err.uncaught) runner.emit('test end', test);
   });
 
   runner.on('test end', function(test){

diff --git a/lib/runner.js b/lib/runner.js
@@ -394,6 +394,7 @@ Runner.prototype.run = function(fn){
     var runnable = self.currentRunnable;
     debug('uncaught exception');
     runnable.clearTimeout();
+    err.uncaught = true;
     self.fail(runnable, err);
 
     // recover from test

diff --git a/mocha.js b/mocha.js
@@ -1141,7 +1141,7 @@ function HTML(runner) {
   });
 
   runner.on('fail', function(test, err){
-    runner.emit('test end', test);
+    if (err.uncaught) runner.emit('test end', test);
   });
 
   runner.on('test end', function(test){
@@ -2383,6 +2383,7 @@ Runner.prototype.run = function(fn){
     var runnable = self.currentRunnable;
     debug('uncaught exception');
     runnable.clearTimeout();
+    err.uncaught = true;
     self.fail(runnable, err);
 
     // recover from test

diff --git a/test/browser/index.html b/test/browser/index.html
@@ -19,9 +19,9 @@
         var runner = mocha.run();
         runner.globals(['foo', 'bar', 'baz']);
 
-        runner.on('test end', function(test){
-          console.log(test.fullTitle());
-        });
+        // runner.on('test end', function(test){
+        //   console.log(test.fullTitle());
+        // });
       };
     </script>
   </head>