X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=289a8bace0f9318d874607bd22bd813703d9c8ec;hb=e73990a566fcb2dac71e1a25ec83382645adc5b7;hp=ee5f805ec5fc10d1e0431ea00ad982bb5b2ede0f;hpb=49d0d5b7a3628947a14028d14ed042746cc6c3e4;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index ee5f805..289a8ba 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -53,7 +53,7 @@ test("jQuery()", function() {
 });
 
 test("selector state", function() {
-	expect(26);
+	expect(30);
 
 	var test;
 	
@@ -72,6 +72,10 @@ test("selector state", function() {
 	test = jQuery("#main");
 	equals( test.selector, "#main", "#main Selector" );
 	equals( test.context, document, "#main Context" );
+
+	test = jQuery("#notfoundnono");
+	equals( test.selector, "#notfoundnono", "#notfoundnono Selector" );
+	equals( test.context, document, "#notfoundnono Context" );
 	
 	test = jQuery("#main", document);
 	equals( test.selector, "#main", "#main Selector" );
@@ -80,6 +84,11 @@ test("selector state", function() {
 	test = jQuery("#main", document.body);
 	equals( test.selector, "#main", "#main Selector" );
 	equals( test.context, document.body, "#main Context" );
+
+	// Test cloning
+	test = jQuery(test);
+	equals( test.selector, "#main", "#main Selector" );
+	equals( test.context, document.body, "#main Context" );
 	
 	test = jQuery(document.body).find("#main");
 	equals( test.selector, "#main", "#main find Selector" );
@@ -141,7 +150,7 @@ test("browser", function() {
 	};
 	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;
+		var version = v ? v[1] : null;
 		equals( version, browsers[i], "Checking UA string" );
 	}
 });
@@ -251,18 +260,16 @@ test("isFunction", function() {
 	});
 });
 
-var foo = false;
-
 test("jQuery('html')", function() {
 	expect(8);
 
 	reset();
-	foo = false;
-	var s = jQuery("<script>foo='test';</script>")[0];
+	jQuery.foo = false;
+	var s = jQuery("<script>jQuery.foo='test';</script>")[0];
 	ok( s, "Creating a script" );
-	ok( !foo, "Make sure the script wasn't executed prematurely" );
-	jQuery("body").append("<script>foo='test';</script>");
-	ok( foo, "Executing a scripts contents in the right context" );
+	ok( !jQuery.foo, "Make sure the script wasn't executed prematurely" );
+	jQuery("body").append("<script>jQuery.foo='test';</script>");
+	ok( jQuery.foo, "Executing a scripts contents in the right context" );
 
 	reset();
 	ok( jQuery("<link rel='stylesheet'/>")[0], "Creating a link" );
@@ -380,7 +387,7 @@ test("index(Object)", function() {
 });
 
 test("attr(String)", function() {
-	expect(26);
+	expect(27);
 	equals( jQuery('#text1').attr('value'), "Test", 'Check for value attribute' );
 	equals( jQuery('#text1').attr('value', "Test2").attr('defaultValue'), "Test", 'Check for defaultValue attribute' );
 	equals( jQuery('#text1').attr('type'), "text", 'Check for type attribute' );
@@ -398,12 +405,14 @@ test("attr(String)", function() {
 	equals( jQuery('#text1').attr('maxLength'), '30', 'Check for maxLength attribute' );
 	equals( jQuery('#area1').attr('maxLength'), '30', 'Check for maxLength attribute' );
 	equals( jQuery('#select2').attr('selectedIndex'), 3, 'Check for selectedIndex attribute' );
-	equals( jQuery('#foo').attr('nodeName'), 'DIV', 'Check for nodeName attribute' );
-	equals( jQuery('#foo').attr('tagName'), 'DIV', 'Check for tagName attribute' );
+	equals( jQuery('#foo').attr('nodeName').toUpperCase(), 'DIV', 'Check for nodeName attribute' );
+	equals( jQuery('#foo').attr('tagName').toUpperCase(), 'DIV', 'Check for tagName attribute' );
 
 	jQuery('<a id="tAnchor5"></a>').attr('href', '#5').appendTo('#main'); // using innerHTML in IE causes href attribute to be serialized to the full path
 	equals( jQuery('#tAnchor5').attr('href'), "#5", 'Check for non-absolute href (an anchor)' );
 
+	equals( jQuery("<option/>").attr("selected"), false, "Check selected attribute on disconnected element." );
+
 
 	// Related to [5574] and [5683]
 	var body = document.body, $body = jQuery(body);
@@ -454,8 +463,8 @@ test("attr(Hash)", function() {
 });
 
 test("attr(String, Object)", function() {
-	expect(19);
-	var div = jQuery("div").attr("foo", "bar");
+	expect(21);
+	var div = jQuery("div").attr("foo", "bar"),
 		fail = false;
 	for ( var i = 0; i < div.size(); i++ ) {
 		if ( div.get(i).getAttribute('foo') != "bar" ){
@@ -528,6 +537,16 @@ test("attr(String, Object)", function() {
 	}
 	ok( thrown, "Exception thrown when trying to change type property" );
 	equals( "checkbox", check.attr('type'), "Verify that you can change the type of an input element that isn't in the DOM" );
+	
+	var button = jQuery("#button");
+	var thrown = false;
+	try {
+		button.attr('type','submit');
+	} catch(e) {
+		thrown = true;
+	}
+	ok( thrown, "Exception thrown when trying to change type property" );
+	equals( "button", button.attr('type'), "Verify that you can't change the type of a button element" );
 });
 
 if ( !isLocal ) {
@@ -547,22 +566,21 @@ if ( !isLocal ) {
 }
 
 test("attr('tabindex')", function() {
-	expect(5);
-
-	// tabindex 0
-	equals(jQuery('#listWithTabIndex').attr('tabindex'), 0, 'tabindex of 0');
-
-	// positive tabindex
-	equals(jQuery('#linkWithTabIndex').attr('tabindex'), 2, 'tabindex of 2');
-
-	// negative tabindex
-	equals(jQuery('#linkWithNegativeTabIndex').attr('tabindex'), -1, 'negative tabindex');
+	expect(8);
 
-	// regular element without a tabindex
-	equals(jQuery('#divWithNoTabIndex').attr('tabindex'), undefined, 'no tabindex, not tabbable by default');
+	// elements not natively tabbable
+	equals(jQuery('#listWithTabIndex').attr('tabindex'), 5, 'not natively tabbable, with tabindex set to 0');
+	equals(jQuery('#divWithNoTabIndex').attr('tabindex'), undefined, 'not natively tabbable, no tabindex set');
+	
+	// anchor with href
+	equals(jQuery('#linkWithNoTabIndex').attr('tabindex'), 0, 'anchor with href, no tabindex set');
+	equals(jQuery('#linkWithTabIndex').attr('tabindex'), 2, 'anchor with href, tabindex set to 2');
+	equals(jQuery('#linkWithNegativeTabIndex').attr('tabindex'), -1, 'anchor with href, tabindex set to -1');
 
-    // link without a tabindex
-	equals(jQuery('#linkWithNoTabIndex').attr('tabindex'), 0, 'no tabindex, tabbable by default');
+	// anchor without href
+	equals(jQuery('#linkWithNoHrefWithNoTabIndex').attr('tabindex'), undefined, 'anchor without href, no tabindex set');
+	equals(jQuery('#linkWithNoHrefWithTabIndex').attr('tabindex'), 1, 'anchor without href, tabindex set to 2');
+	equals(jQuery('#linkWithNoHrefWithNegativeTabIndex').attr('tabindex'), -1, 'anchor without href, no tabindex set');
 });
 
 test("attr('tabindex', value)", function() {
@@ -607,11 +625,11 @@ test("css(String|Hash)", function() {
 
 	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
 
-	ok( jQuery('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
-	jQuery('#foo').css({display: 'none'});
-	ok( !jQuery('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
-	jQuery('#foo').css({display: 'block'});
-	ok( jQuery('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
+	ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible');
+	jQuery('#nothiddendiv').css({display: 'none'});
+	ok( !jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is hidden');
+	jQuery('#nothiddendiv').css({display: 'block'});
+	ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible');
 
 	jQuery('#floatTest').css({styleFloat: 'right'});
 	equals( jQuery('#floatTest').css('styleFloat'), 'right', 'Modified CSS float using "styleFloat": Assert float is right');
@@ -634,11 +652,11 @@ test("css(String|Hash)", function() {
 
 test("css(String, Object)", function() {
 	expect(21);
-	ok( jQuery('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
-	jQuery('#foo').css('display', 'none');
-	ok( !jQuery('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
-	jQuery('#foo').css('display', 'block');
-	ok( jQuery('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
+	ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible');
+	jQuery('#nothiddendiv').css("display", 'none');
+	ok( !jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is hidden');
+	jQuery('#nothiddendiv').css("display", 'block');
+	ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible');
 
 	jQuery('#floatTest').css('styleFloat', 'left');
 	equals( jQuery('#floatTest').css('styleFloat'), 'left', 'Modified CSS float using "styleFloat": Assert float is left');
@@ -686,26 +704,27 @@ test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", funct
 });
 
 test("width()", function() {
-	expect(8);
+	expect(6);
 
 	var $div = jQuery("#nothiddendiv");
 	$div.width(30);
 	equals($div.width(), 30, "Test set to 30 correctly");
+	$div.hide();
+	equals($div.width(), 30, "Test hidden div");
+	$div.show();
 	$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");
+	//$div.css("padding", "2em");
+	//equals($div.width(), 30, "Test padding specified with ems");
+	//$div.css("border", "1em solid #fff");
 	//DISABLED - Opera 9.6 fails this test, returns 8
 	//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("padding", "2%");
+	//equals($div.width(), 30, "Test padding specified with percent");
 
 	$div.css({ display: "", border: "", padding: "" });
 
@@ -715,26 +734,27 @@ test("width()", function() {
 });
 
 test("height()", function() {
-	expect(7);
+	expect(5);
 
 	var $div = jQuery("#nothiddendiv");
 	$div.height(30);
 	equals($div.height(), 30, "Test set to 30 correctly");
+	$div.hide();
+	equals($div.height(), 30, "Test hidden div");
+	$div.show();
 	$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");
+	//$div.css("padding", "2em");
+	//equals($div.height(), 30, "Test padding specified with ems");
+	//$div.css("border", "1em solid #fff");
 	//DISABLED - Opera 9.6 fails this test, returns 8
 	//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("padding", "2%");
+	//equals($div.height(), 30, "Test padding specified with percent");
 
 	$div.css({ display: "", border: "", padding: "", height: "1px" });
 });
@@ -746,7 +766,7 @@ test("text()", function() {
 });
 
 test("wrap(String|Element)", function() {
-	expect(8);
+	expect(10);
 	var defaultText = 'Try them out:'
 	var result = jQuery('#first').wrap('<div class="red"><span></span></div>').text();
 	equals( defaultText, result, 'Check for wrapping of on-the-fly html' );
@@ -771,6 +791,11 @@ test("wrap(String|Element)", function() {
 	j.wrap("<i></i>");
 	equals( jQuery("#nonnodes > i").length, 3, "Check node,textnode,comment wraps ok" );
 	equals( jQuery("#nonnodes > i").text(), j.text() + j[1].nodeValue, "Check node,textnode,comment wraps doesn't hurt text" );
+
+	// Try wrapping a disconnected node
+	j = jQuery("<label/>").wrap("<li/>");
+	equals( j[0].nodeName.toUpperCase(), "LABEL", "Element is a label" );
+	equals( j[0].parentNode.nodeName.toUpperCase(), "LI", "Element has been wrapped" );
 });
 
 test("wrapAll(String|Element)", function() {
@@ -827,9 +852,7 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	equals( expected, jQuery('#sap').text(), "Check for appending of array of elements" );
 
 	reset();
-	expected = document.querySelectorAll ?
-		"This link has class=\"blog\": Simon Willison's WeblogYahooTry them out:" :
-		"This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
+	expected = "This link has class=\"blog\": Simon Willison's WeblogYahooTry them out:";
 	jQuery('#sap').append(jQuery("#first, #yahoo"));
 	equals( expected, jQuery('#sap').text(), "Check for appending of jQuery object" );
 
@@ -896,7 +919,7 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-	expect(6);
+	expect(12);
 	var defaultText = 'Try them out:'
 	jQuery('<b>buga</b>').appendTo('#first');
 	equals( jQuery("#first").text(), defaultText + 'buga', 'Check if text appending works' );
@@ -913,15 +936,37 @@ test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	equals( expected, jQuery('#sap').text(), "Check for appending of array of elements" );
 
 	reset();
-	expected = document.querySelectorAll ?
-		"This link has class=\"blog\": Simon Willison's WeblogYahooTry them out:" :
-		"This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
+	ok( jQuery(document.createElement("script")).appendTo("body").length, "Make sure a disconnected script can be appended." );
+
+	reset();
+	expected = "This link has class=\"blog\": Simon Willison's WeblogYahooTry them out:";
 	jQuery("#first, #yahoo").appendTo('#sap');
 	equals( expected, jQuery('#sap').text(), "Check for appending of jQuery object" );
 
 	reset();
 	jQuery('#select1').appendTo('#foo');
 	t( 'Append select', '#foo select', ['select1'] );
+
+	reset();
+	var div = jQuery("<div/>").click(function(){
+		ok(true, "Running a cloned click.");
+	});
+	div.appendTo("#main, #moretests");
+
+	jQuery("#main div:last").click();
+	jQuery("#moretests div:last").click();
+
+	reset();
+	var div = jQuery("<div/>").appendTo("#main, #moretests");
+
+	equals( div.length, 2, "appendTo returns the inserted elements" );
+	
+	div.addClass("test");
+
+	ok( jQuery("#main div:last").hasClass("test"), "appendTo element was modified after the insertion" );
+	ok( jQuery("#moretests div:last").hasClass("test"), "appendTo element was modified after the insertion" );
+
+	reset();
 });
 
 test("prepend(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -942,9 +987,7 @@ test("prepend(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	equals( expected, jQuery('#sap').text(), "Check for prepending of array of elements" );
 
 	reset();
-	expected = document.querySelectorAll ?
-		"YahooTry them out:This link has class=\"blog\": Simon Willison's Weblog" :
-		"Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
+	expected = "YahooTry them out:This link has class=\"blog\": Simon Willison's Weblog";
 	jQuery('#sap').prepend(jQuery("#first, #yahoo"));
 	equals( expected, jQuery('#sap').text(), "Check for prepending of jQuery object" );
 });
@@ -963,12 +1006,12 @@ test("prependTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 
 	reset();
 	expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
-	jQuery([document.getElementById('yahoo'), document.getElementById('first')]).prependTo('#sap');
+	jQuery([document.getElementById('first'), document.getElementById('yahoo')]).prependTo('#sap');
 	equals( expected, jQuery('#sap').text(), "Check for prepending of array of elements" );
 
 	reset();
-	expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
-	jQuery("#yahoo, #first").prependTo('#sap');
+	expected = "YahooTry them out:This link has class=\"blog\": Simon Willison's Weblog";
+	jQuery("#first, #yahoo").prependTo('#sap');
 	equals( expected, jQuery('#sap').text(), "Check for prepending of jQuery object" );
 
 	reset();
@@ -995,9 +1038,7 @@ test("before(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	equals( expected, jQuery('#en').text(), "Insert array of elements before" );
 
 	reset();
-	expected = document.querySelectorAll ?
-		"This is a normal link: diveintomarkTry them out:Yahoo" :
-		"This is a normal link: Try them out:diveintomarkYahoo";
+	expected = "This is a normal link: diveintomarkTry them out:Yahoo";
 	jQuery('#yahoo').before(jQuery("#first, #mark"));
 	equals( expected, jQuery('#en').text(), "Insert jQuery before" );
 });
@@ -1019,9 +1060,7 @@ test("insertBefore(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	equals( expected, jQuery('#en').text(), "Insert array of elements before" );
 
 	reset();
-	expected = document.querySelectorAll ?
-		"This is a normal link: diveintomarkTry them out:Yahoo" :
-		"This is a normal link: Try them out:diveintomarkYahoo";
+	expected = "This is a normal link: diveintomarkTry them out:Yahoo";
 	jQuery("#first, #mark").insertBefore('#yahoo');
 	equals( expected, jQuery('#en').text(), "Insert jQuery before" );
 });
@@ -1043,9 +1082,7 @@ test("after(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	equals( expected, jQuery('#en').text(), "Insert array of elements after" );
 
 	reset();
-	expected = document.querySelectorAll ?
-		"This is a normal link: YahoodiveintomarkTry them out:" :
-		"This is a normal link: YahooTry them out:diveintomark";
+	expected = "This is a normal link: YahoodiveintomarkTry them out:";
 	jQuery('#yahoo').after(jQuery("#first, #mark"));
 	equals( expected, jQuery('#en').text(), "Insert jQuery after" );
 });
@@ -1063,12 +1100,12 @@ test("insertAfter(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 
 	reset();
 	expected = "This is a normal link: YahooTry them out:diveintomark";
-	jQuery([document.getElementById('mark'), document.getElementById('first')]).insertAfter('#yahoo');
+	jQuery([document.getElementById('first'), document.getElementById('mark')]).insertAfter('#yahoo');
 	equals( expected, jQuery('#en').text(), "Insert array of elements after" );
 
 	reset();
-	expected = "This is a normal link: YahooTry them out:diveintomark";
-	jQuery("#mark, #first").insertAfter('#yahoo');
+	expected = "This is a normal link: YahoodiveintomarkTry them out:";
+	jQuery("#first, #mark").insertAfter('#yahoo');
 	equals( expected, jQuery('#en').text(), "Insert jQuery after" );
 });
 
@@ -1140,7 +1177,7 @@ test("find(String)", function() {
 });
 
 test("clone()", function() {
-	expect(20);
+	expect(28);
 	equals( 'This is a normal link: Yahoo', jQuery('#en').text(), 'Assert text for #en' );
 	var clone = jQuery('#yahoo').clone();
 	equals( 'Try them out:Yahoo', jQuery('#first').append(clone).text(), 'Check for clone' );
@@ -1160,6 +1197,31 @@ test("clone()", function() {
 	// using contents will get comments regular, text, and comment nodes
 	var cl = jQuery("#nonnodes").contents().clone();
 	ok( cl.length >= 2, "Check node,textnode,comment clone works (some browsers delete comments on clone)" );
+
+	var div = jQuery("<div><ul><li>test</li></ul></div>").click(function(){
+		ok( true, "Bound event still exists." );
+	});
+
+	div = div.clone(true).clone(true);
+	equals( div.length, 1, "One element cloned" );
+	equals( div[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
+	div.trigger("click");
+
+	div = jQuery("<div/>").append([ document.createElement("table"), document.createElement("table") ]);
+	div.find("table").click(function(){
+		ok( true, "Bound event still exists." );
+	});
+
+	div = div.clone(true);
+	equals( div.length, 1, "One element cloned" );
+	equals( div[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
+	div.find("table:last").trigger("click");
+
+	div = jQuery("<div/>").html('<object height="355" width="425">  <param name="movie" value="http://www.youtube.com/v/JikaHBDoV3k&amp;hl=en">  <param name="wmode" value="transparent"> </object>');
+
+	div = div.clone(true);
+	equals( div.length, 1, "One element cloned" );
+	equals( div[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
 });
 
 if (!isLocal) {
@@ -1345,10 +1407,11 @@ test("val(String/Number)", function() {
 	j.removeAttr("value");
 });
 
-var scriptorder = 0;
-
 test("html(String)", function() {
-	expect(13);
+	expect(17);
+	
+	jQuery.scriptorder = 0;
+	
 	var div = jQuery("#main > div");
 	div.html("<b>test</b>");
 	var pass = true;
@@ -1364,7 +1427,7 @@ test("html(String)", function() {
 
 	// this is needed, or the expando added by jQuery unique will yield a different html
 	j.find('b').removeData();
-	equals( j.html().toLowerCase(), "<b>bold</b>", "Check node,textnode,comment with html()" );
+	equals( j.html().replace(/ xmlns="[^"]+"/g, "").toLowerCase(), "<b>bold</b>", "Check node,textnode,comment with html()" );
 
 	jQuery("#main").html("<select/>");
 	jQuery("#main select").html("<option>O1</option><option selected='selected'>O2</option><option>O3</option>");
@@ -1374,6 +1437,10 @@ test("html(String)", function() {
 	equals( $div.html( 5 ).html(), '5', 'Setting a number as html' );
 	equals( $div.html( 0 ).html(), '0', 'Setting a zero as html' );
 
+	reset();
+
+	jQuery("#main").html('<script type="something/else">ok( false, "Non-script evaluated." );</script><script type="text/javascript">ok( true, "text/javascript is evaluated." );</script><script>ok( true, "No type is evaluated." );</script><div><script type="text/javascript">ok( true, "Inner text/javascript is evaluated." );</script><script>ok( true, "Inner No type is evaluated." );</script><script type="something/else">ok( false, "Non-script evaluated." );</script></div>');
+
 	stop();
 
 	jQuery("#main").html('<script type="text/javascript">ok( true, "jQuery().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script>');
@@ -1381,7 +1448,7 @@ test("html(String)", function() {
 	jQuery("#main").html('foo <form><script type="text/javascript">ok( true, "jQuery().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
-	jQuery("#main").html("<script>equals(scriptorder++, 0, 'Script is executed in order');equals(jQuery('#scriptorder').length, 1,'Execute after html (even though appears before)')<\/script><span id='scriptorder'><script>equals(scriptorder++, 1, 'Script (nested) is executed in order');equals(jQuery('#scriptorder').length, 1,'Execute after html')<\/script></span><script>equals(scriptorder++, 2, 'Script (unnested) is executed in order');equals(jQuery('#scriptorder').length, 1,'Execute after html')<\/script>");
+	jQuery("#main").html("<script>equals(jQuery.scriptorder++, 0, 'Script is executed in order');equals(jQuery('#scriptorder').length, 1,'Execute after html (even though appears before)')<\/script><span id='scriptorder'><script>equals(jQuery.scriptorder++, 1, 'Script (nested) is executed in order');equals(jQuery('#scriptorder').length, 1,'Execute after html')<\/script></span><script>equals(jQuery.scriptorder++, 2, 'Script (unnested) is executed in order');equals(jQuery('#scriptorder').length, 1,'Execute after html')<\/script>");
 
 	setTimeout( start, 100 );
 });
@@ -1400,11 +1467,14 @@ test("filter()", function() {
 });
 
 test("closest()", function() {
-	expect(4);
+	expect(6);
 	isSet( jQuery("body").closest("body").get(), q("body"), "closest(body)" );
 	isSet( jQuery("body").closest("html").get(), q("html"), "closest(html)" );
 	isSet( jQuery("body").closest("div").get(), [], "closest(div)" );
 	isSet( jQuery("#main").closest("span,#html").get(), q("html"), "closest(span,#html)" );
+
+	isSet( jQuery("div:eq(1)").closest("div:first").get(), [], "closest(div:first)" );
+	isSet( jQuery("div").closest("body:first div:last").get(), q("fx-tests"), "closest(body:first div:last)" );
 });
 
 test("not()", function() {
@@ -1430,7 +1500,7 @@ test("andSelf()", function() {
 	isSet( jQuery("#en").siblings().andSelf().get(), q("sndp", "sap","en"), "Check for siblings and self" );
 	isSet( jQuery("#foo").children().andSelf().get(), q("sndp", "en", "sap", "foo"), "Check for children and self" );
 	isSet( jQuery("#sndp, #en").parent().andSelf().get(), q("foo","sndp","en"), "Check for parent and self" );
-	isSet( jQuery("#groups").parents("p, div").andSelf().get(), q("ap", "main", "groups"), "Check for parents and self" );
+	isSet( jQuery("#groups").parents("p, div").andSelf().get(), q("main", "ap", "groups"), "Check for parents and self" );
 });
 
 test("siblings([String])", function() {
@@ -1438,8 +1508,8 @@ test("siblings([String])", function() {
 	isSet( jQuery("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" );
 	isSet( jQuery("#sndp").siblings(":has(code)").get(), q("sap"), "Check for filtered siblings (has code child element)" );
 	isSet( jQuery("#sndp").siblings(":has(a)").get(), q("en", "sap"), "Check for filtered siblings (has anchor child element)" );
-	isSet( jQuery("#foo").siblings("form, b").get(), q("form", "lengthtest", "name-tests", "testForm", "floatTest"), "Check for multiple filters" );
-	var set = document.querySelectorAll ? q("en", "sap", "sndp") : q("sndp", "sap", "en");
+	isSet( jQuery("#foo").siblings("form, b").get(), q("form", "floatTest", "lengthtest", "name-tests", "testForm"), "Check for multiple filters" );
+	var set = q("en", "sap", "sndp");
 	isSet( jQuery("#en, #sndp").siblings().get(), set, "Check for unique results from siblings" );
 });
 
@@ -1464,7 +1534,7 @@ test("parents([String])", function() {
 	equals( jQuery("#groups").parents()[0].id, "ap", "Simple parents check" );
 	equals( jQuery("#groups").parents("p")[0].id, "ap", "Filtered parents check" );
 	equals( jQuery("#groups").parents("div")[0].id, "main", "Filtered parents check2" );
-	isSet( jQuery("#groups").parents("p, div").get(), q("ap", "main"), "Check for multiple filters" );
+	isSet( jQuery("#groups").parents("p, div").get(), q("main", "ap"), "Check for multiple filters" );
 	isSet( jQuery("#en, #sndp").parents().get(), q("foo", "main", "dl", "body", "html"), "Check for unique results from parents" );
 });
 
@@ -1486,13 +1556,16 @@ test("prev([String])", function() {
 
 test("show()", function() {
 	expect(15);
-	var pass = true, div = jQuery("div");
+	var pass = true, div = jQuery("#main div");
 	div.show().each(function(){
 		if ( this.style.display == "none" ) pass = false;
 	});
 	ok( pass, "Show" );
 
 	jQuery("#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 old = jQuery("#show-tests table").show().css("display") !== "table";
+
 	var test = {
 		"div"      : "block",
 		"p"        : "block",
@@ -1500,14 +1573,14 @@ test("show()", function() {
 		"code"     : "inline",
 		"pre"      : "block",
 		"span"     : "inline",
-		"table"    : jQuery.browser.msie ? "block" : "table",
-		"thead"    : jQuery.browser.msie ? "block" : "table-header-group",
-		"tbody"    : jQuery.browser.msie ? "block" : "table-row-group",
-		"tr"       : jQuery.browser.msie ? "block" : "table-row",
-		"th"       : jQuery.browser.msie ? "block" : "table-cell",
-		"td"       : jQuery.browser.msie ? "block" : "table-cell",
+		"table"    : old ? "block" : "table",
+		"thead"    : old ? "block" : "table-header-group",
+		"tbody"    : old ? "block" : "table-row-group",
+		"tr"       : old ? "block" : "table-row",
+		"th"       : old ? "block" : "table-cell",
+		"td"       : old ? "block" : "table-cell",
 		"ul"       : "block",
-		"li"       : jQuery.browser.msie ? "block" : "list-item"
+		"li"       : old ? "block" : "list-item"
 	};
 
 	jQuery.each(test, function(selector, expected) {
@@ -1533,7 +1606,7 @@ test("addClass(String)", function() {
 });
 
 test("removeClass(String) - simple", function() {
-	expect(4);
+	expect(5);
 	
 	var $divs = jQuery('div');
 	
@@ -1542,13 +1615,17 @@ test("removeClass(String) - simple", function() {
 	ok( !$divs.is('.test'), "Remove Class" );
 
 	reset();
-	
+
 	$divs.addClass("test").addClass("foo").addClass("bar");
 	$divs.removeClass("test").removeClass("bar").removeClass("foo");
 	
 	ok( !$divs.is('.test,.bar,.foo'), "Remove multiple classes" );
 
 	reset();
+
+	// Make sure that a null value doesn't cause problems
+	$divs.eq(0).addClass("test").removeClass(null);
+	ok( $divs.eq(0).is('.test'), "Null value passed to removeClass" );
 	
 	$divs.eq(0).addClass("test").removeClass("");
 	ok( $divs.eq(0).is('.test'), "Empty string passed to removeClass" );
@@ -1621,13 +1698,6 @@ test("jQuery.each(Object,Function)", function() {
         equals( total, 3, "Looping over an object, with break" );
 });
 
-test("jQuery.prop", function() {
-	expect(2);
-	var handle = function() { return this.id };
-	equals( jQuery.prop(jQuery("#ap")[0], handle), "ap", "Check with Function argument" );
-	equals( jQuery.prop(jQuery("#ap")[0], "value"), "value", "Check with value argument" );
-});
-
 test("jQuery.className", function() {
 	expect(6);
 	var x = jQuery("<p>Hi</p>")[0];
@@ -1646,7 +1716,7 @@ test("jQuery.className", function() {
 });
 
 test("remove()", function() {
-	expect(6);
+	expect(7);
 	jQuery("#ap").children().remove();
 	ok( jQuery("#ap").text().length > 10, "Check text is not removed" );
 	equals( jQuery("#ap").children().length, 0, "Check remove" );
@@ -1656,6 +1726,9 @@ test("remove()", function() {
 	ok( jQuery("#ap").text().length > 10, "Check text is not removed" );
 	equals( jQuery("#ap").children().length, 1, "Check filtered remove" );
 
+	jQuery("#ap").children().remove("a, code");
+	equals( jQuery("#ap").children().length, 0, "Check multi-filtered remove" );
+
 	// using contents will get comments regular, text, and comment nodes
 	equals( jQuery("#nonnodes").contents().length, 3, "Check node,textnode,comment remove works" );
 	jQuery("#nonnodes").contents().remove();
@@ -1771,7 +1844,7 @@ test("contents()", function() {
 test("jQuery.makeArray", function(){
 	expect(15);
 
-	equals( jQuery.makeArray(jQuery('html>*'))[0].nodeName, "HEAD", "Pass makeArray a jQuery object" );
+	equals( jQuery.makeArray(jQuery('html>*'))[0].nodeName.toUpperCase(), "HEAD", "Pass makeArray a jQuery object" );
 
 	equals( jQuery.makeArray(document.getElementsByName("PWD")).slice(0,1)[0].name, "PWD", "Pass makeArray a nodelist" );
 
@@ -1787,7 +1860,7 @@ test("jQuery.makeArray", function(){
 
 	equals( jQuery.makeArray( true )[0].constructor, Boolean, "Pass makeArray a boolean" );
 
-	equals( jQuery.makeArray( document.createElement("div") )[0].nodeName, "DIV", "Pass makeArray a single node" );
+	equals( jQuery.makeArray( document.createElement("div") )[0].nodeName.toUpperCase(), "DIV", "Pass makeArray a single node" );
 
 	equals( jQuery.makeArray( {length:2, 0:"a", 1:"b"} ).join(""), "ab", "Pass makeArray an array like map (with length)" );