Tweaked the live test to be a bit simpler.

[jquery.git] / test / unit / fx.js

diff --git a/test/unit/fx.js b/test/unit/fx.js
index 87e6aea..e1793ec 100644 (file)
--- 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('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>');
 
        var old = jQuery("#show-tests table").show().css("display") !== "table";
@@ -57,7 +63,7 @@ test("animate option (queue === false)", function () {
        $foo.animate({width:'100px'}, 3000, function () {
                // should finish after unqueued animation so second
                order.push(2);
-               isSet( order, [ 1, 2 ], "Animations finished in the correct order" );
+               same( order, [ 1, 2 ], "Animations finished in the correct order" );
                start();
        });
        $foo.animate({fontSize:'2em'}, {queue:false, duration:10, complete:function () {
@@ -67,8 +73,20 @@ test("animate option (queue === false)", function () {
 });
 */
 
+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(7);
        
        stop();
        
@@ -97,7 +115,15 @@ test("animate duration 0", function() {
                // Failed until [6115]
                equals( counter, 5, "One synchronic and one asynchronic" );
                start();
-       });     
+       });
+       
+       var $elem = jQuery("<div />");
+       $elem.show(0, function(){ 
+               ok(true, "Show's callback with no duration");
+       });
+       $elem.hide(0, function(){ 
+               ok(true, "Show's callback with no duration");
+       });
 });
 
 test("animate hyphenated properties", function(){