Backing out cec68e2b00d86357c18b576cbaed52cc1ea42a74, was causing serialize tests...

[jquery.git] / test / unit / manipulation.js

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index e1d3dbf..4805016 100644 (file)
--- 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) {
@@ -899,7 +912,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 +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() {