fix

mochajs · Jul 27, 2020 · 46cf90a · 46cf90a
1 parent c149bdb
commit 46cf90a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/errors.js b/lib/errors.js
@@ -287,7 +287,6 @@ function createMultipleDoneError(runnable, originalErr) {
   if (runnable.file) {
     message += format(' of file %s', runnable.file);
   }
-
   if (originalErr) {
     message += format('; in addition, done() received error: %s', originalErr);
   }

diff --git a/test/unit/runner.spec.js b/test/unit/runner.spec.js
@@ -260,8 +260,13 @@ describe('Runner', function() {
       function assertHookTitle() {
         expect(hook.title, 'to be', expectedHookTitle);
       }
+      var failHook = false;
+      var hookError = new Error('failed hook');
       suite.beforeEach(function() {
         assertHookTitle();
+        if (failHook) {
+          throw hookError;
+        }
       });
       runner.on(EVENT_HOOK_BEGIN, assertHookTitle);
       runner.on(EVENT_HOOK_END, assertHookTitle);
@@ -276,12 +281,13 @@ describe('Runner', function() {
       runner.test = suite.tests[0];
       expectedHookTitle = '"before each" hook for "should behave"';
       runner.hook('beforeEach', function(err) {
-        if (err) return done(err);
+        if (err && err !== hookError) return done(err);
 
         runner.test = suite.tests[1];
+        failHook = true;
         expectedHookTitle = '"before each" hook for "should obey"';
         runner.hook('beforeEach', function(err) {
-          if (err) return done(err);
+          if (err && err !== hookError) return done(err);
           return done();
         });
       });