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

diff --git a/test/unit/fx.js b/test/unit/fx.js
index 4b7d371..c47fe55 100644
--- a/test/unit/fx.js
+++ b/test/unit/fx.js
@@ -57,7 +57,7 @@ test("animate option (queue === false)", 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" );
+		same( order, [ 1, 2 ], "Animations finished in the correct order" );
 		start();
 	});
 	$foo.animate({fontSize:'2em'}, {queue:false, duration:10, complete:function () {
@@ -68,7 +68,7 @@ test("animate option (queue === false)", function () {
 */
 
 test("animate duration 0", function() {
-	expect(5);
+	expect(7);
 	
 	stop();
 	
@@ -97,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(){