admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve relative order of "alls" w.r.t. "eachs"

Browse Source 
[Finishes #73742528]
This commit is contained in:
Greg Cobb and Tim Jarratt
2014-08-28 11:52:34 -07:00
committed by Greg Cobb and Tim Jarratt
parent b984ff2fa6
commit 980509cd7b
2 changed files with 151 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/Env.js
View File

@@ -103,20 +103,25 @@ getJasmineRequireObj().Env = function(j$) {
var beforeAndAfterFns = function(suite, runnablesExplictlySet) {
return function() {
var befores = [];
var afters = [];
var befores = [],
afters = [],
beforeAlls = [],
afterAlls = [];
while(suite) {
if (runnablesExplictlySet()) {
befores = befores.concat(suite.beforeAllFns);
afters = afters.concat(suite.afterAllFns);
}
befores = befores.concat(suite.beforeFns);
afters = afters.concat(suite.afterFns);
if (runnablesExplictlySet()) {
beforeAlls = beforeAlls.concat(suite.beforeAllFns);
afterAlls = afterAlls.concat(suite.afterAllFns);
}
suite = suite.parentSuite;
}
return {
befores: befores.reverse(),
afters: afters
befores: beforeAlls.reverse().concat(befores.reverse()),
afters: afters.concat(afterAlls)
};
};
};