Fixes issue where mock clock was being used by QueueRunner

- If the mock clock was installed in a beforeAll, the QueueRunner would use the mock clock for its own clock.  If the mock clock was ticked more than the default timeout, async specs would timeout.

[fixes #783 #792]
This commit is contained in:
Greg Cobb
2015-02-24 21:56:52 -05:00
parent 8c59875afe
commit 10f87b3b90
4 changed files with 38 additions and 8 deletions

View File

@@ -169,7 +169,7 @@ getJasmineRequireObj().Env = function(j$) {
var queueRunnerFactory = function(options) {
options.catchException = catchException;
options.clearStack = options.clearStack || clearStack;
options.timer = {setTimeout: realSetTimeout, clearTimeout: realClearTimeout};
options.timeout = {setTimeout: realSetTimeout, clearTimeout: realClearTimeout};
options.fail = self.fail;
new j$.QueueRunner(options).execute();