Permalink
Browse files

Wait for both .stop() tests to finish, don't count on timing.

  • Loading branch information...
dmethvin committed Aug 10, 2012
1 parent e415539 commit 77412e03056b2299309638212ae708acc190664c
Showing with 13 additions and 7 deletions.
  1. +13 −7 test/unit/effects.js
@@ -552,27 +552,30 @@ test("animate non-element", function() {
});

test("stop()", function() {
expect(4);
expect( 4 );
stop();

var $foo = jQuery("#foo");
var w = 0;
var $foo = jQuery("#foo"),
tests = 2,
w = 0;

$foo.hide().css( "width", 200 )
.animate( { "width": "show" }, 1000 );
.animate( { "width": "show" }, 1500 );

setTimeout(function() {
var nw = $foo.css("width");
notEqual( parseFloat( nw ), w, "An animation occurred " + nw + " " + w + "px");
notEqual( parseFloat( nw ), w, "An animation occurred " + nw + " " + w + "px" );
$foo.stop();

nw = $foo.css("width");
notEqual( parseFloat( nw ), w, "Stop didn't reset the animation " + nw + " " + w + "px");
notEqual( parseFloat( nw ), w, "Stop didn't reset the animation " + nw + " " + w + "px" );
setTimeout(function() {
$foo.removeData();
$foo.removeData(undefined, true);
equal( nw, $foo.css("width"), "The animation didn't continue" );
start();
if ( --tests === 0 ) {
start();
}
}, 100);
}, 100);

@@ -586,6 +589,9 @@ test("stop()", function() {
equal( $two.css("opacity"), "0", "Stop does not interfere with animations on other elements (#6641)" );
// Reset styles
$one.add( $two ).css("opacity", "");
if ( --tests === 0 ) {
start();
}
});
}, 50);
});

0 comments on commit 77412e0

Please sign in to comment.