X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Ffx.js;h=cb131ae7fae22e9f9eede0a4e19cb9f5b541ae55;hb=82ba3709eec42dd8da33eb2023fda927166260eb;hp=481b172225121ffd5dc0bc4da8b4de0319f640ce;hpb=ffbedf0262b3eea906f39c0115b818d7456a3994;p=jquery.git

diff --git a/test/unit/fx.js b/test/unit/fx.js
index 481b172..cb131ae 100644
--- a/test/unit/fx.js
+++ b/test/unit/fx.js
@@ -1,17 +1,12 @@
 module("fx");
 
 test("animate(Hash, Object, Function)", function() {
-	expect(3);
+	expect(1);
 	stop();
 	var hash = {opacity: 'show'};
 	var hashCopy = $.extend({}, hash);
 	$('#foo').animate(hash, 0, function() {
-		ok( hash.opacity == hashCopy.opacity, 'Check if animate changed the hash parameter' );
-	});
-	// using contents will get comments regular, text, and comment nodes
-	$("#nonnodes").contents().animate({paddingLeft:"5px"}, 100, function () {
-		equals(this.nodeType, 1, "Check node,textnode,comment animate just does real nodes" );
-		equals($(this).css("paddingLeft"), "5px", "Check node,textnode,comment animate just does real nodes" );
+		equals( hash.opacity, hashCopy.opacity, 'Check if animate changed the hash parameter' );
 		start();
 	});
 });
@@ -241,8 +236,8 @@ var to = {
 function checkOverflowDisplay(){
 	var o = jQuery.css( this, "overflow" );
 
-	ok(o == "visible", "Overflow should be visible: " + o);
-	ok(jQuery.css( this, "display" ) == "inline", "Display shouldn't be tampered with.");
+	equals(o, "visible", "Overflow should be visible: " + o);
+	equals(jQuery.css( this, "display" ), "inline", "Display shouldn't be tampered with.");
 
 	start();
 }
@@ -303,31 +298,31 @@ jQuery.each( from, function(fn, f){
 	
 			elem.animate(anim, 50, function(){
 				if ( t_w == "show" )
-					ok( this.style.display == "block", "Showing, display should block: " + this.style.display);
+					equals( this.style.display, "block", "Showing, display should block: " + this.style.display);
 					
 				if ( t_w == "hide"||t_w == "show" )
-					ok(this.style.width.indexOf(f_w) == 0, "Width must be reset to " + f_w + ": " + this.style.width);
+					equals(this.style.width.indexOf(f_w), 0, "Width must be reset to " + f_w + ": " + this.style.width);
 					
 				if ( t_h == "hide"||t_h == "show" )
-					ok(this.style.height.indexOf(f_h) == 0, "Height must be reset to " + f_h + ": " + this.style.height);
+					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");
 				if ( cur_o !== "" ) cur_o = parseFloat( cur_o );
 	
 				if ( t_o == "hide"||t_o == "show" )
-					ok(cur_o == f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
+					equals(cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o);
 					
 				if ( t_w == "hide" )
-					ok(this.style.display == "none", "Hiding, display should be none: " + this.style.display);
+					equals(this.style.display, "none", "Hiding, display should be none: " + this.style.display);
 					
 				if ( t_o.constructor == Number ) {
-					ok(cur_o == t_o, "Final opacity should be " + t_o + ": " + cur_o);
+					equals(cur_o, t_o, "Final opacity should be " + t_o + ": " + cur_o);
 					
 					ok(jQuery.curCSS(this, "opacity") != "" || cur_o == t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o);
 				}
 					
 				if ( t_w.constructor == Number ) {
-					ok(this.style.width == t_w + "px", "Final width should be " + t_w + ": " + this.style.width);
+					equals(this.style.width, t_w + "px", "Final width should be " + t_w + ": " + this.style.width);
 					
 					var cur_w = jQuery.css(this,"width");
 
@@ -335,7 +330,7 @@ jQuery.each( from, function(fn, f){
 				}
 					
 				if ( t_h.constructor == Number ) {
-					ok(this.style.height == t_h + "px", "Final height should be " + t_h + ": " + this.style.height);
+					equals(this.style.height, t_h + "px", "Final height should be " + t_h + ": " + this.style.height);
 					
 					var cur_h = jQuery.css(this,"height");
 
@@ -372,7 +367,7 @@ function checkState(){
 	var self = this;
 	jQuery.each(this.save, function(c,v){
 		var cur = jQuery.css(self,c);
-		ok( v == cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
+		equals( v, cur, "Make sure that " + c + " is reset (Old: " + v + " Cur: " + cur + ")");
 	});
 	start();
 }