Improving tests for all browsers

daffl · daffl · commit ffc83b2bf544 · 2012-06-01T10:50:53.000-06:00
diff --git a/dom/animate/animate_test.js b/dom/animate/animate_test.js
@@ -1204,10 +1204,10 @@ steal('jquery/dom/animate',
 		setTimeout(function() {
 			// Clear the queue and stop
 			div.stop();
-			ok(div.height() < 100 * 0.95, 'Animation stopped before it reached full height');
-			ok(div.width() < 150 * 0.95, 'Animation stopped before it reached full width');
+			ok(div.height() < 100 * 0.95, 'Animation stopped at ' + div.height() + ' before it reached full height of 100');
+			ok(div.width() < 150 * 0.95, 'Animation stopped at ' + div.width() + ' before it reached full width of 150');
 			start();
-		}, 100);
+		}, 50);
 	});
 
 	/* As mentioned, thoroughly abuses undocumented methods. Since the overwritten animate doesn't
diff --git a/event/drag/drag_test.js b/event/drag/drag_test.js
@@ -131,8 +131,8 @@ test("drag position", function(){
 	
 	Syn.drag("+20 +20","drag", function(){
 		var offset2 = $('#drag').offset();
-		equals(offset.top+20, Math.round(offset2.top), "top")
-		equals(offset.left+20, Math.round(offset2.left), "left")
+		equals(offset.top+20, Math.ceil(offset2.top), "top")
+		equals(offset.left+20, Math.ceil(offset2.left), "left")
 		start();
 	})
 });
@@ -178,13 +178,13 @@ test("dragdown" , function(){
 	stop();
 	Syn.drag("+20 +20","draginp", function(){
 		var offset2 = $('#dragger').offset();
-		equals(offset.top, Math.round(offset2.top), "top")
-		equals(offset.left, Math.round(offset2.left), "left")
+		equals(offset.top, Math.ceil(offset2.top), "top")
+		equals(offset.left, Math.ceil(offset2.left), "left")
 		
 	}).drag("+20 +20","dragnoprevent", function(){
 		var offset2 = $('#dragger').offset();
-		equals(offset.top+20, offset2.top, "top")
-		equals(offset.left+20, offset2.left, "left")
+		equals(offset.top+20, Math.ceil(offset2.top), "top")
+		equals(offset.left+20, Math.ceil(offset2.left), "left")
 		// IE doesn't respect preventDefault on text inputs (http://www.quirksmode.org/dom/events/click.html)
 		if(!$.browser.msie)
 			ok(draginpfocused, "First input was allowed to be focused correctly");
