diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 65ed7782..b737f831 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -54,7 +54,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) { j$.MockDate = jRequire.MockDate(); j$.getClearStack = jRequire.clearStack(j$); j$.Clock = jRequire.Clock(); - j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(); + j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(j$); j$.Env = jRequire.Env(j$); j$.ExceptionFormatter = jRequire.ExceptionFormatter(); j$.Expectation = jRequire.Expectation(); @@ -2059,7 +2059,7 @@ getJasmineRequireObj().Clock = function() { return Clock; }; -getJasmineRequireObj().DelayedFunctionScheduler = function() { +getJasmineRequireObj().DelayedFunctionScheduler = function(j$) { function DelayedFunctionScheduler() { var self = this; var scheduledLookup = []; @@ -2201,7 +2201,7 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() { }); forEachFunction(funcsToRun, function(funcToRun) { - if (deletedKeys.indexOf(funcToRun.timeoutKey) !== -1) { + if (j$.util.arrayContains(deletedKeys, funcToRun.timeoutKey)) { // skip a timeoutKey deleted whilst we were running return; } diff --git a/src/core/DelayedFunctionScheduler.js b/src/core/DelayedFunctionScheduler.js index 73001cc3..62cf5dc9 100644 --- a/src/core/DelayedFunctionScheduler.js +++ b/src/core/DelayedFunctionScheduler.js @@ -1,4 +1,4 @@ -getJasmineRequireObj().DelayedFunctionScheduler = function() { +getJasmineRequireObj().DelayedFunctionScheduler = function(j$) { function DelayedFunctionScheduler() { var self = this; var scheduledLookup = []; @@ -140,7 +140,7 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() { }); forEachFunction(funcsToRun, function(funcToRun) { - if (deletedKeys.indexOf(funcToRun.timeoutKey) !== -1) { + if (j$.util.arrayContains(deletedKeys, funcToRun.timeoutKey)) { // skip a timeoutKey deleted whilst we were running return; } diff --git a/src/core/requireCore.js b/src/core/requireCore.js index 159e75a8..a40bf768 100644 --- a/src/core/requireCore.js +++ b/src/core/requireCore.js @@ -32,7 +32,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) { j$.MockDate = jRequire.MockDate(); j$.getClearStack = jRequire.clearStack(j$); j$.Clock = jRequire.Clock(); - j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(); + j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(j$); j$.Env = jRequire.Env(j$); j$.ExceptionFormatter = jRequire.ExceptionFormatter(); j$.Expectation = jRequire.Expectation();