X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=3a3b42f840f9abb216de544cd5c5deffe21e3998;hb=67d445a703491c90a7d3c46be34bcdceb4d1c896;hp=c58f13f35e9660d0f087260c46eb0f74f35552d3;hpb=2cd9ee3510a03091c929b849ea164c9f97e262e7;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index c58f13f..3a3b42f 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -62,7 +62,7 @@ test("jQuery()", function() {
 });
 
 test("selector state", function() {
-	expect(30);
+	expect(31);
 
 	var test;
 
@@ -126,6 +126,13 @@ test("selector state", function() {
 	test = jQuery("#main").eq(0);
 	equals( test.selector, "#main.slice(0,1)", "#main eq Selector" );
 	equals( test.context, document, "#main eq Context" );
+	
+	var d = "<div />";
+	equals(
+		jQuery(d).appendTo(jQuery(d)).selector,
+		jQuery(d).appendTo(d).selector,
+		"manipulation methods make same selector for jQuery objects"
+	);
 });
 
 test("browser", function() {
@@ -280,10 +287,10 @@ test("isXMLDoc - HTML", function() {
 	document.body.appendChild( iframe );
 
 	try {
-		var body = jQuery(iframe).contents().find("body")[0];
+		var body = jQuery(iframe).contents()[0];
 		ok( !jQuery.isXMLDoc( body ), "Iframe body element" );
 	} catch(e){
-		ok( false, "Iframe body element" );
+		ok( false, "Iframe body element exception" );
 	}
 
 	document.body.removeChild( iframe );
@@ -303,7 +310,7 @@ test("isXMLDoc - XML", function() {
 }
 
 test("jQuery('html')", function() {
-	expect(8);
+	expect(13);
 
 	reset();
 	jQuery.foo = false;
@@ -313,6 +320,14 @@ test("jQuery('html')", function() {
 	jQuery("body").append("<script>jQuery.foo='test';</script>");
 	ok( jQuery.foo, "Executing a scripts contents in the right context" );
 
+	// Test multi-line HTML
+	var div = jQuery("<div>\r\nsome text\n<p>some p</p>\nmore text\r\n</div>")[0];
+	equals( div.nodeName.toUpperCase(), "DIV", "Make sure we're getting a div." );
+	equals( div.firstChild.nodeType, 3, "Text node." );
+	equals( div.lastChild.nodeType, 3, "Text node." );
+	equals( div.childNodes[1].nodeType, 1, "Paragraph." );
+	equals( div.childNodes[1].firstChild.nodeType, 3, "Paragraph text." );
+
 	reset();
 	ok( jQuery("<link rel='stylesheet'/>")[0], "Creating a link" );
 
@@ -329,7 +344,7 @@ test("jQuery('html')", function() {
 test("jQuery('html', context)", function() {
 	expect(1);
 
-	var $div = jQuery("<div/>");
+	var $div = jQuery("<div/>")[0];
 	var $span = jQuery("<span/>", $div);
 	equals($span.length, 1, "Verify a span created with a div context works, #1763");
 });
@@ -384,7 +399,7 @@ test("get(-Number)",function() {
 })
 
 test("add(String|Element|Array|undefined)", function() {
-	expect(12);
+	expect(16);
 	isSet( jQuery("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" );
 	isSet( jQuery("#sndp").add( jQuery("#en")[0] ).add( jQuery("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" );
 	ok( jQuery([]).add(jQuery("#form")[0].elements).length >= 13, "Check elements from array" );
@@ -393,6 +408,16 @@ test("add(String|Element|Array|undefined)", function() {
 	// use jQuery([]).add(form.elements) instead.
 	//equals( jQuery([]).add(jQuery("#form")[0].elements).length, jQuery(jQuery("#form")[0].elements).length, "Array in constructor must equals array in add()" );
 
+	var tmp = jQuery("<div/>");
+
+	var x = jQuery([]).add(jQuery("<p id='x1'>xxx</p>").appendTo(tmp)).add(jQuery("<p id='x2'>xxx</p>").appendTo(tmp));
+	equals( x[0].id, "x1", "Check on-the-fly element1" );
+	equals( x[1].id, "x2", "Check on-the-fly element2" );
+
+	var x = jQuery([]).add(jQuery("<p id='x1'>xxx</p>").appendTo(tmp)[0]).add(jQuery("<p id='x2'>xxx</p>").appendTo(tmp)[0]);
+	equals( x[0].id, "x1", "Check on-the-fly element1" );
+	equals( x[1].id, "x2", "Check on-the-fly element2" );
+
 	var x = jQuery([]).add(jQuery("<p id='x1'>xxx</p>")).add(jQuery("<p id='x2'>xxx</p>"));
 	equals( x[0].id, "x1", "Check on-the-fly element1" );
 	equals( x[1].id, "x2", "Check on-the-fly element2" );