Make sure that effect tests no longer reference the old CSS methods.
[jquery.git] / test / unit / effects.js
index e44739b..9ff5014 100644 (file)
@@ -29,9 +29,8 @@ test("show()", function() {
        div.hide().show(speed, function() {
                        pass = false;
                });
-               ok( pass, "Show with " + name + " does not call animate callback");
+               ok( pass, "Show with " + name + " does not call animate callback" );
        });
-       
 
        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>');
 
@@ -62,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>');
@@ -481,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", undefined, true);
                                if ( cur_o !== "" ) cur_o = parseFloat( cur_o );
        
                                if ( t_o == "hide"||t_o == "show" )
@@ -493,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 ) {
@@ -513,7 +512,7 @@ jQuery.each( {
                                }
                                
                                if ( t_h == "show" ) {
-                                       var old_h = jQuery.curCSS(this, "height");
+                                       var old_h = jQuery.css(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.");
                                }