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

Make all async functions be subject to the timeout

Browse Source 
[finishes #60798058]
This commit is contained in:
Sheel Choksi
2013-11-14 23:01:43 -08:00
parent c888b0c1b8
commit 8a6d7828c6
3 changed files with 84 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/Spec.js
View File

@@ -5,9 +5,8 @@ getJasmineRequireObj().Spec = function(j$) {
this.id = attrs.id;
this.description = attrs.description || '';
this.fn = attrs.fn;
this.beforeFns = attrs.beforeFns || function() {};
this.afterFns = attrs.afterFns || function() {};
this.catchingExceptions = attrs.catchingExceptions;
this.beforeFns = attrs.beforeFns || function() { return []; };
this.afterFns = attrs.afterFns || function() { return []; };
this.onStart = attrs.onStart || function() {};
this.exceptionFormatter = attrs.exceptionFormatter || function() {};
this.getSpecName = attrs.getSpecName || function() { return ''; };
@@ -72,13 +71,15 @@ getJasmineRequireObj().Spec = function(j$) {
timeout = void 0;
}
var befores = this.beforeFns() || [],
afters = this.afterFns() || [],
thisOne = (this.fn.length) ? timeoutable(this.fn) : this.fn;
var allFns = befores.concat(thisOne).concat(afters);
var allFns = this.beforeFns().concat(this.fn).concat(this.afterFns()),
allTimeoutableFns = [];
for (var i = 0; i < allFns.length; i++) {
var fn = allFns[i];
allTimeoutableFns.push(fn.length > 0 ? timeoutable(fn) : fn);
}
this.queueRunnerFactory({
fns: allFns,
fns: allTimeoutableFns,
onException: onException,
onComplete: complete
});