Making some more adjustments to handle auto CSS properties.

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

diff --git a/test/unit/effects.js b/test/unit/effects.js
index cefcc15..cb07f6a 100644 (file)
--- 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('<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>');
 
@@ -43,7 +61,7 @@ test("show()", function() {
 
 test("show(Number) - other displays", function() {
        expect(15);
-       reset();
+       QUnit.reset();
        stop();
 
        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>');
@@ -372,16 +390,16 @@ jQuery.each( {
        "CSS Auto": function(elem,prop){
                jQuery(elem).addClass("auto" + prop)
                        .text("This is a long string of text.");
-               return "";
+               return prop == "opacity" ? 1 : "";
        },
        "JS Auto": function(elem,prop){
                jQuery(elem).css(prop,"auto")
                        .text("This is a long string of text.");
-               return "";
+               return prop == "opacity" ? 1 : "";
        },
        "CSS 100": function(elem,prop){
                jQuery(elem).addClass("large" + prop);
-               return "";
+               return prop == "opacity" ? 1 : "";
        },
        "JS 100": function(elem,prop){
                jQuery(elem).css(prop,prop == "opacity" ? 1 : "100px");
@@ -389,7 +407,7 @@ jQuery.each( {
        },
        "CSS 50": function(elem,prop){
                jQuery(elem).addClass("med" + prop);
-               return "";
+               return prop == "opacity" ? 0.5 : "";
        },
        "JS 50": function(elem,prop){
                jQuery(elem).css(prop,prop == "opacity" ? 0.50 : "50px");
@@ -397,7 +415,7 @@ jQuery.each( {
        },
        "CSS 0": function(elem,prop){
                jQuery(elem).addClass("no" + prop);
-               return "";
+               return prop == "opacity" ? 0 : "";
        },
        "JS 0": function(elem,prop){
                jQuery(elem).css(prop,prop == "opacity" ? 0 : "0px");
@@ -462,7 +480,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.style(this, "opacity");
+                               var cur_o = jQuery.css(this, "opacity");
                                if ( cur_o !== "" ) cur_o = parseFloat( cur_o );
        
                                if ( t_o == "hide"||t_o == "show" )
@@ -474,7 +492,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 ) {
@@ -494,9 +512,9 @@ jQuery.each( {
                                }
                                
                                if ( t_h == "show" ) {
-                                       var old_h = jQuery.curCSS(this, "height");
-                                       jQuery(elem).append("<br/>Some more text<br/>and some more...");
-                                       ok(old_h != jQuery.css(this, "height" ), "Make sure height is auto.");
+                                       var old_h = jQuery.css(this, "height", undefined, true);
+                                       jQuery(this).append("<br/>Some more text<br/>and some more...");
+                                       notEqual(jQuery.css(this, "height", undefined, true), old_h, "Make sure height is auto. " + n);
                                }
        
                                start();