X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Feffects.js;h=284eec3f8c8d3b484fae744a29d47281b2109042;hb=0cdcef5b364fa3c89d7f27935e77b453f4a56efd;hp=467631c7bee1a6d754115f25d7e57c5a85463890;hpb=2c28f229e5eb49f1469fd36ee979529a492f0f42;p=jquery.git
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 467631c..284eec3 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -1,5 +1,10 @@
module("effects");
+test("sanity check", function() {
+ expect(1);
+ ok( jQuery("#dl:visible, #main:visible, #foo:visible").length === 3, "QUnit state is correct for testing effects" );
+});
+
test("show()", function() {
expect(23);
var pass = true, div = jQuery("#main div");
@@ -61,7 +66,7 @@ test("show()", function() {
test("show(Number) - other displays", function() {
expect(15);
- reset();
+ QUnit.reset();
stop();
jQuery("#main").append('');
@@ -87,7 +92,10 @@ test("show(Number) - other displays", function() {
};
jQuery.each(test, function(selector, expected) {
- var elem = jQuery(selector, "#show-tests").show(1, function() {
+ // IE sometimes has issues with chained functions referencing
+ // assignments from outside the closure
+ var elem = jQuery(selector, "#show-tests");
+ elem.show(1, function() {
equals( elem.css("display"), expected, "Show using correct display type for " + selector );
if ( ++num === 15 ) {
start();
@@ -116,6 +124,71 @@ test("animate negative height", function() {
});
});
+test("animate inline width/height", function() {
+ expect(3);
+ stop();
+ jQuery("#foo").css({ display: "inline", width: '', height: '' }).animate({ width: 42, height: 42 }, 100, function() {
+ equals( jQuery(this).css("display"), jQuery.support.inlineBlockNeedsLayout ? "inline" : "inline-block", "inline-block was set on non-floated inline element when animating width/height" );
+ equals( this.offsetWidth, 42, "width was animated" );
+ equals( this.offsetHeight, 42, "height was animated" );
+ start();
+ });
+});
+
+test("animate block width/height", function() {
+ expect(3);
+ stop();
+ jQuery("#foo").css({ display: "block", width: 20, height: 20 }).animate({ width: 42, height: 42 }, 100, function() {
+ equals( jQuery(this).css("display"), "block", "inline-block was not set on block element when animating width/height" );
+ equals( this.offsetWidth, 42, "width was animated" );
+ equals( this.offsetHeight, 42, "height was animated" );
+ start();
+ });
+});
+
+test("animate table width/height", function() {
+ expect(1);
+ stop();
+
+ var displayMode = jQuery("#table").css("display") !== "table" ? "block" : "table";
+
+ jQuery("#table").animate({ width: 42, height: 42 }, 100, function() {
+ equals( jQuery(this).css("display"), displayMode, "display mode is correct" );
+ start();
+ });
+});
+
+test("animate table-cell width/height", function() {
+ expect(3);
+ stop();
+ var td = jQuery("#table")
+ .attr({ "cellspacing": 0, "cellpadding": 0, "border": 0 })
+ .append(" |
")
+ .find("td");
+
+ // IE<8 uses âblockâ instead of the correct display type
+ var displayMode = td.css("display") !== "table-cell" ? "block" : "table-cell";
+
+ td.animate({ width: 10, height: 10 }, 100, function() {
+ equals( jQuery(this).css("display"), displayMode, "display mode is correct" );
+ equals( this.offsetWidth, 20, "width animated to shrink wrap point" );
+ equals( this.offsetHeight, 20, "height animated to shrink wrap point" );
+ start();
+ });
+});
+
+test("animate resets overflow-x and overflow-y when finished", function() {
+ expect(2);
+ stop();
+ jQuery("#foo")
+ .css({ display: "block", width: 20, height: 20, overflowX: "visible", overflowY: "auto" })
+ .animate({ width: 42, height: 42 }, 100, function() {
+ equals( this.style.overflowX, "visible", "overflow-x is visible" );
+ equals( this.style.overflowY, "auto", "overflow-y is auto" );
+ start();
+ });
+});
+
/* // This test ends up being flaky depending upon the CPU load
test("animate option (queue === false)", function () {
expect(1);
@@ -240,11 +313,11 @@ test("stop()", function() {
$foo.animate({ width:'show' }, 1000);
setTimeout(function(){
var nw = $foo.width();
- ok( nw != w, "An animation occurred " + nw + "px " + w + "px");
+ notEqual( 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");
+ notEqual( nw, w, "Stop didn't reset the animation " + nw + "px " + w + "px");
setTimeout(function(){
equals( nw, $foo.width(), "The animation didn't continue" );
start();
@@ -266,13 +339,12 @@ test("stop() - several in queue", function() {
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");
+ notEqual( 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" );
+ notEqual( nw, w, "Stop didn't reset the animation " + nw + "px " + w + "px");
+
$foo.stop(true);
start();
}, 100);
@@ -393,7 +465,7 @@ jQuery.each( {
return "";
},
"JS Auto": function(elem,prop){
- jQuery(elem).css(prop,"auto")
+ jQuery(elem).css(prop,"")
.text("This is a long string of text.");
return "";
},
@@ -475,15 +547,14 @@ jQuery.each( {
equals( this.style.display, "block", "Showing, display should block: " + this.style.display);
if ( t_w == "hide"||t_w == "show" )
- equals(this.style.width.indexOf(f_w), 0, "Width must be reset to " + f_w + ": " + this.style.width);
+ ok(f_w === "" ? this.style.width === f_w : this.style.width.indexOf(f_w) === 0, "Width must be reset to " + f_w + ": " + this.style.width);
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);
+ ok(f_h === "" ? this.style.height === f_h : this.style.height.indexOf(f_h) === 0, "Height must be reset to " + f_h + ": " + this.style.height);
var cur_o = jQuery.style(this, "opacity");
- if ( cur_o !== "" ) cur_o = parseFloat( cur_o );
-
- if ( t_o == "hide"||t_o == "show" )
+
+ if ( t_o == "hide" || t_o == "show" )
equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
if ( t_w == "hide" )
@@ -492,7 +563,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 ) {
@@ -512,9 +583,14 @@ jQuery.each( {
}
if ( t_h == "show" ) {
- var old_h = jQuery.curCSS(this, "height");
- jQuery(elem).append("
Some more text
and some more...");
- ok(old_h != jQuery.css(this, "height" ), "Make sure height is auto.");
+ var old_h = jQuery.css(this, "height");
+ jQuery(this).append("
Some more text
and some more...");
+
+ if ( /Auto/.test( fn ) ) {
+ notEqual(jQuery.css(this, "height"), old_h, "Make sure height is auto.");
+ } else {
+ equals(jQuery.css(this, "height"), old_h, "Make sure height is not auto.");
+ }
}
start();
@@ -532,7 +608,7 @@ jQuery.fn.saveState = function(){
var self = this;
self.save = {};
jQuery.each(check, function(i,c){
- self.save[c] = jQuery.css(self,c);
+ self.save[c] = self.style[ c ] || jQuery.css(self,c);
});
});
};
@@ -540,8 +616,8 @@ jQuery.fn.saveState = function(){
jQuery.checkState = function(){
var self = this;
jQuery.each(this.save, function(c,v){
- var cur = jQuery.css(self,c);
- equals( v, cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
+ var cur = self.style[ c ] || jQuery.css(self, c);
+ equals( cur, v, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
});
start();
}
@@ -560,6 +636,9 @@ test("Chain hide show", function() {
test("Chain show hide", function() {
jQuery('#hide div').saveState().show('fast').hide('fast',jQuery.checkState);
});
+test("Chain show hide with easing and callback", function() {
+ jQuery('#hide div').saveState().show('fast').hide('fast','linear',jQuery.checkState);
+});
test("Chain toggle in", function() {
jQuery('#togglein div').saveState().toggle('fast').toggle('fast',jQuery.checkState);
@@ -567,13 +646,18 @@ test("Chain toggle in", function() {
test("Chain toggle out", function() {
jQuery('#toggleout div').saveState().toggle('fast').toggle('fast',jQuery.checkState);
});
-
+test("Chain toggle out with easing and callback", function() {
+ jQuery('#toggleout div').saveState().toggle('fast').toggle('fast','linear',jQuery.checkState);
+});
test("Chain slideDown slideUp", function() {
jQuery('#slidedown div').saveState().slideDown('fast').slideUp('fast',jQuery.checkState);
});
test("Chain slideUp slideDown", function() {
jQuery('#slideup div').saveState().slideUp('fast').slideDown('fast',jQuery.checkState);
});
+test("Chain slideUp slideDown with easing and callback", function() {
+ jQuery('#slideup div').saveState().slideUp('fast').slideDown('fast','linear',jQuery.checkState);
+});
test("Chain slideToggle in", function() {
jQuery('#slidetogglein div').saveState().slideToggle('fast').slideToggle('fast',jQuery.checkState);
@@ -582,6 +666,10 @@ test("Chain slideToggle out", function() {
jQuery('#slidetoggleout div').saveState().slideToggle('fast').slideToggle('fast',jQuery.checkState);
});
+test("Chain fadeTo 0.5 1.0 with easing and callback)", function() {
+ jQuery('#fadeto div').saveState().fadeTo('fast',0.5).fadeTo('fast',1.0,'linear',jQuery.checkState);
+});
+
jQuery.makeTest = function( text ){
var elem = jQuery("")
.attr("id", "test" + jQuery.makeTest.id++)