Merge branch 'beforeall-in-xdescribe' of https://github.com/voithos/jasmine into voithos-beforeall-in-xdescribe

- Merges #1225 from @voithos
- Fixes #1175
This commit is contained in:
Gregg Van Hove
2016-12-02 09:47:01 -08:00
6 changed files with 30 additions and 41 deletions

View File

@@ -229,7 +229,7 @@ getJasmineRequireObj().Env = function(j$) {
reporter.suiteStarted(suite.result);
},
nodeComplete: function(suite, result) {
if (!suite.disabled) {
if (!suite.markedPending) {
clearResourcesForRunnable(suite.id);
}
currentlyExecutingSuites.pop();