test fixes

Author: ctcpip

test/unit/ajax.js

@@ -70,52 +70,68 @@ test("jQuery.ajax() - success callbacks - (url, options) syntax", function() {
 	}, 13);
 });
 
-ajaxTest( "jQuery.ajax() - do not execute js (crossOrigin)", 2, function( assert ) {
-	return {
-		create: function( options ) {
-			options.crossDomain = true;
-			return jQuery.ajax( url( "data/script.php?header=ecma" ), options );
-		},
-		success: function() {
-			assert.ok( true, "success" );
-		},
-		complete: function() {
-			assert.ok( true, "complete" );
-		}
-	};
-} );
+test( "jQuery.ajax() - do not execute js (crossOrigin) 1", 2, function() {
 
-ajaxTest( "jQuery.ajax() - execute js for crossOrigin when dataType option is provided", 3,
-	function( assert ) {
-		return {
-			create: function( options ) {
-				options.crossDomain = true;
-				options.dataType = "script";
-				return jQuery.ajax( url( "data/script.php?header=ecma" ), options );
+	jQuery.ajaxSetup({ timeout: 0 });
+
+	stop();
+
+	setTimeout(function(){
+		jQuery.ajax({
+			url: url( "data/script.php?header=ecma" ),
+			crossDomain: true,
+			success: function() {
+				ok( true, "success" );
 			},
+			complete: function() {
+				ok( true, "complete" );
+				start();
+			}
+		});
+	}, 13);
+} );
+
+test( "jQuery.ajax() - execute js for crossOrigin when dataType option is provided", 3, function() {
+
+	jQuery.ajaxSetup({ timeout: 0 });
+
+	stop();
+
+	setTimeout(function(){
+		jQuery.ajax({
+			url: url( "data/script.php?header=ecma" ),
+			crossDomain: true,
+			dataType: "script",
 			success: function() {
-				assert.ok( true, "success" );
+				ok( true, "success" );
 			},
 			complete: function() {
-				assert.ok( true, "complete" );
+				ok( true, "complete" );
+				start();
 			}
-		};
-	}
-);
+		});
+	}, 13);
+} );
 
-ajaxTest( "jQuery.ajax() - do not execute js (crossOrigin)", 2, function( assert ) {
-	return {
-		create: function( options ) {
-			options.crossDomain = true;
-			return jQuery.ajax( url( "data/script.php" ), options );
-		},
-		success: function() {
-			assert.ok( true, "success" );
-		},
-		complete: function() {
-			assert.ok( true, "complete" );
-		}
-	};
+test( "jQuery.ajax() - do not execute js (crossOrigin) 2", 2, function() {
+
+	jQuery.ajaxSetup({ timeout: 0 });
+
+	stop();
+
+	setTimeout(function(){
+		jQuery.ajax({
+			url: url( "data/script.php" ),
+			crossDomain: true,
+			success: function() {
+				ok( true, "success" );
+			},
+			complete: function() {
+				ok( true, "complete" );
+				start();
+			}
+		});
+	}, 13);
 } );
 
 test("jQuery.ajax() - success callbacks (late binding)", function() {

test/unit/core.js

@@ -12,7 +12,7 @@ test("Basic requirements", function() {
 });
 
 test("jQuery()", function() {
-	expect(29);
+	expect(25);
 
 	// Basic constructor's behavior
 
@@ -56,7 +56,7 @@ test("jQuery()", function() {
 	var img = jQuery("<img/>");
 	equals( img.length, 1, "Correct number of elements generated for img" );
 	equals( img.parent().length, 0, "Make sure that the generated HTML has no parent." );
-	var div = jQuery("<div/><hr/><code/><b/>");
+	var div = jQuery("<div></div><hr><code></code><b></b>");
 	equals( div.length, 4, "Correct number of elements generated for div hr code b" );
 	equals( div.parent().length, 0, "Make sure that the generated HTML has no parent." );
 
@@ -855,10 +855,10 @@ test("jQuery.extend(Object, Object)", function() {
 });
 
 QUnit.test( "jQuery.extend( true, ... ) Object.prototype pollution", function( assert ) {
-	assert.expect( 1 );
+	expect( 1 );
 
 	jQuery.extend( true, {}, JSON.parse( "{\"__proto__\": {\"devMode\": true}}" ) );
-	assert.ok( !( "devMode" in {} ), "Object.prototype not polluted" );
+	ok( !( "devMode" in {} ), "Object.prototype not polluted" );
 } );
 
 test("jQuery.each(Object,Function)", function() {

test/unit/css.js

@@ -23,7 +23,7 @@ test("css(String|Hash)", function() {
 	equals( div.css("width"), "4px", "Width on disconnected node." );
 	equals( div.css("height"), "4px", "Height on disconnected node." );
 
-	var div2 = jQuery( "<div style='display:none;'><input type='text' style='height:20px;'/><textarea style='height:20px;'/><div style='height:20px;'></div></div>").appendTo("body");
+	var div2 = jQuery( "<div style='display:none;'><input type='text' style='height:20px;'/><textarea style='height:20px;'></textarea><div style='height:20px;'></div></div>").appendTo("body");
 
 	equals( div2.find("input").css("height"), "20px", "Height on hidden input." );
 	equals( div2.find("textarea").css("height"), "20px", "Height on hidden textarea." );

test/unit/manipulation.js

@@ -1129,7 +1129,7 @@ var testHtml = function(valueObj) {
 	}
 	ok( pass, "Set HTML" );
 
-	div = jQuery("<div/>").html( valueObj("<div id='parent_1'><div id='child_1'/></div><div id='parent_2'/>") );
+	div = jQuery("<div>").html( valueObj("<div id='parent_1'><div id='child_1'></div></div><div id='parent_2'></div>") );
 
 	equals( div.children().length, 2, "Make sure two child nodes exist." );
 	equals( div.children().children().length, 1, "Make sure that a grandchild exists." );