deprecate this.skip for after/-Each hooks

mochajs · Feb 11, 2019 · 9d98ff8 · 9d98ff8
1 parent 186ca36
commit 9d98ff8
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/lib/runner.js b/lib/runner.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var EventEmitter = require('events').EventEmitter;
+var format = require('util').format;
 var Pending = require('./pending');
 var utils = require('./utils');
 var inherits = utils.inherits;
@@ -355,9 +356,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;
@@ -378,7 +379,15 @@ 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 || name === HOOK_TYPE_AFTER_ALL) {
+            utils.deprecate(
+              format(
+                "skipping a test within an '%s' hook is DEPRECATED and will be removed from a future version of Mocha. " +
+                  "Use 'return' instead to exit hook abortively.",
+                name
+              )
+            );
+          } else if (name === HOOK_TYPE_BEFORE_EACH) {
             self.test.pending = true;
           } else {
             suite.tests.forEach(function(test) {