X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=test%2Funit%2Ffx.js;h=c2bf6b43ff514ed4ff98c0865e90267c4fc0f54a;hb=231c8756788f085d04c6120c12eaa66766abfa3f;hp=1f9e674a163ea274a874d6d07539f549481809e5;hpb=6728e3cf74d02794113deb0af70a5f9a7caa2241;p=jquery.git diff --git a/test/unit/fx.js b/test/unit/fx.js index 1f9e674..c2bf6b4 100644 --- a/test/unit/fx.js +++ b/test/unit/fx.js @@ -1,12 +1,145 @@ 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('
'); + + 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(); var hash = {opacity: 'show'}; - var hashCopy = $.extend({}, hash); - $('#foo').animate(hash, 0, function() { - ok( hash.opacity == hashCopy.opacity, 'Check if animate changed the hash parameter' ); + var hashCopy = jQuery.extend({}, hash); + jQuery('#foo').animate(hash, 0, function() { + equals( hash.opacity, hashCopy.opacity, 'Check if animate changed the hash parameter' ); + start(); + }); +}); + +/* // This test ends up being flaky depending upon the CPU load +test("animate option (queue === false)", function () { + expect(1); + stop(); + + var order = []; + + var $foo = jQuery("#foo"); + $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); + }}); +}); +*/ + +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(7); + + stop(); + + var $elems = jQuery([{ a:0 },{ a:0 }]), + counter = 0, + count = function(){ + counter++; + }; + + equals( jQuery.timers.length, 0, "Make sure no animation was running from another test" ); + + $elems.eq(0).animate( {a:1}, 0, count ); + + // Failed until [6115] + equals( jQuery.timers.length, 0, "Make sure synchronic animations are not left on jQuery.timers" ); + + equals( counter, 1, "One synchronic animations" ); + + $elems.animate( { a:2 }, 0, count ); + + equals( counter, 3, "Multiple synchronic animations" ); + + $elems.eq(0).animate( {a:3}, 0, count ); + $elems.eq(1).animate( {a:3}, 20, function(){ + count(); + // Failed until [6115] + equals( counter, 5, "One synchronic and one asynchronic" ); + start(); + }); + + var $elem = jQuery(""); + $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(){ + expect(1); + stop(); + + var obj = { test: 0 }; + + jQuery(obj).animate({test: 200}, 200, function(){ + equals( obj.test, 200, "The custom property should be modified." ); start(); }); }); @@ -14,110 +147,131 @@ test("animate(Hash, Object, Function)", function() { test("stop()", function() { expect(3); stop(); - reset(); - var foo = $("#foo")[0]; - var h = foo.style.height; + var $foo = jQuery("#nothiddendiv"); + var w = 0; + $foo.hide().width(200).width(); - $("#foo").slideUp(1000); + $foo.animate({ width:'show' }, 1000); setTimeout(function(){ - var nh = foo.style.height; - ok( nh != h, "An animation occurred " + nh + " " + h ); - $("#foo").stop(); + var nw = $foo.width(); + ok( nw != w, "An animation occurred " + nw + "px " + w + "px"); + $foo.stop(); - nh = foo.style.height; - ok( nh != h, "Stop didn't reset the animation " + nh + " " + h ); + nw = $foo.width(); + ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px"); setTimeout(function(){ - equals( nh, foo.style.height, "The animation didn't continue" ); + equals( nw, $foo.width(), "The animation didn't continue" ); start(); }, 100); }, 100); }); -test("toggle()", function() { +test("stop() - several in queue", function() { expect(3); - var x = $("#foo"); - ok( x.is(":visible") ); - x.toggle(); - ok( x.is(":hidden") ); - x.toggle(); - ok( x.is(":visible") ); + stop(); + + var $foo = jQuery("#nothiddendivchild"); + var w = 0; + $foo.hide().width(200).width(); + + $foo.animate({ width:'show' }, 1000); + $foo.animate({ width:'hide' }, 1000); + $foo.animate({ width:'show' }, 1000); + 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"); + $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" ); + $foo.stop(true); + start(); + }, 100); }); -var visible = { - Normal: function(elem){}, - "CSS Hidden": function(elem){ - $(this).addClass("hidden"); - }, - "JS Hidden": function(elem){ - $(this).hide(); - } -}; +test("stop(clearQueue)", function() { + expect(4); + stop(); -var from = { - "CSS Auto": function(elem,prop){ - $(elem).addClass("auto" + prop) - .text("This is a long string of text."); - return ""; - }, - "JS Auto": function(elem,prop){ - $(elem).css(prop,"auto") - .text("This is a long string of text."); - return ""; - }, - "CSS 100": function(elem,prop){ - $(elem).addClass("large" + prop); - return ""; - }, - "JS 100": function(elem,prop){ - $(elem).css(prop,prop == "opacity" ? 1 : "100px"); - return prop == "opacity" ? 1 : 100; - }, - "CSS 50": function(elem,prop){ - $(elem).addClass("med" + prop); - return ""; - }, - "JS 50": function(elem,prop){ - $(elem).css(prop,prop == "opacity" ? 0.50 : "50px"); - return prop == "opacity" ? 0.5 : 50; - }, - "CSS 0": function(elem,prop){ - $(elem).addClass("no" + prop); - return ""; - }, - "JS 0": function(elem,prop){ - $(elem).css(prop,prop == "opacity" ? 0 : "0px"); - return 0; - } -}; + var $foo = jQuery("#nothiddendiv"); + var w = 0; + $foo.hide().width(200).width(); -var to = { - "show": function(elem,prop){ - $(elem).hide().addClass("wide"+prop); - return "show"; - }, - "hide": function(elem,prop){ - $(elem).addClass("wide"+prop); - return "hide"; - }, - "100": function(elem,prop){ - $(elem).addClass("wide"+prop); - return prop == "opacity" ? 1 : 100; - }, - "50": function(elem,prop){ - return prop == "opacity" ? 0.50 : 50; - }, - "0": function(elem,prop){ - $(elem).addClass("noback"); - return 0; - } -}; + $foo.animate({ width:'show' }, 1000); + $foo.animate({ width:'hide' }, 1000); + $foo.animate({ width:'show' }, 1000); + setTimeout(function(){ + var nw = $foo.width(); + ok( nw != w, "An animation occurred " + nw + "px " + w + "px"); + $foo.stop(true); + + nw = $foo.width(); + ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px"); + + equals( $foo.queue().length, 0, "The animation queue was cleared" ); + setTimeout(function(){ + equals( nw, $foo.width(), "The animation didn't continue" ); + start(); + }, 100); + }, 100); +}); + +test("stop(clearQueue, gotoEnd)", function() { + expect(1); + stop(); -function checkOverflowDisplay(){ + var $foo = jQuery("#nothiddendivchild"); + var w = 0; + $foo.hide().width(200).width(); + + $foo.animate({ width:'show' }, 1000); + $foo.animate({ width:'hide' }, 1000); + $foo.animate({ width:'show' }, 1000); + $foo.animate({ width:'hide' }, 1000); + setTimeout(function(){ + var nw = $foo.width(); + ok( nw != w, "An animation occurred " + nw + "px " + w + "px"); + $foo.stop(false, true); + + nw = $foo.width(); + // Disabled, being flaky + //equals( nw, 1, "Stop() reset the animation" ); + + setTimeout(function(){ + // Disabled, being flaky + //equals( $foo.queue().length, 2, "The next animation continued" ); + $foo.stop(true); + start(); + }, 100); + }, 100); +}); + +test("toggle()", function() { + expect(6); + var x = jQuery("#nothiddendiv"); + ok( x.is(":visible"), "is visible" ); + x.toggle(); + ok( x.is(":hidden"), "is hidden" ); + x.toggle(); + ok( x.is(":visible"), "is visible again" ); + + x.toggle(true); + ok( x.is(":visible"), "is visible" ); + x.toggle(false); + ok( x.is(":hidden"), "is hidden" ); + x.toggle(true); + ok( x.is(":visible"), "is visible again" ); +}); + +jQuery.checkOverflowDisplay = function(){ var o = jQuery.css( this, "overflow" ); - ok(o == "visible", "Overflow should be visible: " + o); - ok(jQuery.css( this, "display" ) == "inline", "Display shouldn't be tampered with."); + equals(o, "visible", "Overflow should be visible: " + o); + equals(jQuery.css( this, "display" ), "inline", "Display shouldn't be tampered with."); start(); } @@ -125,32 +279,87 @@ function checkOverflowDisplay(){ test("JS Overflow and Display", function() { expect(2); stop(); - makeTest( "JS Overflow and Display" ) + jQuery.makeTest( "JS Overflow and Display" ) .addClass("widewidth") .css({ overflow: "visible", display: "inline" }) .addClass("widewidth") .text("Some sample text.") .before("text before") .after("text after") - .animate({ opacity: 0.5 }, "slow", checkOverflowDisplay); + .animate({ opacity: 0.5 }, "slow", jQuery.checkOverflowDisplay); }); test("CSS Overflow and Display", function() { expect(2); stop(); - makeTest( "CSS Overflow and Display" ) + jQuery.makeTest( "CSS Overflow and Display" ) .addClass("overflow inline") .addClass("widewidth") .text("Some sample text.") .before("text before") .after("text after") - .animate({ opacity: 0.5 }, "slow", checkOverflowDisplay); + .animate({ opacity: 0.5 }, "slow", jQuery.checkOverflowDisplay); }); -jQuery.each( from, function(fn, f){ - jQuery.each( to, function(tn, t){ +jQuery.each( { + "CSS Auto": function(elem,prop){ + jQuery(elem).addClass("auto" + prop) + .text("This is a long string of text."); + return ""; + }, + "JS Auto": function(elem,prop){ + jQuery(elem).css(prop,"auto") + .text("This is a long string of text."); + return ""; + }, + "CSS 100": function(elem,prop){ + jQuery(elem).addClass("large" + prop); + return ""; + }, + "JS 100": function(elem,prop){ + jQuery(elem).css(prop,prop == "opacity" ? 1 : "100px"); + return prop == "opacity" ? 1 : 100; + }, + "CSS 50": function(elem,prop){ + jQuery(elem).addClass("med" + prop); + return ""; + }, + "JS 50": function(elem,prop){ + jQuery(elem).css(prop,prop == "opacity" ? 0.50 : "50px"); + return prop == "opacity" ? 0.5 : 50; + }, + "CSS 0": function(elem,prop){ + jQuery(elem).addClass("no" + prop); + return ""; + }, + "JS 0": function(elem,prop){ + jQuery(elem).css(prop,prop == "opacity" ? 0 : "0px"); + return 0; + } +}, function(fn, f){ + jQuery.each( { + "show": function(elem,prop){ + jQuery(elem).hide().addClass("wide"+prop); + return "show"; + }, + "hide": function(elem,prop){ + jQuery(elem).addClass("wide"+prop); + return "hide"; + }, + "100": function(elem,prop){ + jQuery(elem).addClass("wide"+prop); + return prop == "opacity" ? 1 : 100; + }, + "50": function(elem,prop){ + return prop == "opacity" ? 0.50 : 50; + }, + "0": function(elem,prop){ + jQuery(elem).addClass("noback"); + return 0; + } + }, function(tn, t){ test(fn + " to " + tn, function() { - var elem = makeTest( fn + " to " + tn ); + var elem = jQuery.makeTest( fn + " to " + tn ); var t_w = t( elem, "width" ); var f_w = f( elem, "width" ); @@ -178,31 +387,31 @@ jQuery.each( from, function(fn, f){ elem.animate(anim, 50, function(){ if ( t_w == "show" ) - ok( this.style.display == "block", "Showing, display should block: " + this.style.display); + equals( this.style.display, "block", "Showing, display should block: " + this.style.display); if ( t_w == "hide"||t_w == "show" ) - ok(this.style.width.indexOf(f_w) == 0, "Width must be reset to " + f_w + ": " + this.style.width); + equals(this.style.width.indexOf(f_w), 0, "Width must be reset to " + f_w + ": " + this.style.width); if ( t_h == "hide"||t_h == "show" ) - ok(this.style.height.indexOf(f_h) == 0, "Height must be reset to " + f_h + ": " + this.style.height); + 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" ) - ok(cur_o == f_o, "Opacity must be reset to " + f_o + ": " + cur_o); + equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o); if ( t_w == "hide" ) - ok(this.style.display == "none", "Hiding, display should be none: " + this.style.display); + equals(this.style.display, "none", "Hiding, display should be none: " + this.style.display); if ( t_o.constructor == Number ) { - ok(cur_o == t_o, "Final opacity should be " + t_o + ": " + cur_o); + 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); } if ( t_w.constructor == Number ) { - ok(this.style.width == t_w + "px", "Final width should be " + t_w + ": " + this.style.width); + equals(this.style.width, t_w + "px", "Final width should be " + t_w + ": " + this.style.width); var cur_w = jQuery.css(this,"width"); @@ -210,7 +419,7 @@ jQuery.each( from, function(fn, f){ } if ( t_h.constructor == Number ) { - ok(this.style.height == t_h + "px", "Final height should be " + t_h + ": " + this.style.height); + equals(this.style.height, t_h + "px", "Final height should be " + t_h + ": " + this.style.height); var cur_h = jQuery.css(this,"height"); @@ -219,7 +428,7 @@ jQuery.each( from, function(fn, f){ if ( t_h == "show" ) { var old_h = jQuery.curCSS(this, "height"); - $(elem).append("