From: Corey Frang <gnarf@gnarf.net>
Date: Wed, 25 Jul 2012 20:36:21 +0000 (-0500)
Subject: This should repair the unit
X-Git-Tag: 1.8rc1~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f0432d54f68c35c63573128263c85217f3cf8d69;p=jquery.git

This should repair the unit
---

diff --git a/src/sizzle b/src/sizzle
index 4fc4b92a1..e4d50dd01 160000
--- a/src/sizzle
+++ b/src/sizzle
@@ -1 +1 @@
-Subproject commit 4fc4b92a1d1037b70162faf19860c2aac2ae5622
+Subproject commit e4d50dd01f7573e205606746b32924281db379f0
diff --git a/test/unit/effects.js b/test/unit/effects.js
index a35505884..6d200b534 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -1405,29 +1405,27 @@ asyncTest( "jQuery.Animation( object, props, opts )", 4, function() {
 
 asyncTest( "Animate Option: step: function( percent, tween )", 1, function() {
 	var counter = {};
-	// if the animation loop is already running when we start this test, it WILL fail
-	// going to try delaying 100ms to make sure any potential leftover animations are done
-	setTimeout( function() {
-		jQuery( "#foo" ).animate({
-			prop1: 1,
-			prop2: 2,
-			prop3: 3
-		}, {
-			duration: 1,
-			step: function( value, tween ) {
-				var calls = counter[ tween.prop ] = counter[ tween.prop ] || [];
-				calls.push( value );
-			}
-		}).queue( function( next ) {
-			deepEqual( counter, {
-				prop1: [0, 1],
-				prop2: [0, 2],
-				prop3: [0, 3]
-			}, "Step function was called once at 0% and once at 100% for each property");
-			next();
-			start();
-		});
-	}, 100 );
+	jQuery( "#foo" ).animate({
+		prop1: 1,
+		prop2: 2,
+		prop3: 3
+	}, {
+		duration: 1,
+		step: function( value, tween ) {
+			var calls = counter[ tween.prop ] = counter[ tween.prop ] || [];
+			// in case this is called multiple times for either, lets store it in
+			// 0 or 1 in the array
+			calls[ value === 0 ? 0 : 1 ] = value;
+		}
+	}).queue( function( next ) {
+		deepEqual( counter, {
+			prop1: [0, 1],
+			prop2: [0, 2],
+			prop3: [0, 3]
+		}, "Step function was called once at 0% and once at 100% for each property");
+		next();
+		start();
+	});
 });
 
 asyncTest( "Animate callbacks have correct context", 2, function() {