X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Feffects.js;h=b9d5c88410d02e25f0623234a12a539f0814e7cf;hb=49f6f341814dce07b9fe2eff0052feb5ef286dfd;hp=f82c4b17788c0e255e460d7fd5860227e01a50d9;hpb=1f667aa035b3e4885d6b35fa9aa4990310f131af;p=jquery.git

diff --git a/test/unit/effects.js b/test/unit/effects.js
index f82c4b1..b9d5c88 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -389,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");
@@ -406,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");
@@ -414,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");
@@ -481,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);
 					
@@ -516,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") + "px", 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();