X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=test%2Funit%2Ffx.js;h=da22de229593394078f039227b57c4d8922ebac0;hb=122e5dcf14291bfbaec23505c68e28b7f82aef85;hp=63a3de7a6a350341eced86f611d880169b9a9ce3;hpb=7c04a64016c1f295dfdf4e731f693f8400a987bc;p=jquery.git diff --git a/test/unit/fx.js b/test/unit/fx.js index 63a3de7..da22de2 100644 --- a/test/unit/fx.js +++ b/test/unit/fx.js @@ -1,13 +1,19 @@ module("fx"); test("show()", function() { - expect(15); + expect(16); var pass = true, div = jQuery("#main div"); div.show().each(function(){ if ( this.style.display == "none" ) pass = false; }); ok( pass, "Show" ); + pass = true; + div.hide().show(null).each(function() { + if ( this.style.display == "none" ) pass = false; + }); + ok( pass, "Show will null speed"); + jQuery("#main").append('
'); var old = jQuery("#show-tests table").show().css("display") !== "table"; @@ -46,6 +52,7 @@ test("animate(Hash, Object, Function)", function() { }); }); +/* // This test ends up being flaky depending upon the CPU load test("animate option (queue === false)", function () { expect(1); stop(); @@ -53,53 +60,87 @@ test("animate option (queue === false)", function () { var order = []; var $foo = jQuery("#foo"); - $foo.animate({width:'100px'}, 200, function () { + $foo.animate({width:'100px'}, 3000, function () { // should finish after unqueued animation so second order.push(2); + same( order, [ 1, 2 ], "Animations finished in the correct order" ); + start(); }); $foo.animate({fontSize:'2em'}, {queue:false, duration:10, complete:function () { // short duration and out of queue so should finish first order.push(1); }}); - $foo.animate({height:'100px'}, 10, function() { - // queued behind the first animation so should finish third - order.push(3); - isSet( order, [ 1, 2, 3], "Animations finished in the correct order" ); - start(); +}); +*/ + +test("animate with no properties", function() { + expect(1); + + var divs = jQuery("div"), count = 0; + + divs.animate({}, function(){ + count++; }); + + equals( divs.length, count, "Make sure that callback is called for each element in the set." ); }); test("animate duration 0", function() { - expect(5); + 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(); - }); + }); + + var $elem = jQuery(""); + $elem.show(0, function(){ + ok(true, "Show callback with no duration"); + }); + $elem.hide(0, function(){ + ok(true, "Hide callback with no duration"); + }); +}); + +test("animate hyphenated properties", function(){ + expect(1); + stop(); + + jQuery("#nothiddendiv") + .css("font-size", 10) + .animate({"font-size": 20}, 200, function(){ + equals( this.style.fontSize, "20px", "The font-size property was animated." ); + start(); + }); }); test("animate non-element", function(){ @@ -365,7 +406,7 @@ jQuery.each( { if ( t_h == "hide"||t_h == "show" ) equals(this.style.height.indexOf(f_h), 0, "Height must be reset to " + f_h + ": " + this.style.height); - var cur_o = jQuery.attr(this.style, "opacity"); + var cur_o = jQuery.style(this, "opacity"); if ( cur_o !== "" ) cur_o = parseFloat( cur_o ); if ( t_o == "hide"||t_o == "show" )