X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=03f89d1cc098cd2d0b474e2052da4f06656933d4;hb=14a3a5bf9d65d9910a730d53208e3dccb34e3704;hp=533fcef2d0637529ba835ec70a3f55417e0ba3eb;hpb=b3ec8edddd9261eef490f8317144e9c68c888819;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 533fcef..03f89d1 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -152,7 +152,7 @@ test("isFunction", function() {
 var foo = false;
 
 test("$('html')", function() {
-	expect(5);
+	expect(6);
 
 	reset();
 	foo = false;
@@ -169,6 +169,8 @@ test("$('html')", function() {
 
 	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() {
@@ -864,7 +866,7 @@ test("find(String)", function() {
 });
 
 test("clone()", function() {
-	expect(4);
+	expect(6);
 	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' );
@@ -872,6 +874,16 @@ test("clone()", function() {
 	// 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)" );
+
+	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() {
@@ -1022,7 +1034,8 @@ test("html(String)", function() {
 
 	$("#main").html('foo <form><script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script></form>');
 
-	$("#main").html("<script>ok(scriptorder++ == 0, 'Script is executed in order');ok($('#scriptorder').length == 0,'Execute before html')<\/script><span id='scriptorder'><script>ok(scriptorder++ == 1, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script></span><script>ok(scriptorder++ == 2, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script>");
+	// 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 );
 });
@@ -1041,10 +1054,12 @@ test("filter()", function() {
 });
 
 test("not()", function() {
-	expect(3);
+	expect(5);
 	ok( $("#main > p#ap > a").not("#google").length == 2, "not('selector')" );
+	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)" );
+	isSet( $("#form option").not("option.emptyopt:contains('Nothing'),[selected],[value='1']").get(), q("option1c", "option1d", "option2c", "option3d" ), "not('complex selector')");
 });
 
 test("andSelf()", function() {