X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=e6e6c8d9c5098c8efa9c54c56a382b89c3772585;hb=abcc1a76ee2a6733177b2cd104bc32cee5443ec4;hp=f921ea190518a5780bffb1f2c3829adda22dfcfa;hpb=f95147f465932cb91e1a6aace50c556820ca4074;p=jquery.git

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index f921ea1..e6e6c8d 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -650,7 +650,7 @@ test("insertAfter(String|Element|Array<Element>|jQuery)", function() {
 });
 
 var testReplaceWith = function(val) {
-	expect(15);
+	expect(17);
 	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' );
@@ -661,6 +661,12 @@ var testReplaceWith = function(val) {
 	ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after element' );
 
 	reset();
+	jQuery("#main").append('<div id="bar"><div id="baz">Foo</div></div>');
+	jQuery('#baz').replaceWith("Baz");
+	equals( jQuery("#bar").text(),"Baz", 'Replace element with text' );
+	ok( !jQuery("#baz")[0], 'Verify that original element is gone, after element' );
+
+	reset();
 	jQuery('#yahoo').replaceWith(val( [document.getElementById('first'), document.getElementById('mark')] ));
 	ok( jQuery("#first")[0], 'Replace element with array of elements' );
 	ok( jQuery("#mark")[0], 'Replace element with array of elements' );
@@ -721,7 +727,7 @@ test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 test("replaceWith(Function)", function() {
 	testReplaceWith(functionReturningObj);
 
-	expect(16);
+	expect(18);
 
 	var y = jQuery("#yahoo")[0];
 
@@ -730,7 +736,17 @@ test("replaceWith(Function)", function() {
 	});
 
 	reset();
-})
+});
+
+test("replaceWith(string) for more than one element", function(){
+	expect(3);
+
+	equals(jQuery('#foo p').length, 3, 'ensuring that test data has not changed');
+
+	jQuery('#foo p').replaceWith('<span>bar</span>');
+	equals(jQuery('#foo span').length, 3, 'verify that all the three original element have been replaced');
+	equals(jQuery('#foo p').length, 0, 'verify that all the three original element have been replaced');
+});
 
 test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	expect(10);
@@ -835,7 +851,7 @@ test("clone() on XML nodes", function() {
 }
 
 var testHtml = function(valueObj) {
-	expect(24);
+	expect(26);
 
 	jQuery.scriptorder = 0;
 
@@ -852,6 +868,9 @@ var testHtml = function(valueObj) {
 	equals( div.children().length, 2, "Make sure two child nodes exist." );
 	equals( div.children().children().length, 1, "Make sure that a grandchild exists." );
 
+	equals( jQuery("<div/>").html(valueObj("&#160;"))[0].innerHTML, "&nbsp;", "Make sure entities are passed through correctly." );
+	equals( jQuery("<div/>").html(valueObj("&amp;"))[0].innerHTML, "&amp;", "Make sure entities are passed through correctly." );
+
 	reset();
 	// using contents will get comments regular, text, and comment nodes
 	var j = jQuery("#nonnodes").contents();