report skipped tests upon failing beforeEach

Author: juergba

lib/runner.js

@@ -365,9 +365,8 @@ Runner.prototype.hook = function(name, fn) {
 
   function nextHook(i) {
     var hook = hooks[i];
-    if (!hook) {
-      return fn();
-    }
+    if (!hook) return fn();
+
     self.currentRunnable = hook;
 
     if (name === HOOK_TYPE_BEFORE_ALL) {
@@ -399,13 +398,6 @@ Runner.prototype.hook = function(name, fn) {
           if (self.test) {
             self.test.pending = true;
           }
-        } else if (name === HOOK_TYPE_BEFORE_EACH) {
-          if (self.test) {
-            self.test.pending = true;
-          }
-          self.emit(constants.EVENT_HOOK_END, hook);
-          hook.pending = false; // activates hook for next test
-          return fn(new Error('abort hookDown'));
         } else if (name === HOOK_TYPE_BEFORE_ALL) {
           suite.tests.forEach(function(test) {
             test.pending = true;
@@ -414,6 +406,13 @@ Runner.prototype.hook = function(name, fn) {
             suite.pending = true;
           });
           hooks = [];
+        } else if (name === HOOK_TYPE_BEFORE_EACH) {
+          if (self.test) {
+            self.test.pending = true;
+          }
+          self.emit(constants.EVENT_HOOK_END, hook);
+          hook.pending = false;
+          return fn(new Error('abort hookDown'));
         } else {
           hook.pending = false;
           var errForbid = createUnsupportedError('`this.skip` forbidden');
@@ -431,6 +430,17 @@ Runner.prototype.hook = function(name, fn) {
             suite.skipped = true;
           });
           hooks = [];
+        } else if (name === HOOK_TYPE_BEFORE_EACH) {
+          (function skipTests(sui) {
+            sui.tests.forEach(function(t) {
+              if (!t.state) t.skipped = true;
+            });
+            sui.suites.forEach(function(s) {
+              skipTests(s);
+            });
+          })(suite);
+          self.emit(constants.EVENT_HOOK_END, hook);
+          return fn(err);
         } else {
           // stop executing hooks, notify callee of hook err
           return fn(err);
@@ -571,20 +581,18 @@ Runner.prototype.runTests = function(suite, fn) {
   var tests = suite.tests.slice();
   var test;
 
-  function hookErr(_, errSuite, after) {
-    // before-/afterEach hook for errSuite failed
+  function hookErr(_, errSuite) {
+    // afterEach hook for errSuite failed
     var orig = self.suite;
 
-    // for failed afterEach hook start from errSuite parent,
-    // otherwise start from errSuite itself
-    self.suite = after ? errSuite.parent : errSuite;
+    self.suite = errSuite.parent;
 
     if (self.suite) {
       self.hookUp(HOOK_TYPE_AFTER_EACH, function(err2, errSuite2) {
         self.suite = orig;
         // some hooks may fail even now
         if (err2) {
-          return hookErr(err2, errSuite2, true);
+          return hookErr(err2, errSuite2);
         }
         // report error suite
         fn(errSuite);
@@ -602,12 +610,10 @@ Runner.prototype.runTests = function(suite, fn) {
 
     if (self._abort) return fn();
 
-    if (err) return hookErr(err, errSuite, true);
+    if (err) return hookErr(err, errSuite);
 
     // next test
     test = tests.shift();
-
-    // all done
     if (!test) return fn();
 
     // grep
@@ -632,7 +638,7 @@ Runner.prototype.runTests = function(suite, fn) {
       return;
     }
 
-    // static skip or conditional skip within beforeAll
+    // static skip or conditional skip within hooks
     if (test.isPending()) {
       if (self.forbidPending) {
         self.fail(test, new Error('Pending test forbidden'), true);
@@ -644,7 +650,7 @@ Runner.prototype.runTests = function(suite, fn) {
       return nextTest();
     }
 
-    // skipped by failing beforeAll
+    // skipped by failing hooks
     if (test.isSkipped()) {
       test.state = STATE_SKIPPED;
       self.emit(constants.EVENT_TEST_SKIPPED, test);
@@ -655,13 +661,17 @@ Runner.prototype.runTests = function(suite, fn) {
     // execute test and hook(s)
     self.emit(constants.EVENT_TEST_BEGIN, (self.test = test));
     self.hookDown(HOOK_TYPE_BEFORE_EACH, function(err, errSuite) {
-      // conditional skip within beforeEach
-      if (test.isPending()) {
-        if (self.forbidPending) {
-          self.fail(test, new Error('Pending test forbidden'), true);
+      if (err || test.isPending()) {
+        if (test.isPending()) {
+          if (self.forbidPending) {
+            self.fail(test, new Error('Pending test forbidden'), true);
+          } else {
+            test.state = STATE_PENDING;
+            self.emit(constants.EVENT_TEST_PENDING, test);
+          }
         } else {
-          test.state = STATE_PENDING;
-          self.emit(constants.EVENT_TEST_PENDING, test);
+          test.state = STATE_SKIPPED;
+          self.emit(constants.EVENT_TEST_SKIPPED, test);
         }
         self.emit(constants.EVENT_TEST_END, test);
         // skip inner afterEach hooks below errSuite level
@@ -672,9 +682,7 @@ Runner.prototype.runTests = function(suite, fn) {
           nextTest(e, eSuite);
         });
       }
-      if (err) {
-        return hookErr(err, errSuite, false);
-      }
+
       self.currentRunnable = self.test;
       self.runTest(function(err) {
         test = self.test;