X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=48050168435aa1cc842024a6ac04b5a4cd60cc94;hb=b67154fd10c6226963dbbc4b3fe70d9f529b9d50;hp=2fc6f18899886570c5caa9f62de2728bc17feaa8;hpb=88fc523c59465b28633de91f4c9e87b8364064b7;p=jquery.git

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 2fc6f18..4805016 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];
 
@@ -803,7 +814,7 @@ test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 test("clone()", function() {
-	expect(31);
+	expect(32);
 	equals( 'This is a normal link: Yahoo', jQuery('#en').text(), 'Assert text for #en' );
 	var clone = jQuery('#yahoo').clone();
 	equals( 'Try them out:Yahoo', jQuery('#first').append(clone).text(), 'Check for clone' );
@@ -861,6 +872,8 @@ test("clone()", function() {
 	form.appendChild( div );
 
 	equals( jQuery(form).clone().children().length, 1, "Make sure we just get the form back." );
+
+	equal( jQuery("body").clone().children()[0].id, "qunit-header", "Make sure cloning body works" );
 });
 
 if (!isLocal) {
@@ -955,6 +968,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() {