X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Ffx.js;h=978ef7178dc92ecfd692dd78fca2e8c662b463ca;hb=d7d908b05a442745c1a90728805b74db0a7921cf;hp=5f6ad3993ef85d89493c65207b591771376c5852;hpb=259c8aa6044491f41a19668c0283c4d339904ff0;p=jquery.git
diff --git a/test/unit/fx.js b/test/unit/fx.js
index 5f6ad39..978ef71 100644
--- a/test/unit/fx.js
+++ b/test/unit/fx.js
@@ -1,12 +1,48 @@
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(3);
+ 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();
});
});
@@ -16,7 +52,7 @@ test("animate option (queue === false)", function () {
var order = [];
- var $foo = $("#foo");
+ var $foo = jQuery("#foo");
$foo.animate({width:'100px'}, 200, function () {
// should finish after unqueued animation so second
order.push(2);
@@ -33,28 +69,56 @@ test("animate option (queue === false)", function () {
});
});
-test("queue() defaults to 'fx' type", function () {
- expect(2);
+test("animate duration 0", function() {
+ expect(5);
+
+ 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();
+ });
+});
+
+test("animate non-element", function(){
+ expect(1);
stop();
- var $foo = $("#foo");
- $foo.queue("fx", [ "sample", "array" ]);
- var arr = $foo.queue();
- isSet(arr, [ "sample", "array" ], "queue() got an array set with type 'fx'");
- $foo.queue([ "another", "one" ]);
- var arr = $foo.queue("fx");
- isSet(arr, [ "another", "one" ], "queue('fx') got an array set with no type");
- // clean up after test
- $foo.queue([]);
+ var obj = { test: 0 };
- start();
+ jQuery(obj).animate({test: 200}, 200, function(){
+ equals( obj.test, 200, "The custom property should be modified." );
+ start();
+ });
});
test("stop()", function() {
expect(3);
stop();
- var $foo = $("#nothiddendiv");
+ var $foo = jQuery("#nothiddendiv");
var w = 0;
$foo.hide().width(200).width();
@@ -74,10 +138,10 @@ test("stop()", function() {
});
test("stop() - several in queue", function() {
- expect(4);
+ expect(3);
stop();
- var $foo = $("#nothiddendiv");
+ var $foo = jQuery("#nothiddendivchild");
var w = 0;
$foo.hide().width(200).width();
@@ -92,7 +156,8 @@ test("stop() - several in queue", function() {
nw = $foo.width();
ok( nw != w, "Stop didn't reset the animation " + nw + "px " + w + "px");
- equals( $foo.queue().length, 2, "The next animation continued" );
+ // Disabled, being flaky
+ //equals( $foo.queue().length, 1, "The next animation continued" );
$foo.stop(true);
start();
}, 100);
@@ -102,7 +167,7 @@ test("stop(clearQueue)", function() {
expect(4);
stop();
- var $foo = $("#nothiddendiv");
+ var $foo = jQuery("#nothiddendiv");
var w = 0;
$foo.hide().width(200).width();
@@ -126,10 +191,10 @@ test("stop(clearQueue)", function() {
});
test("stop(clearQueue, gotoEnd)", function() {
- expect(3);
+ expect(1);
stop();
- var $foo = $("#nothiddendiv");
+ var $foo = jQuery("#nothiddendivchild");
var w = 0;
$foo.hide().width(200).width();
@@ -143,10 +208,12 @@ test("stop(clearQueue, gotoEnd)", function() {
$foo.stop(false, true);
nw = $foo.width();
- equals( nw, 200, "Stop() reset the animation" );
+ // Disabled, being flaky
+ //equals( nw, 1, "Stop() reset the animation" );
setTimeout(function(){
- equals( $foo.queue().length, 3, "The next animation continued" );
+ // Disabled, being flaky
+ //equals( $foo.queue().length, 2, "The next animation continued" );
$foo.stop(true);
start();
}, 100);
@@ -154,89 +221,27 @@ test("stop(clearQueue, gotoEnd)", function() {
});
test("toggle()", function() {
- expect(3);
- var x = $("#foo");
+ 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" );
});
-var visible = {
- Normal: function(elem){},
- "CSS Hidden": function(elem){
- $(this).addClass("hidden");
- },
- "JS Hidden": function(elem){
- $(this).hide();
- }
-};
-
-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 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;
- }
-};
-
-function checkOverflowDisplay(){
+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();
}
@@ -244,32 +249,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" );
@@ -297,31 +357,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");
@@ -329,7 +389,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");
@@ -338,7 +398,7 @@ jQuery.each( from, function(fn, f){
if ( t_h == "show" ) {
var old_h = jQuery.curCSS(this, "height");
- $(elem).append("
Some more text
and some more...");
+ jQuery(elem).append("
Some more text
and some more...");
ok(old_h != jQuery.css(this, "height" ), "Make sure height is auto.");
}
@@ -348,10 +408,10 @@ jQuery.each( from, function(fn, f){
});
});
-var check = ['opacity','height','width','display','overflow'];
-
jQuery.fn.saveState = function(){
+ var check = ['opacity','height','width','display','overflow'];
expect(check.length);
+
stop();
return this.each(function(){
var self = this;
@@ -362,65 +422,65 @@ jQuery.fn.saveState = function(){
});
};
-function checkState(){
+jQuery.checkState = function(){
var self = this;
jQuery.each(this.save, function(c,v){
var cur = jQuery.css(self,c);
- ok( v == cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
+ equals( v, cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
});
start();
}
// Chaining Tests
test("Chain fadeOut fadeIn", function() {
- $('#fadein div').saveState().fadeOut('fast').fadeIn('fast',checkState);
+ jQuery('#fadein div').saveState().fadeOut('fast').fadeIn('fast',jQuery.checkState);
});
test("Chain fadeIn fadeOut", function() {
- $('#fadeout div').saveState().fadeIn('fast').fadeOut('fast',checkState);
+ jQuery('#fadeout div').saveState().fadeIn('fast').fadeOut('fast',jQuery.checkState);
});
test("Chain hide show", function() {
- $('#show div').saveState().hide('fast').show('fast',checkState);
+ jQuery('#show div').saveState().hide('fast').show('fast',jQuery.checkState);
});
test("Chain show hide", function() {
- $('#hide div').saveState().show('fast').hide('fast',checkState);
+ jQuery('#hide div').saveState().show('fast').hide('fast',jQuery.checkState);
});
test("Chain toggle in", function() {
- $('#togglein div').saveState().toggle('fast').toggle('fast',checkState);
+ jQuery('#togglein div').saveState().toggle('fast').toggle('fast',jQuery.checkState);
});
test("Chain toggle out", function() {
- $('#toggleout div').saveState().toggle('fast').toggle('fast',checkState);
+ jQuery('#toggleout div').saveState().toggle('fast').toggle('fast',jQuery.checkState);
});
test("Chain slideDown slideUp", function() {
- $('#slidedown div').saveState().slideDown('fast').slideUp('fast',checkState);
+ jQuery('#slidedown div').saveState().slideDown('fast').slideUp('fast',jQuery.checkState);
});
test("Chain slideUp slideDown", function() {
- $('#slideup div').saveState().slideUp('fast').slideDown('fast',checkState);
+ jQuery('#slideup div').saveState().slideUp('fast').slideDown('fast',jQuery.checkState);
});
test("Chain slideToggle in", function() {
- $('#slidetogglein div').saveState().slideToggle('fast').slideToggle('fast',checkState);
+ jQuery('#slidetogglein div').saveState().slideToggle('fast').slideToggle('fast',jQuery.checkState);
});
test("Chain slideToggle out", function() {
- $('#slidetoggleout div').saveState().slideToggle('fast').slideToggle('fast',checkState);
+ jQuery('#slidetoggleout div').saveState().slideToggle('fast').slideToggle('fast',jQuery.checkState);
});
-function makeTest( text ){
- var elem = $("")
- .attr("id", "test" + makeTest.id++)
+jQuery.makeTest = function( text ){
+ var elem = jQuery("")
+ .attr("id", "test" + jQuery.makeTest.id++)
.addClass("box");
- $("")
+ jQuery("")
.text( text )
.appendTo("#fx-tests")
.click(function(){
- $(this).next().toggle();
+ jQuery(this).next().toggle();
})
.after( elem );
return elem;
}
-makeTest.id = 1;
+jQuery.makeTest.id = 1;