Merge branch 'master' of git@github.com:pivotal/jasmine
This commit is contained in:
commit
11292ff83c
|
@ -2139,7 +2139,7 @@ jasmine.WaitsForBlock.prototype.execute = function (onComplete) {
|
||||||
name: 'timeout',
|
name: 'timeout',
|
||||||
message: message
|
message: message
|
||||||
});
|
});
|
||||||
self.spec._next();
|
onComplete();
|
||||||
} else {
|
} else {
|
||||||
self.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT;
|
self.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT;
|
||||||
self.env.setTimeout(function () { self.execute(onComplete); }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
|
self.env.setTimeout(function () { self.execute(onComplete); }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
|
||||||
|
|
Loading…
Reference in New Issue