Merge 46cf90a into 02bdb6b

mochajs · Jul 27, 2020 · 3fd4c9b · 3fd4c9b
2 parents 02bdb6b + 46cf90a
commit 3fd4c9b
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 40 deletions.
diff --git a/lib/runner.js b/lib/runner.js
@@ -419,20 +419,6 @@ Runner.prototype.fail = function(test, err, force) {
  * @param {Error} err
  */
 Runner.prototype.failHook = function(hook, err) {
-  hook.originalTitle = hook.originalTitle || hook.title;
-  if (hook.ctx && hook.ctx.currentTest) {
-    hook.title =
-      hook.originalTitle + ' for ' + dQuote(hook.ctx.currentTest.title);
-  } else {
-    var parentTitle;
-    if (hook.parent.title) {
-      parentTitle = hook.parent.title;
-    } else {
-      parentTitle = hook.parent.root ? '{root}' : '';
-    }
-    hook.title = hook.originalTitle + ' in ' + dQuote(parentTitle);
-  }
-
   this.fail(hook, err);
 };
 
@@ -464,6 +450,8 @@ Runner.prototype.hook = function(name, fn) {
       hook.ctx.currentTest = self.test;
     }
 
+    setHookTitle(hook);
+
     hook.allowUncaught = self.allowUncaught;
 
     self.emit(constants.EVENT_HOOK_BEGIN, hook);
@@ -514,8 +502,25 @@ Runner.prototype.hook = function(name, fn) {
       }
       self.emit(constants.EVENT_HOOK_END, hook);
       delete hook.ctx.currentTest;
+      setHookTitle(hook);
       next(++i);
     });
+
+    function setHookTitle(hook) {
+      hook.originalTitle = hook.originalTitle || hook.title;
+      if (hook.ctx && hook.ctx.currentTest) {
+        hook.title =
+          hook.originalTitle + ' for ' + dQuote(hook.ctx.currentTest.title);
+      } else {
+        var parentTitle;
+        if (hook.parent.title) {
+          parentTitle = hook.parent.title;
+        } else {
+          parentTitle = hook.parent.root ? '{root}' : '';
+        }
+        hook.title = hook.originalTitle + ' in ' + dQuote(parentTitle);
+      }
+    }
   }
 
   Runner.immediately(function() {

diff --git a/test/integration/multiple-done.spec.js b/test/integration/multiple-done.spec.js
@@ -97,7 +97,7 @@ describe('multiple calls to done()', function() {
       expect(res.failures[0], 'to satisfy', {
         fullTitle: 'suite "before all" hook in "suite"',
         err: {
-          message: /done\(\) called multiple times in hook <suite "before all" hook> of file.+multiple-done-before\.fixture\.js/
+          message: /done\(\) called multiple times in hook <suite "before all" hook in "suite"> of file.+multiple-done-before\.fixture\.js/
         }
       });
     });
@@ -119,20 +119,18 @@ describe('multiple calls to done()', function() {
     });
 
     it('correctly attributes the errors', function() {
-      expect(res.failures, 'to satisfy', [
-        {
-          fullTitle: 'suite "before each" hook in "suite"',
-          err: {
-            message: /done\(\) called multiple times in hook <suite "before each" hook> of file.+multiple-done-before-each\.fixture\.js/
-          }
-        },
-        {
-          fullTitle: 'suite "before each" hook in "suite"',
-          err: {
-            message: /done\(\) called multiple times in hook <suite "before each" hook> of file.+multiple-done-before-each\.fixture\.js/
-          }
+      expect(res.failures[0], 'to equal', res.failures[1]);
+      expect(res.failures[0], 'to satisfy', {
+        fullTitle: 'suite "before each" hook in "suite"',
+        err: {
+          message: /done\(\) called multiple times in hook <suite "before each" hook in "suite"> of file.+multiple-done-before-each\.fixture\.js/,
+          multiple: [
+            {
+              code: 'ERR_MOCHA_MULTIPLE_DONE'
+            }
+          ]
         }
-      ]);
+      });
     });
   });
 

diff --git a/test/unit/runner.spec.js b/test/unit/runner.spec.js
@@ -12,7 +12,9 @@ var Hook = Mocha.Hook;
 var noop = Mocha.utils.noop;
 var errors = require('../../lib/errors');
 var EVENT_HOOK_BEGIN = Runner.constants.EVENT_HOOK_BEGIN;
+var EVENT_HOOK_END = Runner.constants.EVENT_HOOK_END;
 var EVENT_TEST_FAIL = Runner.constants.EVENT_TEST_FAIL;
+var EVENT_TEST_PASS = Runner.constants.EVENT_TEST_PASS;
 var EVENT_TEST_RETRY = Runner.constants.EVENT_TEST_RETRY;
 var EVENT_TEST_END = Runner.constants.EVENT_TEST_END;
 var EVENT_RUN_END = Runner.constants.EVENT_RUN_END;
@@ -252,6 +254,44 @@ describe('Runner', function() {
       runner.hook('afterEach', noop);
       runner.hook('afterAll', noop);
     });
+
+    it('should augment hook title with current test title', function(done) {
+      var expectedHookTitle;
+      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);
+      runner.on(EVENT_TEST_FAIL, assertHookTitle);
+      runner.on(EVENT_TEST_PASS, assertHookTitle);
+      var hook = suite._beforeEach[0];
+
+      suite.addTest(new Test('should behave', noop));
+      suite.addTest(new Test('should obey', noop));
+      runner.suite = suite;
+
+      runner.test = suite.tests[0];
+      expectedHookTitle = '"before each" hook for "should behave"';
+      runner.hook('beforeEach', function(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 && err !== hookError) return done(err);
+          return done();
+        });
+      });
+    });
   });
 
   describe('fail()', function() {
@@ -431,18 +471,6 @@ describe('Runner', function() {
       expect(runner.failures, 'to be', 2);
     });
 
-    it('should augment hook title with current test title', function() {
-      var hook = new Hook('"before each" hook');
-      hook.ctx = {currentTest: new Test('should behave', noop)};
-
-      runner.failHook(hook, {});
-      expect(hook.title, 'to be', '"before each" hook for "should behave"');
-
-      hook.ctx.currentTest = new Test('should obey', noop);
-      runner.failHook(hook, {});
-      expect(hook.title, 'to be', '"before each" hook for "should obey"');
-    });
-
     it('should emit "fail"', function(done) {
       var hook = new Hook();
       hook.parent = suite;