X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Feffects.js;h=b9d5c88410d02e25f0623234a12a539f0814e7cf;hb=0be7f4eb4f027dce00f11d7816290022d447d336;hp=32ce583b303cc6774f7a91f69bed94a40751468a;hpb=99fcf3babbba8b794fe8b0b2e20d517156cfd4d2;p=jquery.git

diff --git a/test/unit/effects.js b/test/unit/effects.js
index 32ce583..b9d5c88 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);
@@ -390,16 +389,16 @@ jQuery.each( {
 	"CSS Auto": function(elem,prop){
 		jQuery(elem).addClass("auto" + prop)
 			.text("This is a long string of text.");
-		return prop == "opacity" ? 1 : "";
+		return "";
 	},
 	"JS Auto": function(elem,prop){
-		jQuery(elem).css(prop,"auto")
+		jQuery(elem).css(prop,"")
 			.text("This is a long string of text.");
-		return prop == "opacity" ? 1 : "";
+		return "";
 	},
 	"CSS 100": function(elem,prop){
 		jQuery(elem).addClass("large" + prop);
-		return prop == "opacity" ? 1 : "";
+		return "";
 	},
 	"JS 100": function(elem,prop){
 		jQuery(elem).css(prop,prop == "opacity" ? 1 : "100px");
@@ -407,7 +406,7 @@ jQuery.each( {
 	},
 	"CSS 50": function(elem,prop){
 		jQuery(elem).addClass("med" + prop);
-		return prop == "opacity" ? 0.5 : "";
+		return "";
 	},
 	"JS 50": function(elem,prop){
 		jQuery(elem).css(prop,prop == "opacity" ? 0.50 : "50px");
@@ -415,7 +414,7 @@ jQuery.each( {
 	},
 	"CSS 0": function(elem,prop){
 		jQuery(elem).addClass("no" + prop);
-		return prop == "opacity" ? 0 : "";
+		return "";
 	},
 	"JS 0": function(elem,prop){
 		jQuery(elem).css(prop,prop == "opacity" ? 0 : "0px");
@@ -482,10 +481,6 @@ jQuery.each( {
 					
 				var cur_o = jQuery.style(this, "opacity");
 
-				if ( cur_o !== "" ) {
-					cur_o = jQuery.css(this, "opacity");
-				}
-	
 				if ( t_o == "hide" || t_o == "show" )
 					equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
 					
@@ -517,7 +512,12 @@ jQuery.each( {
 				if ( t_h == "show" ) {
 					var old_h = jQuery.css(this, "height");
 					jQuery(this).append("<br/>Some more text<br/>and some more...");
-					notEqual(jQuery.css(this, "height"), old_h, "Make sure height is auto.");
+
+					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();
@@ -563,6 +563,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 +573,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 +593,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("<div></div>")
 		.attr("id", "test" + jQuery.makeTest.id++)