Rebuild to fix line endings.
This commit is contained in:
parent
841e93fc09
commit
7d5ff6985f
@ -2145,183 +2145,183 @@ jasmine.WaitsForBlock.prototype.execute = function (onComplete) {
|
|||||||
self.env.setTimeout(function () { self.execute(onComplete); }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
|
self.env.setTimeout(function () { self.execute(onComplete); }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
// Mock setTimeout, clearTimeout
|
// Mock setTimeout, clearTimeout
|
||||||
// Contributed by Pivotal Computer Systems, www.pivotalsf.com
|
// Contributed by Pivotal Computer Systems, www.pivotalsf.com
|
||||||
|
|
||||||
jasmine.FakeTimer = function() {
|
jasmine.FakeTimer = function() {
|
||||||
this.reset();
|
this.reset();
|
||||||
|
|
||||||
var self = this;
|
var self = this;
|
||||||
self.setTimeout = function(funcToCall, millis) {
|
self.setTimeout = function(funcToCall, millis) {
|
||||||
self.timeoutsMade++;
|
self.timeoutsMade++;
|
||||||
self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false);
|
self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false);
|
||||||
return self.timeoutsMade;
|
return self.timeoutsMade;
|
||||||
};
|
};
|
||||||
|
|
||||||
self.setInterval = function(funcToCall, millis) {
|
self.setInterval = function(funcToCall, millis) {
|
||||||
self.timeoutsMade++;
|
self.timeoutsMade++;
|
||||||
self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true);
|
self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true);
|
||||||
return self.timeoutsMade;
|
return self.timeoutsMade;
|
||||||
};
|
};
|
||||||
|
|
||||||
self.clearTimeout = function(timeoutKey) {
|
self.clearTimeout = function(timeoutKey) {
|
||||||
self.scheduledFunctions[timeoutKey] = jasmine.undefined;
|
self.scheduledFunctions[timeoutKey] = jasmine.undefined;
|
||||||
};
|
};
|
||||||
|
|
||||||
self.clearInterval = function(timeoutKey) {
|
self.clearInterval = function(timeoutKey) {
|
||||||
self.scheduledFunctions[timeoutKey] = jasmine.undefined;
|
self.scheduledFunctions[timeoutKey] = jasmine.undefined;
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
jasmine.FakeTimer.prototype.reset = function() {
|
jasmine.FakeTimer.prototype.reset = function() {
|
||||||
this.timeoutsMade = 0;
|
this.timeoutsMade = 0;
|
||||||
this.scheduledFunctions = {};
|
this.scheduledFunctions = {};
|
||||||
this.nowMillis = 0;
|
this.nowMillis = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
jasmine.FakeTimer.prototype.tick = function(millis) {
|
jasmine.FakeTimer.prototype.tick = function(millis) {
|
||||||
var oldMillis = this.nowMillis;
|
var oldMillis = this.nowMillis;
|
||||||
var newMillis = oldMillis + millis;
|
var newMillis = oldMillis + millis;
|
||||||
this.runFunctionsWithinRange(oldMillis, newMillis);
|
this.runFunctionsWithinRange(oldMillis, newMillis);
|
||||||
this.nowMillis = newMillis;
|
this.nowMillis = newMillis;
|
||||||
};
|
};
|
||||||
|
|
||||||
jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) {
|
jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) {
|
||||||
var scheduledFunc;
|
var scheduledFunc;
|
||||||
var funcsToRun = [];
|
var funcsToRun = [];
|
||||||
for (var timeoutKey in this.scheduledFunctions) {
|
for (var timeoutKey in this.scheduledFunctions) {
|
||||||
scheduledFunc = this.scheduledFunctions[timeoutKey];
|
scheduledFunc = this.scheduledFunctions[timeoutKey];
|
||||||
if (scheduledFunc != jasmine.undefined &&
|
if (scheduledFunc != jasmine.undefined &&
|
||||||
scheduledFunc.runAtMillis >= oldMillis &&
|
scheduledFunc.runAtMillis >= oldMillis &&
|
||||||
scheduledFunc.runAtMillis <= nowMillis) {
|
scheduledFunc.runAtMillis <= nowMillis) {
|
||||||
funcsToRun.push(scheduledFunc);
|
funcsToRun.push(scheduledFunc);
|
||||||
this.scheduledFunctions[timeoutKey] = jasmine.undefined;
|
this.scheduledFunctions[timeoutKey] = jasmine.undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (funcsToRun.length > 0) {
|
if (funcsToRun.length > 0) {
|
||||||
funcsToRun.sort(function(a, b) {
|
funcsToRun.sort(function(a, b) {
|
||||||
return a.runAtMillis - b.runAtMillis;
|
return a.runAtMillis - b.runAtMillis;
|
||||||
});
|
});
|
||||||
for (var i = 0; i < funcsToRun.length; ++i) {
|
for (var i = 0; i < funcsToRun.length; ++i) {
|
||||||
try {
|
try {
|
||||||
var funcToRun = funcsToRun[i];
|
var funcToRun = funcsToRun[i];
|
||||||
this.nowMillis = funcToRun.runAtMillis;
|
this.nowMillis = funcToRun.runAtMillis;
|
||||||
funcToRun.funcToCall();
|
funcToRun.funcToCall();
|
||||||
if (funcToRun.recurring) {
|
if (funcToRun.recurring) {
|
||||||
this.scheduleFunction(funcToRun.timeoutKey,
|
this.scheduleFunction(funcToRun.timeoutKey,
|
||||||
funcToRun.funcToCall,
|
funcToRun.funcToCall,
|
||||||
funcToRun.millis,
|
funcToRun.millis,
|
||||||
true);
|
true);
|
||||||
}
|
}
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.runFunctionsWithinRange(oldMillis, nowMillis);
|
this.runFunctionsWithinRange(oldMillis, nowMillis);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) {
|
jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) {
|
||||||
this.scheduledFunctions[timeoutKey] = {
|
this.scheduledFunctions[timeoutKey] = {
|
||||||
runAtMillis: this.nowMillis + millis,
|
runAtMillis: this.nowMillis + millis,
|
||||||
funcToCall: funcToCall,
|
funcToCall: funcToCall,
|
||||||
recurring: recurring,
|
recurring: recurring,
|
||||||
timeoutKey: timeoutKey,
|
timeoutKey: timeoutKey,
|
||||||
millis: millis
|
millis: millis
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @namespace
|
* @namespace
|
||||||
*/
|
*/
|
||||||
jasmine.Clock = {
|
jasmine.Clock = {
|
||||||
defaultFakeTimer: new jasmine.FakeTimer(),
|
defaultFakeTimer: new jasmine.FakeTimer(),
|
||||||
|
|
||||||
reset: function() {
|
reset: function() {
|
||||||
jasmine.Clock.assertInstalled();
|
jasmine.Clock.assertInstalled();
|
||||||
jasmine.Clock.defaultFakeTimer.reset();
|
jasmine.Clock.defaultFakeTimer.reset();
|
||||||
},
|
},
|
||||||
|
|
||||||
tick: function(millis) {
|
tick: function(millis) {
|
||||||
jasmine.Clock.assertInstalled();
|
jasmine.Clock.assertInstalled();
|
||||||
jasmine.Clock.defaultFakeTimer.tick(millis);
|
jasmine.Clock.defaultFakeTimer.tick(millis);
|
||||||
},
|
},
|
||||||
|
|
||||||
runFunctionsWithinRange: function(oldMillis, nowMillis) {
|
runFunctionsWithinRange: function(oldMillis, nowMillis) {
|
||||||
jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis);
|
jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis);
|
||||||
},
|
},
|
||||||
|
|
||||||
scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) {
|
scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) {
|
||||||
jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring);
|
jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring);
|
||||||
},
|
},
|
||||||
|
|
||||||
useMock: function() {
|
useMock: function() {
|
||||||
var spec = jasmine.getEnv().currentSpec;
|
var spec = jasmine.getEnv().currentSpec;
|
||||||
spec.after(jasmine.Clock.uninstallMock);
|
spec.after(jasmine.Clock.uninstallMock);
|
||||||
|
|
||||||
jasmine.Clock.installMock();
|
jasmine.Clock.installMock();
|
||||||
},
|
},
|
||||||
|
|
||||||
installMock: function() {
|
installMock: function() {
|
||||||
jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer;
|
jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer;
|
||||||
},
|
},
|
||||||
|
|
||||||
uninstallMock: function() {
|
uninstallMock: function() {
|
||||||
jasmine.Clock.assertInstalled();
|
jasmine.Clock.assertInstalled();
|
||||||
jasmine.Clock.installed = jasmine.Clock.real;
|
jasmine.Clock.installed = jasmine.Clock.real;
|
||||||
},
|
},
|
||||||
|
|
||||||
real: {
|
real: {
|
||||||
setTimeout: window.setTimeout,
|
setTimeout: window.setTimeout,
|
||||||
clearTimeout: window.clearTimeout,
|
clearTimeout: window.clearTimeout,
|
||||||
setInterval: window.setInterval,
|
setInterval: window.setInterval,
|
||||||
clearInterval: window.clearInterval
|
clearInterval: window.clearInterval
|
||||||
},
|
},
|
||||||
|
|
||||||
assertInstalled: function() {
|
assertInstalled: function() {
|
||||||
if (jasmine.Clock.installed != jasmine.Clock.defaultFakeTimer) {
|
if (jasmine.Clock.installed != jasmine.Clock.defaultFakeTimer) {
|
||||||
throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
|
throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
installed: null
|
installed: null
|
||||||
};
|
};
|
||||||
jasmine.Clock.installed = jasmine.Clock.real;
|
jasmine.Clock.installed = jasmine.Clock.real;
|
||||||
|
|
||||||
//else for IE support
|
//else for IE support
|
||||||
window.setTimeout = function(funcToCall, millis) {
|
window.setTimeout = function(funcToCall, millis) {
|
||||||
if (jasmine.Clock.installed.setTimeout.apply) {
|
if (jasmine.Clock.installed.setTimeout.apply) {
|
||||||
return jasmine.Clock.installed.setTimeout.apply(this, arguments);
|
return jasmine.Clock.installed.setTimeout.apply(this, arguments);
|
||||||
} else {
|
} else {
|
||||||
return jasmine.Clock.installed.setTimeout(funcToCall, millis);
|
return jasmine.Clock.installed.setTimeout(funcToCall, millis);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
window.setInterval = function(funcToCall, millis) {
|
window.setInterval = function(funcToCall, millis) {
|
||||||
if (jasmine.Clock.installed.setInterval.apply) {
|
if (jasmine.Clock.installed.setInterval.apply) {
|
||||||
return jasmine.Clock.installed.setInterval.apply(this, arguments);
|
return jasmine.Clock.installed.setInterval.apply(this, arguments);
|
||||||
} else {
|
} else {
|
||||||
return jasmine.Clock.installed.setInterval(funcToCall, millis);
|
return jasmine.Clock.installed.setInterval(funcToCall, millis);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
window.clearTimeout = function(timeoutKey) {
|
window.clearTimeout = function(timeoutKey) {
|
||||||
if (jasmine.Clock.installed.clearTimeout.apply) {
|
if (jasmine.Clock.installed.clearTimeout.apply) {
|
||||||
return jasmine.Clock.installed.clearTimeout.apply(this, arguments);
|
return jasmine.Clock.installed.clearTimeout.apply(this, arguments);
|
||||||
} else {
|
} else {
|
||||||
return jasmine.Clock.installed.clearTimeout(timeoutKey);
|
return jasmine.Clock.installed.clearTimeout(timeoutKey);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
window.clearInterval = function(timeoutKey) {
|
window.clearInterval = function(timeoutKey) {
|
||||||
if (jasmine.Clock.installed.clearTimeout.apply) {
|
if (jasmine.Clock.installed.clearTimeout.apply) {
|
||||||
return jasmine.Clock.installed.clearInterval.apply(this, arguments);
|
return jasmine.Clock.installed.clearInterval.apply(this, arguments);
|
||||||
} else {
|
} else {
|
||||||
return jasmine.Clock.installed.clearInterval(timeoutKey);
|
return jasmine.Clock.installed.clearInterval(timeoutKey);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
jasmine.version_= {
|
jasmine.version_= {
|
||||||
"major": 0,
|
"major": 0,
|
||||||
|
Loading…
Reference in New Issue
Block a user