From ae4fbca3e19049cd18d676e865c844fbc890e14c Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Thu, 26 Nov 2015 11:51:04 +0000
Subject: [PATCH] Fix HTML reporting display to show errors if done is called
 multiple times, or if an exception is thrown after done is called.

---
 lib/reporters/html.js         |  5 ++++-
 test/browser/index.html       |  1 +
 test/browser/multiple-done.js | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 test/browser/multiple-done.js

diff --git a/lib/reporters/html.js b/lib/reporters/html.js
index 62643ecb3c..277075985d 100644
--- a/lib/reporters/html.js
+++ b/lib/reporters/html.js
@@ -129,7 +129,10 @@ function HTML(runner) {
   });
 
   runner.on('fail', function(test) {
-    if (test.type === 'hook') {
+    // For type = 'test' its possible that the test failed due to multiple
+    // done() calls. So report the issue here.
+    if (test.type === 'hook'
+      || test.type === 'test') {
       runner.emit('test end', test);
     }
   });
diff --git a/test/browser/index.html b/test/browser/index.html
index f10732dd4e..9200b977e5 100644
--- a/test/browser/index.html
+++ b/test/browser/index.html
@@ -14,6 +14,7 @@
     <script src="array.js"></script>
     <script src="../acceptance/duration.js"></script>
     <script src="../acceptance/timeout.js"></script>
+    <script src="multiple-done.js"></script>
     <script>
       onload = function(){
         mocha.checkLeaks();
diff --git a/test/browser/multiple-done.js b/test/browser/multiple-done.js
new file mode 100644
index 0000000000..d8a9d49ae2
--- /dev/null
+++ b/test/browser/multiple-done.js
@@ -0,0 +1,16 @@
+describe('Multiple Done calls', function(){
+  it('should report an error if done was called more than once', function(done){
+    done();
+    done();
+  })
+
+  it('should report an error if an exception happened async after done was called', function (done) {
+    done();
+    setTimeout(done, 50);
+  })
+
+  it('should report an error if an exception happened after done was called', function(done){
+    done();
+    throw new Error("thrown error");
+  })
+})