Commit fe6afa82 authored by Timmy Willison's avatar Timmy Willison

Effects: fix failing tests in IE8

parent 7ee0feac
...@@ -17,15 +17,16 @@ module( "animation", { ...@@ -17,15 +17,16 @@ module( "animation", {
this.sandbox = sinon.sandbox.create(); this.sandbox = sinon.sandbox.create();
this.clock = this.sandbox.useFakeTimers( startTime ); this.clock = this.sandbox.useFakeTimers( startTime );
this._oldInterval = jQuery.fx.interval; this._oldInterval = jQuery.fx.interval;
this._oldNow = jQuery.now;
jQuery.fx.step = {}; jQuery.fx.step = {};
jQuery.fx.interval = 10; jQuery.fx.interval = 10;
jQuery.now = Date.now; jQuery.now = Date.now || this._oldNow;
jQuery.Animation.prefilters = [ defaultPrefilter ]; jQuery.Animation.prefilters = [ defaultPrefilter ];
jQuery.Animation.tweeners = { "*": [ defaultTweener ] }; jQuery.Animation.tweeners = { "*": [ defaultTweener ] };
}, },
teardown: function() { teardown: function() {
this.sandbox.restore(); this.sandbox.restore();
jQuery.now = Date.now; jQuery.now = this._oldNow;
jQuery.fx.stop(); jQuery.fx.stop();
jQuery.fx.interval = this._oldInterval; jQuery.fx.interval = this._oldInterval;
window.requestAnimationFrame = oldRaf; window.requestAnimationFrame = oldRaf;
......
...@@ -13,13 +13,14 @@ module( "tween", { ...@@ -13,13 +13,14 @@ module( "tween", {
this.sandbox = sinon.sandbox.create(); this.sandbox = sinon.sandbox.create();
this.clock = this.sandbox.useFakeTimers( 505877050 ); this.clock = this.sandbox.useFakeTimers( 505877050 );
this._oldInterval = jQuery.fx.interval; this._oldInterval = jQuery.fx.interval;
this._oldNow = jQuery.now;
jQuery.fx.step = {}; jQuery.fx.step = {};
jQuery.fx.interval = 10; jQuery.fx.interval = 10;
jQuery.now = Date.now; jQuery.now = Date.now || this._oldNow;
}, },
teardown: function() { teardown: function() {
this.sandbox.restore(); this.sandbox.restore();
jQuery.now = Date.now; jQuery.now = this._oldNow;
jQuery.fx.stop(); jQuery.fx.stop();
jQuery.fx.interval = this._oldInterval; jQuery.fx.interval = this._oldInterval;
window.requestAnimationFrame = oldRaf; window.requestAnimationFrame = oldRaf;
...@@ -198,7 +199,7 @@ test( "jQuery.Tween - Element", function() { ...@@ -198,7 +199,7 @@ test( "jQuery.Tween - Element", function() {
ok( easingSpy.calledWith( 0.1, 0.1 * testOptions.duration, 0, 1, testOptions.duration ), ok( easingSpy.calledWith( 0.1, 0.1 * testOptions.duration, 0, 1, testOptions.duration ),
"...using jQuery.easing.linear with back-compat arguments" ); "...using jQuery.easing.linear with back-compat arguments" );
equal( parseFloat( testElement.style.height ).toFixed( 2 ), eased.toFixed( 2 ), "Set value" ); equal( Math.floor( parseFloat( testElement.style.height ) ), Math.floor( eased ), "Set value" );
tween.run( 1 ); tween.run( 1 );
equal( testElement.style.height, "0px", "Checking another value" ); equal( testElement.style.height, "0px", "Checking another value" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment