X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=e387d640eba82b04fb7cf6270c67a92e1b2148a3;hb=3e286440d55749382a644ea97b4f0b2587779d65;hp=3eef1221cdf2df0d907c944c123ea675045d51e7;hpb=3e9ef6f5c08e63a90ef2dfd3bdc833994e7a0ac8;p=jquery.git

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 3eef122..e387d64 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -139,13 +139,8 @@ test("wrapAll(String|Element)", function() {
 	testWrapAll(bareObj);
 });
 
-// TODO: Figure out why each(wrapAll) is not equivalent to wrapAll
-// test("wrapAll(Function)", function() {
-//	testWrapAll(functionReturningObj);
-// })
-
 var testWrapInner = function(val) {
-	expect(6);
+	expect(8);
 	var num = jQuery("#first").children().length;
 	var result = jQuery('#first').wrapInner('<div class="red"><div id="tmp"></div></div>');
 	equals( jQuery("#first").children().length, 1, "Only one child" );
@@ -158,6 +153,11 @@ var testWrapInner = function(val) {
 	equals( jQuery("#first").children().length, 1, "Only one child" );
 	ok( jQuery("#first").children().is("#empty"), "Verify Right Element" );
 	equals( jQuery("#first").children().children().length, num, "Verify Elements Intact" );
+
+	var div = jQuery("<div/>");
+	div.wrapInner("<span></span>");
+	equals(div.children().length, 1, "The contents were wrapped.");
+	equals(div.children()[0].nodeName.toLowerCase(), "span", "A span was inserted.");
 }
 
 test("wrapInner(String|Element)", function() {
@@ -626,7 +626,7 @@ test("insertAfter(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 var testReplaceWith = function(val) {
-	expect(16);
+	expect(15);
 	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' );
@@ -650,9 +650,8 @@ var testReplaceWith = function(val) {
 
 	reset();
 	var tmp = jQuery("<div/>").appendTo("body").click(function(){ ok(true, "Newly bound click run." ); });
-	var y = jQuery('#yahoo').click(function(){ ok(true, "Previously bound click run." ); });
+	var y = jQuery('<div/>').appendTo("body").click(function(){ ok(true, "Previously bound click run." ); });
 	var child = y.append("<b>test</b>").find("b").click(function(){ ok(true, "Child bound click run." ); return false; });
-	var child2 = y.append("<u>test</u>").find("u").click(function(){ ok(true, "Child 2 bound click run." ); return false; });
 
 	y.replaceWith( tmp );
 
@@ -660,15 +659,22 @@ var testReplaceWith = function(val) {
 	y.click(); // Shouldn't be run
 	child.click(); // Shouldn't be run
 
+	tmp.remove();
+	y.remove();
+	child.remove();
+
 	reset();
 
-	y = jQuery('#yahoo').click(function(){ ok(true, "Previously bound click run." ); });
+	y = jQuery('<div/>').appendTo("body").click(function(){ ok(true, "Previously bound click run." ); });
 	var child2 = y.append("<u>test</u>").find("u").click(function(){ ok(true, "Child 2 bound click run." ); return false; });
 
 	y.replaceWith( child2 );
 
 	child2.click();
 
+	y.remove();
+	child2.remove();
+
 	reset();
 
 	var set = jQuery("<div/>").replaceWith(val("<span>test</span>"));
@@ -676,9 +682,10 @@ var testReplaceWith = function(val) {
 	equals( set.length, 1, "Replace the disconnected node." );
 
 	var $div = jQuery("<div class='replacewith'></div>").appendTo("body");
-	$div.replaceWith("<div class='replacewith'></div><script>" +
-		"equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');" +
-		"</script>");
+	// TODO: Work on jQuery(...) inline script execution
+	//$div.replaceWith("<div class='replacewith'></div><script>" +
+		//"equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');" +
+		//"</script>");
 	equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');
 	jQuery('.replacewith').remove();
 }
@@ -816,9 +823,9 @@ var testHtml = function(valueObj) {
 	equals( $div.html(valueObj( 0 )).html(), '0', 'Setting a zero as html' );
 
 	var $div2 = jQuery('<div/>'), insert = "&lt;div&gt;hello1&lt;/div&gt;";
-	equals( $div2.html(insert).html(), insert, "Verify escaped insertion." );
-	equals( $div2.html("x" + insert).html(), "x" + insert, "Verify escaped insertion." );
-	equals( $div2.html(" " + insert).html(), " " + insert, "Verify escaped insertion." );
+	equals( $div2.html(insert).html().replace(/>/g, "&gt;"), insert, "Verify escaped insertion." );
+	equals( $div2.html("x" + insert).html().replace(/>/g, "&gt;"), "x" + insert, "Verify escaped insertion." );
+	equals( $div2.html(" " + insert).html().replace(/>/g, "&gt;"), " " + insert, "Verify escaped insertion." );
 
 	var map = jQuery("<map/>").html(valueObj("<area id='map01' shape='rect' coords='50,50,150,150' href='http://www.jquery.com/' alt='jQuery'>"));
 
@@ -896,17 +903,17 @@ test("html(Function) with incoming value", function() {
 	equals( $div2.html(function(i, val) {
 		equals( val, "", "Make sure the incoming value is correct." );
 		return insert;
-	}).html(), insert, "Verify escaped insertion." );
+	}).html().replace(/>/g, "&gt;"), insert, "Verify escaped insertion." );
 	
 	equals( $div2.html(function(i, val) {
-		equals( val, insert, "Make sure the incoming value is correct." );
+		equals( val.replace(/>/g, "&gt;"), insert, "Make sure the incoming value is correct." );
 		return "x" + insert;
-	}).html(), "x" + insert, "Verify escaped insertion." );
+	}).html().replace(/>/g, "&gt;"), "x" + insert, "Verify escaped insertion." );
 	
 	equals( $div2.html(function(i, val) {
-		equals( val, "x" + insert, "Make sure the incoming value is correct." );
+		equals( val.replace(/>/g, "&gt;"), "x" + insert, "Make sure the incoming value is correct." );
 		return " " + insert;
-	}).html(), " " + insert, "Verify escaped insertion." );	
+	}).html().replace(/>/g, "&gt;"), " " + insert, "Verify escaped insertion." );	
 });
 
 var testRemove = function(method) {