deprecate this.skip for after/-Each hooks

mochajs · Mar 5, 2019 · 75a5651 · 75a5651
1 parent 02ca696
commit 75a5651
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/lib/runner.js b/lib/runner.js
@@ -363,9 +363,9 @@ Runner.prototype.hook = function(name, fn) {
     }
     self.currentRunnable = hook;
 
-    if (name === 'beforeAll') {
+    if (name === HOOK_TYPE_BEFORE_ALL) {
       hook.ctx.currentTest = hook.parent.tests[0];
-    } else if (name === 'afterAll') {
+    } else if (name === HOOK_TYPE_AFTER_ALL) {
       hook.ctx.currentTest = hook.parent.tests[hook.parent.tests.length - 1];
     } else {
       hook.ctx.currentTest = self.test;
@@ -386,6 +386,15 @@ Runner.prototype.hook = function(name, fn) {
       }
       if (err) {
         if (err instanceof Pending) {
+          if (name === HOOK_TYPE_AFTER_EACH || name === HOOK_TYPE_AFTER_ALL) {
+            utils.deprecate(
+              util.format(
+                'skipping a test within an "%s" hook is DEPRECATED and will throw an exception in a future version of Mocha. ' +
+                  'Use a return statement or other means to abort hook execution.',
+                name === HOOK_TYPE_AFTER_EACH ? 'after each' : 'after all'
+              )
+            );
+          }
           if (name === HOOK_TYPE_BEFORE_EACH || name === HOOK_TYPE_AFTER_EACH) {
             self.test.pending = true;
           } else {