X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Ffx.js;h=c47fe558f3ad29abccfc0597288905a80f25971e;hb=513053d62ba86ca6ab1f4646fdac3ec6819b2db9;hp=63a3de7a6a350341eced86f611d880169b9a9ce3;hpb=7c04a64016c1f295dfdf4e731f693f8400a987bc;p=jquery.git

diff --git a/test/unit/fx.js b/test/unit/fx.js
index 63a3de7..c47fe55 100644
--- a/test/unit/fx.js
+++ b/test/unit/fx.js
@@ -46,6 +46,7 @@ test("animate(Hash, Object, Function)", function() {
 	});
 });
 
+/* // This test ends up being flaky depending upon the CPU load
 test("animate option (queue === false)", function () {
 	expect(1);
 	stop();
@@ -53,24 +54,21 @@ test("animate option (queue === false)", function () {
 	var order = [];
 
 	var $foo = jQuery("#foo");
-	$foo.animate({width:'100px'}, 200, function () {
+	$foo.animate({width:'100px'}, 3000, function () {
 		// should finish after unqueued animation so second
 		order.push(2);
+		same( order, [ 1, 2 ], "Animations finished in the correct order" );
+		start();
 	});
 	$foo.animate({fontSize:'2em'}, {queue:false, duration:10, complete:function () {
 		// short duration and out of queue so should finish first
 		order.push(1);
 	}});
-	$foo.animate({height:'100px'}, 10, function() {
-		// queued behind the first animation so should finish third 
-		order.push(3);
-		isSet( order, [ 1, 2, 3], "Animations finished in the correct order" );
-		start();
-	});
 });
+*/
 
 test("animate duration 0", function() {
-	expect(5);
+	expect(7);
 	
 	stop();
 	
@@ -99,7 +97,27 @@ test("animate duration 0", function() {
 		// Failed until [6115]
 		equals( counter, 5, "One synchronic and one asynchronic" );
 		start();
-	});	
+	});
+	
+	var $elem = jQuery("<div />");
+	$elem.show(0, function(){ 
+		ok(true, "Show's callback with no duration");
+	});
+	$elem.hide(0, function(){ 
+		ok(true, "Show's callback with no duration");
+	});
+});
+
+test("animate hyphenated properties", function(){
+	expect(1);
+	stop();
+
+	jQuery("#nothiddendiv")
+		.css("font-size", 10)
+		.animate({"font-size": 20}, 200, function(){
+			equals( this.style.fontSize, "20px", "The font-size property was animated." );
+			start();
+		});
 });
 
 test("animate non-element", function(){
@@ -365,7 +383,7 @@ jQuery.each( {
 				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);
 					
-				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" )