Merge pull request #1945 from ryanshawty/master

Correctly skip tests when skipping in a suites before()
mochajs · Jan 26, 2016 · 8522755 · 8522755
2 parents b64d76c + c97d03a
commit 8522755
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/runner.js b/lib/runner.js
@@ -507,8 +507,12 @@ Runner.prototype.runTests = function(suite, fn) {
       return;
     }
 
+    function parentPending(suite) {
+      return suite.pending || (suite.parent && parentPending(suite.parent));
+    }
+
     // pending
-    if (test.pending) {
+    if (test.pending || parentPending(test.parent)) {
       self.emit('pending', test);
       self.emit('test end', test);
       return next();