X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Ffx.js;h=6b81322e2a909f6dbd71693072bbc83908ee7b9a;hb=8356871a5522ad59cac80af2ca4695079059b97e;hp=8af8031bf25c420fcbe4a9274dfd39e32e0e1a27;hpb=66c98419aa6f93deb2c3b7060191fc96c885dc29;p=jquery.git

diff --git a/test/unit/fx.js b/test/unit/fx.js
index 8af8031..6b81322 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();
@@ -64,9 +65,10 @@ test("animate option (queue === false)", function () {
 		order.push(1);
 	}});
 });
+*/
 
 test("animate duration 0", function() {
-	expect(5);
+	expect(7);
 	
 	stop();
 	
@@ -95,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(){