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

diff --git a/test/unit/fx.js b/test/unit/fx.js
index 63a3de7..87e6aea 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,21 +54,18 @@ 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);
+		isSet( 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);
@@ -102,6 +100,18 @@ test("animate duration 0", function() {
 	});	
 });
 
+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(){
 	expect(1);
 	stop();
@@ -365,7 +375,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" )