X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Feffects.js;h=b9d5c88410d02e25f0623234a12a539f0814e7cf;hb=0be7f4eb4f027dce00f11d7816290022d447d336;hp=2c5616dd92b5c4ee3a2950f798a8679e4081068f;hpb=b70872f70d720e5f25eea7fdf0453804074dc194;p=jquery.git diff --git a/test/unit/effects.js b/test/unit/effects.js index 2c5616d..b9d5c88 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -1,18 +1,36 @@ module("effects"); test("show()", function() { - expect(16); + expect(23); 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; + var speeds = { + "null speed": null, + "undefined speed": undefined, + "empty string speed": "", + "false speed": false + }; + + jQuery.each(speeds, function(name, speed) { + pass = true; + div.hide().show(speed).each(function() { + if ( this.style.display == "none" ) pass = false; + }); + ok( pass, "Show with " + name); + }); + + + jQuery.each(speeds, function(name, speed) { + pass = true; + div.hide().show(speed, function() { + pass = false; + }); + ok( pass, "Show with " + name + " does not call animate callback" ); }); - ok( pass, "Show will null speed"); jQuery("#main").append('
'); @@ -43,7 +61,7 @@ test("show()", function() { test("show(Number) - other displays", function() { expect(15); - reset(); + QUnit.reset(); stop(); jQuery("#main").append(''); @@ -120,7 +138,7 @@ test("animate option (queue === false)", function () { */ test("animate with no properties", function() { - expect(1); + expect(2); var divs = jQuery("div"), count = 0; @@ -129,6 +147,16 @@ test("animate with no properties", function() { }); equals( divs.length, count, "Make sure that callback is called for each element in the set." ); + + stop(); + + var foo = jQuery("#foo"); + + foo.animate({}); + foo.animate({top: 10}, 100, function(){ + ok( true, "Animation was properly dequeued." ); + start(); + }); }); test("animate duration 0", function() { @@ -212,11 +240,11 @@ test("stop()", function() { $foo.animate({ width:'show' }, 1000); setTimeout(function(){ var nw = $foo.width(); - ok( nw != w, "An animation occurred " + nw + "px " + w + "px"); + notEqual( nw, w, "An animation occurred " + nw + "px " + w + "px"); $foo.stop(); nw = $foo.width(); - ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px"); + notEqual( nw, w, "Stop didn't reset the animation " + nw + "px " + w + "px"); setTimeout(function(){ equals( nw, $foo.width(), "The animation didn't continue" ); start(); @@ -238,13 +266,12 @@ test("stop() - several in queue", function() { setTimeout(function(){ equals( $foo.queue().length, 3, "All 3 still in the queue" ); var nw = $foo.width(); - ok( nw != w, "An animation occurred " + nw + "px " + w + "px"); + notEqual( nw, w, "An animation occurred " + nw + "px " + w + "px"); $foo.stop(); nw = $foo.width(); - ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px"); - // Disabled, being flaky - //equals( $foo.queue().length, 1, "The next animation continued" ); + notEqual( nw, w, "Stop didn't reset the animation " + nw + "px " + w + "px"); + $foo.stop(true); start(); }, 100); @@ -365,7 +392,7 @@ jQuery.each( { return ""; }, "JS Auto": function(elem,prop){ - jQuery(elem).css(prop,"auto") + jQuery(elem).css(prop,"") .text("This is a long string of text."); return ""; }, @@ -447,15 +474,14 @@ jQuery.each( { equals( this.style.display, "block", "Showing, display should block: " + this.style.display); if ( t_w == "hide"||t_w == "show" ) - equals(this.style.width.indexOf(f_w), 0, "Width must be reset to " + f_w + ": " + this.style.width); + ok(f_w === "" ? this.style.width === f_w : this.style.width.indexOf(f_w) === 0, "Width must be reset to " + f_w + ": " + this.style.width); 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); + ok(f_h === "" ? this.style.height === f_h : this.style.height.indexOf(f_h) === 0, "Height must be reset to " + f_h + ": " + this.style.height); var cur_o = jQuery.style(this, "opacity"); - if ( cur_o !== "" ) cur_o = parseFloat( cur_o ); - - if ( t_o == "hide"||t_o == "show" ) + + if ( t_o == "hide" || t_o == "show" ) equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o); if ( t_w == "hide" ) @@ -464,7 +490,7 @@ jQuery.each( { if ( t_o.constructor == Number ) { equals(cur_o, t_o, "Final opacity should be " + t_o + ": " + cur_o); - ok(jQuery.curCSS(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o); + ok(jQuery.css(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o); } if ( t_w.constructor == Number ) { @@ -484,9 +510,14 @@ jQuery.each( { } if ( t_h == "show" ) { - var old_h = jQuery.curCSS(this, "height"); - jQuery(elem).append("