X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=d4c43487192395dbfaadfeb183d4dada4fd8a17b;hb=335e0a33e19b9c8703246dd033dcc68c2da5de36;hp=87af324d2a07bbe70e82948d213a50ab33c69179;hpb=9ce1d09a0a002eb147411166dee800335a60f4e4;p=jquery.git

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 87af324..d4c4348 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -680,7 +680,7 @@ test("insertAfter(String|Element|Array<Element>|jQuery)", function() {
 });
 
 var testReplaceWith = function(val) {
-	expect(17);
+	expect(20);
 	jQuery('#yahoo').replaceWith(val( '<b id="replace">buga</b>' ));
 	ok( jQuery("#replace")[0], 'Replace element with string' );
 	ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after string' );
@@ -748,6 +748,17 @@ var testReplaceWith = function(val) {
 		//"</script>");
 	equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');
 	jQuery('.replacewith').remove();
+
+	QUnit.reset();
+
+	jQuery("#main").append("<div id='replaceWith'></div>");
+	equals( jQuery("#main").find("div[id=replaceWith]").length, 1, "Make sure only one div exists." );
+
+	jQuery("#replaceWith").replaceWith( val("<div id='replaceWith'></div>") );
+	equals( jQuery("#main").find("div[id=replaceWith]").length, 1, "Make sure only one div exists." );
+
+	jQuery("#replaceWith").replaceWith( val("<div id='replaceWith'></div>") );
+	equals( jQuery("#main").find("div[id=replaceWith]").length, 1, "Make sure only one div exists." );
 }
 
 test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -757,7 +768,7 @@ test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 test("replaceWith(Function)", function() {
 	testReplaceWith(functionReturningObj);
 
-	expect(18);
+	expect(21);
 
 	var y = jQuery("#yahoo")[0];
 
@@ -899,7 +910,7 @@ var testHtml = function(valueObj) {
 	equals( div.children().children().length, 1, "Make sure that a grandchild exists." );
 
 	var space = jQuery("<div/>").html(valueObj("&#160;"))[0].innerHTML;
-	ok( /^\s$|^&nbsp;$/.test( space ), "Make sure entities are passed through correctly." );
+	ok( /^\xA0$|^&nbsp;$/.test( space ), "Make sure entities are passed through correctly." );
 	equals( jQuery("<div/>").html(valueObj("&amp;"))[0].innerHTML, "&amp;", "Make sure entities are passed through correctly." );
 
 	jQuery("#main").html(valueObj("<style>.foobar{color:green;}</style>"));
@@ -955,6 +966,17 @@ test("html(String)", function() {
 
 test("html(Function)", function() {
 	testHtml(functionReturningObj);
+
+	expect(33);
+
+	QUnit.reset();
+
+	jQuery("#main").html(function(){
+		return jQuery(this).text();
+	});
+
+	ok( !/</.test( jQuery("#main").html() ), "Replace html with text." );
+	ok( jQuery("#main").html().length > 0, "Make sure text exists." );
 });
 
 test("html(Function) with incoming value", function() {
@@ -984,6 +1006,11 @@ test("html(Function) with incoming value", function() {
 		equals( val, old[i], "Make sure the incoming value is correct." );
 		return "<b>bold</b>";
 	});
+
+	// Handle the case where no comment is in the document
+	if ( j.length === 2 ) {
+		equals( null, null, "Make sure the incoming value is correct." );
+	}
 	
 	j.find('b').removeData();
 	equals( j.html().replace(/ xmlns="[^"]+"/g, "").toLowerCase(), "<b>bold</b>", "Check node,textnode,comment with html()" );
@@ -1038,7 +1065,8 @@ var testRemove = function(method) {
 	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" );
+	// Handle the case where no comment is in the document
+	ok( jQuery("#nonnodes").contents().length >= 2, "Check node,textnode,comment remove works" );
 	jQuery("#nonnodes").contents()[method]();
 	equals( jQuery("#nonnodes").contents().length, 0, "Check node,textnode,comment remove works" );