runner.js: this.skip() in beforeEach hooks

mochajs · Feb 19, 2019 · 3fa7fd0 · 3fa7fd0
1 parent 52b5c42
commit 3fa7fd0
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/lib/runner.js b/lib/runner.js
@@ -386,8 +386,14 @@ Runner.prototype.hook = function(name, fn) {
       }
       if (err) {
         if (err instanceof Pending) {
-          if (name === HOOK_TYPE_BEFORE_EACH || name === HOOK_TYPE_AFTER_EACH) {
+          if (name === HOOK_TYPE_AFTER_EACH) {
             self.test.pending = true;
+          } else if (name === HOOK_TYPE_BEFORE_EACH) {
+            self.test.pending = true;
+            if (err.message === 'sync skip') {
+              self.emit(constants.EVENT_HOOK_END, hook);
+              return fn(err);
+            }
           } else {
             suite.tests.forEach(function(test) {
               test.pending = true;
@@ -634,7 +640,12 @@ Runner.prototype.runTests = function(suite, fn) {
           self.emit(constants.EVENT_TEST_PENDING, test);
         }
         self.emit(constants.EVENT_TEST_END, test);
-        return next();
+        if (err instanceof Pending) {
+          self.suite = errSuite;
+          return self.hookUp(HOOK_TYPE_AFTER_EACH, next);
+        } else {
+          return next();
+        }
       }
       if (err) {
         return hookErr(err, errSuite, false);