X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=3cb90aa7886b7be41fa13f487b7764151164faa5;hb=b0c7df65d0f92b77752e8f9b33898d0e3b2c05e8;hp=dce86d828e2b18554a67beeca3e3714bf7c6c13b;hpb=606b863edaff29035960e4d813b45d63b8d92876;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index dce86d8..3cb90aa 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -12,14 +12,19 @@ test("Basic requirements", function() {
 });
 
 test("$()", function() {
-	expect(5);
+	expect(4);
 	
 	var main = $("#main");
 	isSet( $("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" );
 	
+/*
+	// disabled since this test was doing nothing. i tried to fix it but i'm not sure
+	// what the expected behavior should even be. FF returns "\n" for the text node
 	// make sure this is handled
-	$('<p>\r\n</p>');
-	ok( true, "Check for \\r and \\n in jQuery()" );
+	var crlfContainer = $('<p>\r\n</p>');
+	var x = crlfContainer.contents().get(0).nodeValue;
+	equals( x, what???, "Check for \\r and \\n in jQuery()" );
+*/
 	
 	/* // Disabled until we add this functionality in
 	var pass = true;
@@ -38,6 +43,63 @@ test("$()", function() {
 	equals( div.length, 4, "Correct number of elements generated for div hr code b" );
 });
 
+test("browser", function() {
+	expect(13);
+	var browsers = {
+		//Internet Explorer
+		"Mozilla/5.0 (Windows; U; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 2.0.50727)": "6.0",
+		"Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 5.1; .NET CLR 1.1.4322; InfoPath.1; .NET CLR 2.0.50727)": "7.0",
+		/** Failing #1876
+		 * "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; .NET CLR 2.0.50727; .NET CLR 1.1.4322; .NET CLR 3.0.04506.30)": "7.0",
+		 */
+		//Browsers with Gecko engine
+		//Mozilla
+		"Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915" : "1.7.12",
+		//Firefox
+		"Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.3) Gecko/20070309 Firefox/2.0.0.3": "1.8.1.3",
+		//Netscape
+		"Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20070321 Netscape/8.1.3" : "1.7.5",
+		//Flock
+		"Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.11) Gecko/20070321 Firefox/1.5.0.11 Flock/0.7.12" : "1.8.0.11",
+		//Opera browser
+		"Opera/9.20 (X11; Linux x86_64; U; en)": "9.20",
+		"Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; en) Opera 9.20" : "9.20",
+		"Mozilla/5.0 (Windows NT 5.1; U; pl; rv:1.8.0) Gecko/20060728 Firefox/1.5.0 Opera 9.20": "9.20",
+		//WebKit engine
+		"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; sv-se) AppleWebKit/418.9 (KHTML, like Gecko) Safari/419.3": "418.9",
+		"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/418.8 (KHTML, like Gecko) Safari/419.3" : "418.8",
+		"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; sv-se) AppleWebKit/312.8 (KHTML, like Gecko) Safari/312.5": "312.8",
+		//Other user agent string
+		"Other browser's user agent 1.0":null
+	};
+	for (var i in browsers) {
+		var v = i.toLowerCase().match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ); // RegEx from Core jQuery.browser.version check
+		version = v ? v[1] : null;
+		equals( version, browsers[i], "Checking UA string" );
+	}
+});
+
+test("noConflict", function() {
+	expect(6);
+	
+	var old = jQuery;
+	var newjQuery = jQuery.noConflict();
+
+	ok( newjQuery == old, "noConflict returned the jQuery object" );
+	ok( jQuery == old, "Make sure jQuery wasn't touched." );
+	ok( $ == "$", "Make sure $ was reverted." );
+
+	jQuery = $ = old;
+
+	newjQuery = jQuery.noConflict(true);
+
+	ok( newjQuery == old, "noConflict returned the jQuery object" );
+	ok( jQuery == "jQuery", "Make sure jQuery was reverted." );
+	ok( $ == "$", "Make sure $ was reverted." );
+
+	jQuery = $ = old;
+});
+
 test("isFunction", function() {
 	expect(21);
 
@@ -115,26 +177,60 @@ test("isFunction", function() {
 
 		ok( jQuery.isFunction(fn), "Recursive Function Call" );
 
-    	fn({ some: "data" });
+		fn({ some: "data" });
 	};
 
 	callme(function(){
-    	callme(function(){});
+		callme(function(){});
 	});
 });
 
+var foo = false;
+
 test("$('html')", function() {
-	expect(2);
-	
+	expect(6);
+
 	reset();
-	ok( $("<script>var foo='test';</script>")[0], "Creating a script" );
+	foo = false;
+	var s = $("<script>var foo='test';</script>")[0];
+	ok( s, "Creating a script" );
+	ok( !foo, "Make sure the script wasn't executed prematurely" );
+	$("body").append(s);
+	ok( foo, "Executing a scripts contents in the right context" );
 	
 	reset();
 	ok( $("<link rel='stylesheet'/>")[0], "Creating a link" );
 	
 	reset();
+
+	var j = $("<span>hi</span> there <!-- mon ami -->");
+	ok( j.length >= 2, "Check node,textnode,comment creation (some browsers delete comments)" );
+
+	ok( !$("<option>test</option>")[0].selected, "Make sure that options are auto-selected #2050" );
+});
+
+test("$('html', context)", function() {
+	expect(1);
+
+	var $div = $("<div/>");
+	var $span = $("<span/>", $div);
+	equals($span.length, 1, "Verify a span created with a div context works, #1763");
 });
 
+if ( !isLocal ) {
+test("$(selector, xml).text(str) - Loaded via XML document", function() {
+	expect(2);
+	stop();
+	$.get('data/dashboard.xml', function(xml) { 
+		// tests for #1419 where IE was a problem
+		equals( $("tab:first", xml).text(), "blabla", "Verify initial text correct" );
+		$("tab:first", xml).text("newtext");
+		equals( $("tab:first", xml).text(), "newtext", "Verify new text correct" );
+		start();
+	});
+});
+}
+
 test("length", function() {
 	expect(1);
 	ok( $("p").length == 6, "Get Number of Elements Found" );
@@ -155,11 +251,15 @@ test("get(Number)", function() {
 	ok( $("p").get(0) == document.getElementById("firstp"), "Get A Single Element" );
 });
 
-test("add(String|Element|Array)", function() {
-	expect(7);
+test("add(String|Element|Array|undefined)", function() {
+	expect(8);
 	isSet( $("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" );
 	isSet( $("#sndp").add( $("#en")[0] ).add( $("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" );
 	ok( $([]).add($("#form")[0].elements).length >= 13, "Check elements from array" );
+
+	// For the time being, we're discontinuing support for $(form.elements) since it's ambiguous in IE
+	// use $([]).add(form.elements) instead.
+	//equals( $([]).add($("#form")[0].elements).length, $($("#form")[0].elements).length, "Array in constructor must equals array in add()" );
 	
 	var x = $([]).add($("<p id='x1'>xxx</p>")).add($("<p id='x2'>xxx</p>"));
 	ok( x[0].id == "x1", "Check on-the-fly element1" );
@@ -168,6 +268,9 @@ test("add(String|Element|Array)", function() {
 	var x = $([]).add("<p id='x1'>xxx</p>").add("<p id='x2'>xxx</p>");
 	ok( x[0].id == "x1", "Check on-the-fly element1" );
 	ok( x[1].id == "x2", "Check on-the-fly element2" );
+	
+	var notDefined;
+	equals( $([]).add(notDefined).length, 0, "Check that undefined adds nothing." );
 });
 
 test("each(Function)", function() {
@@ -176,7 +279,7 @@ test("each(Function)", function() {
 	div.each(function(){this.foo = 'zoo';});
 	var pass = true;
 	for ( var i = 0; i < div.size(); i++ ) {
-	  if ( div.get(i).foo != "zoo" ) pass = false;
+		if ( div.get(i).foo != "zoo" ) pass = false;
 	}
 	ok( pass, "Execute a function, Relative" );
 });
@@ -195,8 +298,9 @@ test("index(Object)", function() {
 });
 
 test("attr(String)", function() {
-	expect(13);
+	expect(20);
 	ok( $('#text1').attr('value') == "Test", 'Check for value attribute' );
+	ok( $('#text1').attr('value', "Test2").attr('defaultValue') == "Test", 'Check for defaultValue attribute' );
 	ok( $('#text1').attr('type') == "text", 'Check for type attribute' );
 	ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' );
 	ok( $('#check1').attr('type') == "checkbox", 'Check for type attribute' );
@@ -208,20 +312,28 @@ test("attr(String)", function() {
 	ok( $('#name').attr('name') == "name", 'Check for name attribute' );
 	ok( $('#text1').attr('name') == "action", 'Check for name attribute' );
 	ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
+	ok( $('#text1').attr('maxlength') == '30', 'Check for maxlength attribute' );
+	ok( $('#text1').attr('maxLength') == '30', 'Check for maxLength attribute' );
+	ok( $('#area1').attr('maxLength') == '30', 'Check for maxLength attribute' );
+	ok( $('#select2').attr('selectedIndex') == 3, 'Check for selectedIndex attribute' );
+	ok( $('#foo').attr('nodeName') == 'DIV', 'Check for nodeName attribute' );
+	ok( $('#foo').attr('tagName') == 'DIV', 'Check for tagName attribute' );
 	
 	$('<a id="tAnchor5"></a>').attr('href', '#5').appendTo('#main'); // using innerHTML in IE causes href attribute to be serialized to the full path
 	ok( $('#tAnchor5').attr('href') == "#5", 'Check for non-absolute href (an anchor)' );
 });
 
-test("attr(String) in XML Files", function() {
-	expect(2);
-	stop();
-	$.get("data/dashboard.xml", function(xml) {
-		ok( $("locations", xml).attr("class") == "foo", "Check class attribute in XML document" );
-		ok( $("location", xml).attr("for") == "bar", "Check for attribute in XML document" );
-		start();
+if ( !isLocal ) {
+	test("attr(String) in XML Files", function() {
+		expect(2);
+		stop();
+		$.get("data/dashboard.xml", function(xml) {
+			ok( $("locations", xml).attr("class") == "foo", "Check class attribute in XML document" );
+			ok( $("location", xml).attr("for") == "bar", "Check for attribute in XML document" );
+			start();
+		});
 	});
-});
+}
 
 test("attr(String, Function)", function() {
 	expect(2);
@@ -233,18 +345,18 @@ test("attr(Hash)", function() {
 	expect(1);
 	var pass = true;
 	$("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){
-	  if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
+		if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
 	});
 	ok( pass, "Set Multiple Attributes" );
 });
 
 test("attr(String, Object)", function() {
-	expect(12);
+	expect(17);
 	var div = $("div");
 	div.attr("foo", "bar");
 	var pass = true;
 	for ( var i = 0; i < div.size(); i++ ) {
-	  if ( div.get(i).getAttribute('foo') != "bar" ) pass = false;
+		if ( div.get(i).getAttribute('foo') != "bar" ) pass = false;
 	}
 	ok( pass, "Set Attribute" );
 
@@ -262,6 +374,23 @@ test("attr(String, Object)", function() {
 	ok( document.getElementById('text1').readOnly == false, 'Set readonly attribute' );
 	$("#name").attr('maxlength', '5');
 	ok( document.getElementById('name').maxLength == '5', 'Set maxlength attribute' );
+	$("#name").attr('maxLength', '10');
+	ok( document.getElementById('name').maxLength == '10', 'Set maxlength attribute' );
+
+	// for #1070
+	$("#name").attr('someAttr', '0');
+	equals( $("#name").attr('someAttr'), '0', 'Set attribute to a string of "0"' );
+	$("#name").attr('someAttr', 0);
+	equals( $("#name").attr('someAttr'), 0, 'Set attribute to the number 0' );
+	$("#name").attr('someAttr', 1);
+	equals( $("#name").attr('someAttr'), 1, 'Set attribute to the number 1' );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+
+	j.attr("name", "attrvalue");
+	equals( j.attr("name"), "attrvalue", "Check node,textnode,comment for attr" );
+	j.removeAttr("name")
 
 	reset();
 
@@ -286,19 +415,21 @@ test("attr(String, Object)", function() {
 	equals( "checkbox", $(check).attr('type'), "Verify that you can change the type of an input element that isn't in the DOM" );
 });
 
-test("attr(String, Object) - Loaded via XML document", function() {
-	expect(2);
-	stop();
-	$.get('data/dashboard.xml', function(xml) { 
-  		var titles = [];
-  		$('tab', xml).each(function() {
-    			titles.push($(this).attr('title'));
-  		});
-  		ok( titles[0] == 'Location', 'attr() in XML context: Check first title' );
-  		ok( titles[1] == 'Users', 'attr() in XML context: Check second title' );
-  		start();
+if ( !isLocal ) {
+	test("attr(String, Object) - Loaded via XML document", function() {
+		expect(2);
+		stop();
+		$.get('data/dashboard.xml', function(xml) { 
+			var titles = [];
+			$('tab', xml).each(function() {
+				titles.push($(this).attr('title'));
+			});
+			equals( titles[0], 'Location', 'attr() in XML context: Check first title' );
+			equals( titles[1], 'Users', 'attr() in XML context: Check second title' );
+			start();
+		});
 	});
-});
+}
 
 test("css(String|Hash)", function() {
 	expect(19);
@@ -331,7 +462,7 @@ test("css(String|Hash)", function() {
 });
 
 test("css(String, Object)", function() {
-	expect(18);
+	expect(21);
 	ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
 	$('#foo').css('display', 'none');
 	ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
@@ -355,6 +486,84 @@ test("css(String, Object)", function() {
 	});
 	$('#foo').css('opacity', '');
 	ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );
+	// for #1438, IE throws JS error when filter exists but doesn't have opacity in it
+	if (jQuery.browser.msie) {
+		$('#foo').css("filter", "progid:DXImageTransform.Microsoft.Chroma(color='red');");
+	}
+	equals( $('#foo').css('opacity'), '1', "Assert opacity is 1 when a different filter is set in IE, #1438" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.css("padding-left", "1px");
+	equals( j.css("padding-left"), "1px", "Check node,textnode,comment css works" );
+
+	// opera sometimes doesn't update 'display' correctly, see #2037
+	$("#t2037")[0].innerHTML = $("#t2037")[0].innerHTML
+	equals( $("#t2037 .hidden").css("display"), "none", "Make sure browser thinks it is hidden" );
+});
+
+test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {
+	expect(4);
+
+	var $checkedtest = $("#checkedtest");
+	// IE6 was clearing "checked" in jQuery.css(elem, "height");
+	jQuery.css($checkedtest[0], "height");
+	ok( !! $(":radio:first", $checkedtest).attr("checked"), "Check first radio still checked." );
+	ok( ! $(":radio:last", $checkedtest).attr("checked"), "Check last radio still NOT checked." );
+	ok( !! $(":checkbox:first", $checkedtest).attr("checked"), "Check first checkbox still checked." );
+	ok( ! $(":checkbox:last", $checkedtest).attr("checked"), "Check last checkbox still NOT checked." );
+});
+
+test("width()", function() {
+	expect(9);
+
+	var $div = $("#nothiddendiv");
+	$div.width(30);
+	equals($div.width(), 30, "Test set to 30 correctly");
+	$div.width(-1); // handle negative numbers by ignoring #1599
+	equals($div.width(), 30, "Test negative width ignored");
+	$div.css("padding", "20px");
+	equals($div.width(), 30, "Test padding specified with pixels");
+	$div.css("border", "2px solid #fff");
+	equals($div.width(), 30, "Test border specified with pixels");
+	$div.css("padding", "2em");
+	equals($div.width(), 30, "Test padding specified with ems");
+	$div.css("border", "1em solid #fff");
+	equals($div.width(), 30, "Test border specified with ems");
+	$div.css("padding", "2%");
+	equals($div.width(), 30, "Test padding specified with percent");
+	$div.hide();
+	equals($div.width(), 30, "Test hidden div");
+	
+	$div.css({ display: "", border: "", padding: "" });
+	
+	$("#nothiddendivchild").css({ padding: "3px", border: "2px solid #fff" });
+	equals($("#nothiddendivchild").width(), 20, "Test child width with border and padding");
+	$("#nothiddendiv, #nothiddendivchild").css({ border: "", padding: "", width: "" });
+});
+
+test("height()", function() {
+	expect(8);
+
+	var $div = $("#nothiddendiv");
+	$div.height(30);
+	equals($div.height(), 30, "Test set to 30 correctly");
+	$div.height(-1); // handle negative numbers by ignoring #1599
+	equals($div.height(), 30, "Test negative height ignored");
+	$div.css("padding", "20px");
+	equals($div.height(), 30, "Test padding specified with pixels");
+	$div.css("border", "2px solid #fff");
+	equals($div.height(), 30, "Test border specified with pixels");
+	$div.css("padding", "2em");
+	equals($div.height(), 30, "Test padding specified with ems");
+	$div.css("border", "1em solid #fff");
+	equals($div.height(), 30, "Test border specified with ems");
+	$div.css("padding", "2%");
+	equals($div.height(), 30, "Test padding specified with percent");
+	$div.hide();
+	equals($div.height(), 30, "Test hidden div");
+	
+	$div.css({ display: "", border: "", padding: "", height: "1px" });
 });
 
 test("text()", function() {
@@ -364,7 +573,7 @@ test("text()", function() {
 });
 
 test("wrap(String|Element)", function() {
-	expect(6);
+	expect(8);
 	var defaultText = 'Try them out:'
 	var result = $('#first').wrap('<div class="red"><span></span></div>').text();
 	ok( defaultText == result, 'Check for wrapping of on-the-fly html' );
@@ -383,6 +592,12 @@ test("wrap(String|Element)", function() {
 		$(checkbox).wrap( '<div id="c1" style="display:none;"></div>' );
 		ok( checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
 	}).click();
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.wrap("<i></i>");
+	equals( $("#nonnodes > i").length, 3, "Check node,textnode,comment wraps ok" );
+	equals( $("#nonnodes > i").text(), j.text() + j[1].nodeValue, "Check node,textnode,comment wraps doesn't hurt text" );
 });
 
 test("wrapAll(String|Element)", function() {
@@ -422,7 +637,7 @@ test("wrapInner(String|Element)", function() {
 });
 
 test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-	expect(18);
+	expect(21);
 	var defaultText = 'Try them out:'
 	var result = $('#first').append('<b>buga</b>');
 	ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
@@ -458,12 +673,12 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	
 	reset();
 	$("#sap").append(document.getElementById('form'));
-	ok( $("#sap>form").size() == 1, "Check for appending a form" );  // Bug #910
+	ok( $("#sap>form").size() == 1, "Check for appending a form" ); // Bug #910
 
 	reset();
 	var pass = true;
 	try {
-		$( $("iframe")[0].contentWindow.document.body ).append("<div>test</div>");
+		$( $("#iframe")[0].contentWindow.document.body ).append("<div>test</div>");
 	} catch(e) {
 		pass = false;
 	}
@@ -494,6 +709,15 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 		.append('<select id="appendSelect2"><option>Test</option></select>');
 	
 	t( "Append Select", "#appendSelect1, #appendSelect2", ["appendSelect1", "appendSelect2"] );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	var d = $("<div/>").appendTo("#nonnodes").append(j);
+	equals( $("#nonnodes").length, 1, "Check node,textnode,comment append moved leaving just the div" );
+	ok( d.contents().length >= 2, "Check node,textnode,comment append works" );
+	d.contents().appendTo("#nonnodes");
+	d.remove();
+	ok( $("#nonnodes").contents().length >= 2, "Check node,textnode,comment append cleanup worked" );
 });
 
 test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -722,18 +946,52 @@ test("end()", function() {
 });
 
 test("find(String)", function() {
-	expect(1);
+	expect(2);
 	ok( 'Yahoo' == $('#foo').find('.blogTest').text(), 'Check for find' );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	equals( j.find("div").length, 0, "Check node,textnode,comment to find zero divs" );
 });
 
 test("clone()", function() {
-	expect(3);
+	expect(20);
 	ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Assert text for #en' );
 	var clone = $('#yahoo').clone();
 	ok( 'Try them out:Yahoo' == $('#first').append(clone).text(), 'Check for clone' );
 	ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Reassert text for #en' );
+
+	var cloneTags = [ 
+		"<table/>", "<tr/>", "<td/>", "<div/>", 
+		"<button/>", "<ul/>", "<ol/>", "<li/>",
+		"<input type='checkbox' />", "<select/>", "<option/>", "<textarea/>",
+		"<tbody/>", "<thead/>", "<tfoot/>", "<iframe/>"
+	];
+	for (var i = 0; i < cloneTags.length; i++) {
+		var j = $(cloneTags[i]);
+		equals( j[0].tagName, j.clone()[0].tagName, 'Clone a &lt;' + cloneTags[i].substring(1));
+	}
+
+	// using contents will get comments regular, text, and comment nodes
+	var cl = $("#nonnodes").contents().clone();
+	ok( cl.length >= 2, "Check node,textnode,comment clone works (some browsers delete comments on clone)" );
 });
 
+if (!isLocal) {
+test("clone() on XML nodes", function() {
+	expect(2);
+	stop();
+	$.get("data/dashboard.xml", function (xml) {
+		var root = $(xml.documentElement).clone();
+		$("tab:first", xml).text("origval");
+		$("tab:first", root).text("cloneval");
+		equals($("tab:first", xml).text(), "origval", "Check original XML node was correctly set");
+		equals($("tab:first", root).text(), "cloneval", "Check cloned XML node was correctly set");
+		start();
+	});
+});
+}
+
 test("is(String)", function() {
 	expect(26);
 	ok( $('#form').is('form'), 'Check for element: A form must be a form' );
@@ -767,17 +1025,17 @@ test("is(String)", function() {
 });
 
 test("$.extend(Object, Object)", function() {
-	expect(10);
+	expect(17);
 
 	var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
-		options =     { xnumber2: 1, xstring2: "x", xxx: "newstring" },
+		options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
 		optionsCopy = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
 		merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" },
 		deep1 = { foo: { bar: true } },
 		deep1copy = { foo: { bar: true } },
-		deep2 = { foo: { baz: true } },
-		deep2copy = { foo: { baz: true } },
-		deepmerged = { foo: { bar: true, baz: true } };
+		deep2 = { foo: { baz: true }, foo2: document },
+		deep2copy = { foo: { baz: true }, foo2: document },
+		deepmerged = { foo: { bar: true, baz: true }, foo2: document };
 
 	jQuery.extend(settings, options);
 	isObj( settings, merged, "Check if extended: settings must be extended" );
@@ -790,12 +1048,35 @@ test("$.extend(Object, Object)", function() {
 	jQuery.extend(true, deep1, deep2);
 	isObj( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" );
 	isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
+	equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );
+
+	var target = {};
+	var recursive = { foo:target, bar:5 };
+	jQuery.extend(true, target, recursive);
+	isObj( target, { bar:5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" );
+
+	var ret = jQuery.extend(true, { foo: [] }, { foo: [0] } ); // 1907
+	ok( ret.foo.length == 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" );
+
+	var ret = jQuery.extend(true, { foo: "1,2,3" }, { foo: [1, 2, 3] } );
+	ok( typeof ret.foo != "string", "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );
+
+	var ret = jQuery.extend(true, { foo:"bar" }, { foo:null } );
+	ok( typeof ret.foo !== 'undefined', "Make sure a null value doesn't crash with deep extend, for #1908" );
+
+	var obj = { foo:null };
+	jQuery.extend(true, obj, { foo:"notnull" } );
+	equals( obj.foo, "notnull", "Make sure a null value can be overwritten" );
+
+	function func() {}
+	jQuery.extend(func, { key: "value" } );
+	equals( func.key, "value", "Verify a function can be extended" );
 
 	var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
-		options1 =     { xnumber2: 1, xstring2: "x" },
+		options1 = { xnumber2: 1, xstring2: "x" },
 		options1Copy = { xnumber2: 1, xstring2: "x" },
-		options2 =     { xstring2: "xx", xxx: "newstringx" },
+		options2 = { xstring2: "xx", xxx: "newstringx" },
 		options2Copy = { xstring2: "xx", xxx: "newstringx" },
 		merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
 
@@ -807,51 +1088,90 @@ test("$.extend(Object, Object)", function() {
 });
 
 test("val()", function() {
-	expect(2);
+	expect(4);
 	ok( $("#text1").val() == "Test", "Check for value of input element" );
 	ok( !$("#text1").val() == "", "Check for value of input element" );
+	// ticket #1714 this caused a JS error in IE
+	ok( $("#first").val() == "", "Check a paragraph element to see if it has a value" );
+	ok( $([]).val() === undefined, "Check an empty jQuery object will return undefined from val" );
 });
 
 test("val(String)", function() {
-	expect(2);
+	expect(4);
 	document.getElementById('text1').value = "bla";
 	ok( $("#text1").val() == "bla", "Check for modified value of input element" );
 	$("#text1").val('test');
 	ok ( document.getElementById('text1').value == "test", "Check for modified (via val(String)) value of input element" );
+	
+	$("#select1").val("3");
+	ok( $("#select1").val() == "3", "Check for modified (via val(String)) value of select element" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.val("asdf");
+	equals( j.val(), "asdf", "Check node,textnode,comment with val()" );
+	j.removeAttr("value");
 });
 
+var scriptorder = 0;
+
 test("html(String)", function() {
-	expect(3);
-	var div = $("div");
+	expect(11);
+	var div = $("#main > div");
 	div.html("<b>test</b>");
 	var pass = true;
 	for ( var i = 0; i < div.size(); i++ ) {
-	  if ( div.get(i).childNodes.length == 0 ) pass = false;
+		if ( div.get(i).childNodes.length != 1 ) pass = false;
 	}
 	ok( pass, "Set HTML" );
 
+	reset();
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.html("<b>bold</b>");
+	equals( j.html().toLowerCase(), "<b>bold</b>", "Check node,textnode,comment with html()" );
+
+	$("#main").html("<select/>");
+	$("#main select").html("<option>O1</option><option selected='selected'>O2</option><option>O3</option>");
+	equals( $("#main select").val(), "O2", "Selected option correct" );
+
 	stop();
 
 	$("#main").html('<script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script>');
 
 	$("#main").html('foo <form><script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script></form>');
 
+	// it was decided that waiting to execute ALL scripts makes sense since nested ones have to wait anyway so this test case is changed, see #1959
+	$("#main").html("<script>ok(scriptorder++ == 0, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html (even though appears before)')<\/script><span id='scriptorder'><script>ok(scriptorder++ == 1, 'Script (nested) is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script></span><script>ok(scriptorder++ == 2, 'Script (unnested) is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script>");
+
 	setTimeout( start, 100 );
 });
 
 test("filter()", function() {
-	expect(4);
+	expect(6);
 	isSet( $("#form input").filter(":checked").get(), q("radio2", "check1"), "filter(String)" );
 	isSet( $("p").filter("#ap, #sndp").get(), q("ap", "sndp"), "filter('String, String')" );
 	isSet( $("p").filter("#ap,#sndp").get(), q("ap", "sndp"), "filter('String,String')" );
 	isSet( $("p").filter(function() { return !$("a", this).length }).get(), q("sndp", "first"), "filter(Function)" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	equals( j.filter("span").length, 1, "Check node,textnode,comment to filter the one span" );
+	equals( j.filter("[name]").length, 0, "Check node,textnode,comment to filter the one span" );
 });
 
 test("not()", function() {
-	expect(3);
+	expect(8);
 	ok( $("#main > p#ap > a").not("#google").length == 2, "not('selector')" );
+	ok( $("#main > p#ap > a").not(document.getElementById("google")).length == 2, "not(DOMElement)" );
+	isSet( $("p").not(".result").get(), q("firstp", "ap", "sndp", "en", "sap", "first"), "not('.class')" );
 	isSet( $("p").not("#ap, #sndp, .result").get(), q("firstp", "en", "sap", "first"), "not('selector, selector')" );
 	isSet( $("p").not($("#ap, #sndp, .result")).get(), q("firstp", "en", "sap", "first"), "not(jQuery)" );
+	ok( $("p").not(document.getElementsByTagName("p")).length == 0, "not(Array-like DOM collection)" );
+	isSet( $("#form option").not("option.emptyopt:contains('Nothing'),[selected],[value='1']").get(), q("option1c", "option1d", "option2c", "option3d" ), "not('complex selector')");
+	
+	var selects = $("#form select");
+	isSet( selects.not( selects[1] ), q("select1", "select3"), "filter out DOM element");
 });
 
 test("andSelf()", function() {
@@ -913,16 +1233,39 @@ test("prev([String])", function() {
 });
 
 test("show()", function() {
-	expect(1);
+	expect(15);
 	var pass = true, div = $("div");
 	div.show().each(function(){
-	  if ( this.style.display == "none" ) pass = false;
+		if ( this.style.display == "none" ) pass = false;
 	});
 	ok( pass, "Show" );
+	
+	$("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>');
+	var test = {
+		"div"      : "block",
+		"p"        : "block",
+		"a"        : "inline",
+		"code"     : "inline",
+		"pre"      : "block",
+		"span"     : "inline",
+		"table"    : $.browser.msie ? "block" : "table",
+		"thead"    : $.browser.msie ? "block" : "table-header-group",
+		"tbody"    : $.browser.msie ? "block" : "table-row-group",
+		"tr"       : $.browser.msie ? "block" : "table-row",
+		"th"       : $.browser.msie ? "block" : "table-cell",
+		"td"       : $.browser.msie ? "block" : "table-cell",
+		"ul"       : "block",
+		"li"       : $.browser.msie ? "block" : "list-item"
+	};
+	
+	$.each(test, function(selector, expected) {
+		var elem = $(selector, "#show-tests").show();
+		equals( elem.css("display"), expected, "Show using correct display type for " + selector );
+	});
 });
 
 test("addClass(String)", function() {
-	expect(1);
+	expect(2);
 	var div = $("div");
 	div.addClass("test");
 	var pass = true;
@@ -930,10 +1273,15 @@ test("addClass(String)", function() {
 	 if ( div.get(i).className.indexOf("test") == -1 ) pass = false;
 	}
 	ok( pass, "Add Class" );
+
+	// using contents will get regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.addClass("asdf");
+	ok( j.hasClass("asdf"), "Check node,textnode,comment for addClass" );
 });
 
 test("removeClass(String) - simple", function() {
-	expect(3);
+	expect(4);
 	var div = $("div").addClass("test").removeClass("test"),
 		pass = true;
 	for ( var i = 0; i < div.size(); i++ ) {
@@ -954,6 +1302,10 @@ test("removeClass(String) - simple", function() {
 	var div = $("div:eq(0)").addClass("test").removeClass("");
 	ok( div.is('.test'), "Empty string passed to removeClass" );
 	
+	// using contents will get regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.removeClass("asdf");
+	ok( !j.hasClass("asdf"), "Check node,textnode,comment for removeClass" );
 });
 
 test("toggleClass(String)", function() {
@@ -972,12 +1324,19 @@ test("removeAttr(String", function() {
 });
 
 test("text(String)", function() {
-	expect(1);
+	expect(4);
 	ok( $("#foo").text("<div><b>Hello</b> cruel world!</div>")[0].innerHTML == "&lt;div&gt;&lt;b&gt;Hello&lt;/b&gt; cruel world!&lt;/div&gt;", "Check escaped text" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.text("hi!");
+	equals( $(j[0]).text(), "hi!", "Check node,textnode,comment with text()" );
+	equals( j[1].nodeValue, " there ", "Check node,textnode,comment with text()" );
+	equals( j[2].nodeType, 8, "Check node,textnode,comment with text()" );
 });
 
 test("$.each(Object,Function)", function() {
-	expect(8);
+	expect(12);
 	$.each( [0,1,2], function(i, n){
 		ok( i == n, "Check array iteration" );
 	});
@@ -989,6 +1348,19 @@ test("$.each(Object,Function)", function() {
 	$.each( { name: "name", lang: "lang" }, function(i, n){
 		ok( i == n, "Check object iteration" );
 	});
+
+        var total = 0;
+        jQuery.each([1,2,3], function(i,v){ total += v; });
+        ok( total == 6, "Looping over an array" );
+        total = 0;
+        jQuery.each([1,2,3], function(i,v){ total += v; if ( i == 1 ) return false; });
+        ok( total == 3, "Looping over an array, with break" );
+        total = 0;
+        jQuery.each({"a":1,"b":2,"c":3}, function(i,v){ total += v; });
+        ok( total == 6, "Looping over an object" );
+        total = 0;
+        jQuery.each({"a":3,"b":3,"c":3}, function(i,v){ total += v; return false; });
+        ok( total == 3, "Looping over an object, with break" );
 });
 
 test("$.prop", function() {
@@ -1015,8 +1387,93 @@ test("$.className", function() {
 	ok( c.has(x, "bar"), "Check has2" );
 });
 
+test("$.data", function() {
+	expect(3);
+	var div = $("#foo")[0];
+	ok( jQuery.data(div, "test") == undefined, "Check for no data exists" );
+	jQuery.data(div, "test", "success");
+	ok( jQuery.data(div, "test") == "success", "Check for added data" );
+	jQuery.data(div, "test", "overwritten");
+	ok( jQuery.data(div, "test") == "overwritten", "Check for overwritten data" );
+});
+
+test(".data()", function() {
+	expect(16);
+	var div = $("#foo");
+	ok( div.data("test") == undefined, "Check for no data exists" );
+	div.data("test", "success");
+	ok( div.data("test") == "success", "Check for added data" );
+	div.data("test", "overwritten");
+	ok( div.data("test") == "overwritten", "Check for overwritten data" );
+
+	var hits = {test:0}, gets = {test:0};
+
+	div
+		.bind("setData",function(e,key,value){ hits[key] += value; })
+		.bind("setData.foo",function(e,key,value){ hits[key] += value; })
+		.bind("getData",function(e,key){ gets[key] += 1; })
+		.bind("getData.foo",function(e,key){ gets[key] += 3; });
+
+	div.data("test.foo", 2);
+	ok( div.data("test") == "overwritten", "Check for original data" );
+	ok( div.data("test.foo") == 2, "Check for namespaced data" );
+	ok( div.data("test.bar") == "overwritten", "Check for unmatched namespace" );
+	equals( hits.test, 2, "Check triggered setter functions" );
+	equals( gets.test, 5, "Check triggered getter functions" );
+
+	hits.test = 0;
+	gets.test = 0;
+
+	div.data("test", 1);
+	ok( div.data("test") == 1, "Check for original data" );
+	ok( div.data("test.foo") == 2, "Check for namespaced data" );
+	ok( div.data("test.bar") == 1, "Check for unmatched namespace" );
+	equals( hits.test, 1, "Check triggered setter functions" );
+	equals( gets.test, 5, "Check triggered getter functions" );
+
+	hits.test = 0;
+	gets.test = 0;
+
+	div
+		.bind("getData",function(e,key){ return key + "root"; })
+		.bind("getData.foo",function(e,key){ return key + "foo"; });
+
+	ok( div.data("test") == "testroot", "Check for original data" );
+	ok( div.data("test.foo") == "testfoo", "Check for namespaced data" );
+	ok( div.data("test.bar") == "testroot", "Check for unmatched namespace" );
+});
+
+test("$.removeData", function() {
+	expect(1);
+	var div = $("#foo")[0];
+	jQuery.data(div, "test", "testing");
+	jQuery.removeData(div, "test");
+	ok( jQuery.data(div, "test") == undefined, "Check removal of data" );
+});
+
+test(".removeData()", function() {
+	expect(6);
+	var div = $("#foo");
+	div.data("test", "testing");
+	div.removeData("test");
+	ok( div.data("test") == undefined, "Check removal of data" );
+
+	div.data("test", "testing");
+	div.data("test.foo", "testing2");
+	div.removeData("test.bar");
+	ok( div.data("test.foo") == "testing2", "Make sure data is intact" );
+	ok( div.data("test") == "testing", "Make sure data is intact" );
+
+	div.removeData("test");
+	ok( div.data("test.foo") == "testing2", "Make sure data is intact" );
+	ok( div.data("test") == undefined, "Make sure data is intact" );
+
+	div.removeData("test.foo");
+	ok( div.data("test.foo") == undefined, "Make sure data is intact" );
+});
+
 test("remove()", function() {
-	expect(4);
+	expect(6);
 	$("#ap").children().remove();
 	ok( $("#ap").text().length > 10, "Check text is not removed" );
 	ok( $("#ap").children().length == 0, "Check remove" );
@@ -1025,20 +1482,32 @@ test("remove()", function() {
 	$("#ap").children().remove("a");
 	ok( $("#ap").text().length > 10, "Check text is not removed" );
 	ok( $("#ap").children().length == 1, "Check filtered remove" );
+
+	// using contents will get comments regular, text, and comment nodes
+	equals( $("#nonnodes").contents().length, 3, "Check node,textnode,comment remove works" );
+	$("#nonnodes").contents().remove();
+	equals( $("#nonnodes").contents().length, 0, "Check node,textnode,comment remove works" );
 });
 
 test("empty()", function() {
-	expect(2);
+	expect(3);
 	ok( $("#ap").children().empty().text().length == 0, "Check text is removed" );
 	ok( $("#ap").children().length == 4, "Check elements are not removed" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.empty();
+	equals( j.html(), "", "Check node,textnode,comment empty works" );
 });
 
 test("slice()", function() {
-	expect(4);
+	expect(5);
 	isSet( $("#ap a").slice(1,2), q("groups"), "slice(1,2)" );
 	isSet( $("#ap a").slice(1), q("groups", "anchor1", "mark"), "slice(1)" );
 	isSet( $("#ap a").slice(0,3), q("google", "groups", "anchor1"), "slice(0,3)" );
 	isSet( $("#ap a").slice(-1), q("mark"), "slice(-1)" );
+
+	isSet( $("#ap a").eq(1), q("groups"), "eq(1)" );
 });
 
 test("map()", function() {
@@ -1062,9 +1531,33 @@ test("map()", function() {
 });
 
 test("contents()", function() {
-	expect(2);
+	expect(12);
 	equals( $("#ap").contents().length, 9, "Check element contents" );
 	ok( $("#iframe").contents()[0], "Check existance of IFrame document" );
-	// Disabled, randomly fails
-	//ok( $("#iframe").contents()[0].body, "Check existance of IFrame body" );
+	var ibody = $("#loadediframe").contents()[0].body;
+	ok( ibody, "Check existance of IFrame body" );
+
+	equals( $("span", ibody).text(), "span text", "Find span in IFrame and check its text" );
+
+	$(ibody).append("<div>init text</div>");
+	equals( $("div", ibody).length, 2, "Check the original div and the new div are in IFrame" );
+
+	equals( $("div:last", ibody).text(), "init text", "Add text to div in IFrame" );
+
+	$("div:last", ibody).text("div text");
+	equals( $("div:last", ibody).text(), "div text", "Add text to div in IFrame" );
+
+	$("div:last", ibody).remove();
+	equals( $("div", ibody).length, 1, "Delete the div and check only one div left in IFrame" );
+
+	equals( $("div", ibody).text(), "span text", "Make sure the correct div is still left after deletion in IFrame" );
+
+	$("<table/>", ibody).append("<tr><td>cell</td></tr>").appendTo(ibody);
+	$("table", ibody).remove();
+	equals( $("div", ibody).length, 1, "Check for JS error on add and delete of a table in IFrame" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var c = $("#nonnodes").contents().contents();
+	equals( c.length, 1, "Check node,textnode,comment contents is just one" );
+	equals( c[0].nodeValue, "hi", "Check node,textnode,comment contents is just the one from span" );
 });