X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Ffx.js;h=da22de229593394078f039227b57c4d8922ebac0;hb=64e4a879f9f92053ac4d58a3fffc0bbff6900b6e;hp=e1793ec1fdc95cefd3dc87d34d4078d449fb93f8;hpb=8cb8ae27d8e0c732b711d73d2ef71125b0a7769b;p=jquery.git diff --git a/test/unit/fx.js b/test/unit/fx.js index e1793ec..da22de2 100644 --- a/test/unit/fx.js +++ b/test/unit/fx.js @@ -86,32 +86,37 @@ test("animate with no properties", function() { }); test("animate duration 0", function() { - expect(7); + expect(11); stop(); - var $elems = jQuery([{ a:0 },{ a:0 }]), - counter = 0, - count = function(){ - counter++; - }; + var $elems = jQuery([{ a:0 },{ a:0 }]), counter = 0; equals( jQuery.timers.length, 0, "Make sure no animation was running from another test" ); - $elems.eq(0).animate( {a:1}, 0, count ); + $elems.eq(0).animate( {a:1}, 0, function(){ + ok( true, "Animate a simple property." ); + counter++; + }); // Failed until [6115] equals( jQuery.timers.length, 0, "Make sure synchronic animations are not left on jQuery.timers" ); equals( counter, 1, "One synchronic animations" ); - $elems.animate( { a:2 }, 0, count ); + $elems.animate( { a:2 }, 0, function(){ + ok( true, "Animate a second simple property." ); + counter++; + }); equals( counter, 3, "Multiple synchronic animations" ); - $elems.eq(0).animate( {a:3}, 0, count ); - $elems.eq(1).animate( {a:3}, 20, function(){ - count(); + $elems.eq(0).animate( {a:3}, 0, function(){ + ok( true, "Animate a third simple property." ); + counter++; + }); + $elems.eq(1).animate( {a:3}, 200, function(){ + counter++; // Failed until [6115] equals( counter, 5, "One synchronic and one asynchronic" ); start(); @@ -119,10 +124,10 @@ test("animate duration 0", function() { var $elem = jQuery("
"); $elem.show(0, function(){ - ok(true, "Show's callback with no duration"); + ok(true, "Show callback with no duration"); }); $elem.hide(0, function(){ - ok(true, "Show's callback with no duration"); + ok(true, "Hide callback with no duration"); }); });