X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Feffects.js;h=f82c4b17788c0e255e460d7fd5860227e01a50d9;hb=a32f4d7b6c197bcb521c7b0d351328f3821b6fee;hp=32ce583b303cc6774f7a91f69bed94a40751468a;hpb=99fcf3babbba8b794fe8b0b2e20d517156cfd4d2;p=jquery.git
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 32ce583..f82c4b1 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -240,11 +240,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 +266,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);
@@ -517,7 +516,7 @@ jQuery.each( {
if ( t_h == "show" ) {
var old_h = jQuery.css(this, "height");
jQuery(this).append("
Some more text
and some more...");
- notEqual(jQuery.css(this, "height"), old_h, "Make sure height is auto.");
+ notEqual(jQuery.css(this, "height") + "px", old_h, "Make sure height is auto.");
}
start();
@@ -563,6 +562,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);
@@ -570,13 +572,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);
@@ -585,6 +592,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("