Switched from using QUnit's isObj/isSet to the more robust same method.

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

diff --git a/test/unit/fx.js b/test/unit/fx.js
index de10ace..c47fe55 100644 (file)
--- a/test/unit/fx.js
+++ b/test/unit/fx.js
@@ -1,5 +1,40 @@
 module("fx");
 
+test("show()", function() {
+       expect(15);
+       var pass = true, div = jQuery("#main div");
+       div.show().each(function(){
+               if ( this.style.display == "none" ) pass = false;
+       });
+       ok( pass, "Show" );
+
+       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";
+
+       var test = {
+               "div"      : "block",
+               "p"        : "block",
+               "a"        : "inline",
+               "code"     : "inline",
+               "pre"      : "block",
+               "span"     : "inline",
+               "table"    : old ? "block" : "table",
+               "thead"    : old ? "block" : "table-header-group",
+               "tbody"    : old ? "block" : "table-row-group",
+               "tr"       : old ? "block" : "table-row",
+               "th"       : old ? "block" : "table-cell",
+               "td"       : old ? "block" : "table-cell",
+               "ul"       : "block",
+               "li"       : old ? "block" : "list-item"
+       };
+
+       jQuery.each(test, function(selector, expected) {
+               var elem = jQuery(selector, "#show-tests").show();
+               equals( elem.css("display"), expected, "Show using correct display type for " + selector );
+       });
+});
+
 test("animate(Hash, Object, Function)", function() {
        expect(1);
        stop();
@@ -11,6 +46,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();
@@ -18,24 +54,21 @@ 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 duration 0", function() {
-       expect(5);
+       expect(7);
        
        stop();
        
@@ -64,7 +97,27 @@ 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(){
+       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(){
@@ -330,7 +383,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" )