]> source.dussan.org Git - jquery.git/commitdiff
Trying to repair a unit
authorCorey Frang <gnarf@gnarf.net>
Wed, 25 Jul 2012 20:18:01 +0000 (15:18 -0500)
committerCorey Frang <gnarf@gnarf.net>
Wed, 25 Jul 2012 20:18:25 +0000 (15:18 -0500)
test/unit/effects.js

index 17ba1c21abb42d05b62555813983f40d02f95159..a3550588494e9efc5a40ac35881b41cabea355a8 100644 (file)
@@ -1405,25 +1405,29 @@ asyncTest( "jQuery.Animation( object, props, opts )", 4, function() {
 
 asyncTest( "Animate Option: step: function( percent, tween )", 1, function() {
        var counter = {};
-       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();
-       });
+       // 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 );
 });
 
 asyncTest( "Animate callbacks have correct context", 2, function() {