library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests: Fix another issue with sinon timers

Browse Source
This commit is contained in:
Oleg 2014-01-14 20:58:10 +04:00
parent a247bd09ed
commit 3fbbe933ea
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/unit/effects.js vendored
View File

@ -5,21 +5,16 @@ if ( !jQuery.fx ) {
return; return;
} }
var off = jQuery.fx.off, var off = jQuery.fx.off;
oldNow = jQuery.now;
module("effects", { module("effects", {
setup: function() { setup: function() {
this.clock = sinon.useFakeTimers( 505877050 ); this.clock = sinon.useFakeTimers( 505877050 );
this._oldInterval = jQuery.fx.interval; this._oldInterval = jQuery.fx.interval;
jQuery.fx.interval = 10; jQuery.fx.interval = 10;
jQuery.now = function() {
return +( new Date() );
};
}, },
teardown: function() { teardown: function() {
this.clock.restore(); this.clock.restore();
jQuery.now = oldNow;
jQuery.fx.stop(); jQuery.fx.stop();
jQuery.fx.interval = this._oldInterval; jQuery.fx.interval = this._oldInterval;
jQuery.fx.off = off; jQuery.fx.off = off;
@ -299,13 +294,11 @@ test("animate block as inline width/height", function() {
span.remove(); span.remove();
if ( jQuery.support.inlineBlockNeedsLayout || expected === "inline-block" ) { if ( jQuery.support.inlineBlockNeedsLayout || expected === "inline-block" ) {
stop();
jQuery("#foo").css({ display: "inline", width: "", height: "" }).animate({ width: 42, height: 42 }, 100, function() { jQuery("#foo").css({ display: "inline", width: "", height: "" }).animate({ width: 42, height: 42 }, 100, function() {
equal( jQuery(this).css("display"), jQuery.support.inlineBlockNeedsLayout ? "inline" : "inline-block", "inline-block was set on non-floated inline element when animating width/height" ); equal( jQuery(this).css("display"), jQuery.support.inlineBlockNeedsLayout ? "inline" : "inline-block", "inline-block was set on non-floated inline element when animating width/height" );
equal( this.offsetWidth, 42, "width was animated" ); equal( this.offsetWidth, 42, "width was animated" );
equal( this.offsetHeight, 42, "height was animated" ); equal( this.offsetHeight, 42, "height was animated" );
start();
}); });
// Browser doesn't support inline-block // Browser doesn't support inline-block
@ -326,7 +319,6 @@ test("animate native inline width/height", function() {
span.remove(); span.remove();
if ( jQuery.support.inlineBlockNeedsLayout || expected === "inline-block" ) { if ( jQuery.support.inlineBlockNeedsLayout || expected === "inline-block" ) {
stop();
jQuery("#foo").css({ display: "", width: "", height: "" }) jQuery("#foo").css({ display: "", width: "", height: "" })
.append("<span>text</span>") .append("<span>text</span>")
.children("span") .children("span")
@ -334,7 +326,6 @@ test("animate native inline width/height", function() {
equal( jQuery(this).css("display"), "inline-block", "inline-block was set on non-floated inline element when animating width/height" ); equal( jQuery(this).css("display"), "inline-block", "inline-block was set on non-floated inline element when animating width/height" );
equal( this.offsetWidth, 42, "width was animated" ); equal( this.offsetWidth, 42, "width was animated" );
equal( this.offsetHeight, 42, "height was animated" ); equal( this.offsetHeight, 42, "height was animated" );
start();
}); });
// Browser doesn't support inline-block // Browser doesn't support inline-block