Adding in .unwrap() support, thanks to Ben Alman! Fixes #5191.

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

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index c942bfd..b9cb35d 100644 (file)
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -116,6 +116,37 @@ test("wrapInner(String|Element)", function() {
 //     testWrapInner(functionReturningObj)
 // })
 
+var testUnwrap = function() {
+       expect(9);
+
+       jQuery("body").append('  <div id="unwrap" style="display: none;"> <div id="unwrap1"> <span class="unwrap">a</span> <span class="unwrap">b</span> </div> <div id="unwrap2"> <span class="unwrap">c</span> <span class="unwrap">d</span> </div> <div id="unwrap3"> <b><span class="unwrap unwrap3">e</span></b> <b><span class="unwrap unwrap3">f</span></b> </div> </div>');
+
+       var abcd = jQuery('#unwrap1 > span, #unwrap2 > span').get(),
+               abcdef = jQuery('#unwrap span').get();
+
+       equals( jQuery('#unwrap1 span, #unwrap2 span:first').unwrap().length, 3, 'make #unwrap1 and #unwrap2 go away' );
+       same( jQuery('#unwrap > span').get(), abcd, 'all four spans should still exist' );
+
+       same( jQuery('#unwrap3 span').unwrap().get(), jQuery('#unwrap3 > span').get(), 'make all b in #unwrap3 go away' );
+
+       same( jQuery('#unwrap3 span').unwrap().get(), jQuery('#unwrap > span.unwrap3').get(), 'make #unwrap3 go away' );
+
+       same( jQuery('#unwrap').children().get(), abcdef, '#unwrap only contains 6 child spans' );
+
+       same( jQuery('#unwrap > span').unwrap().get(), jQuery('body > span.unwrap').get(), 'make the 6 spans become children of body' );
+
+       same( jQuery('body > span.unwrap').unwrap().get(), jQuery('body > span.unwrap').get(), 'can\'t unwrap children of body' );
+       same( jQuery('body > span.unwrap').unwrap().get(), abcdef, 'can\'t unwrap children of body' );
+
+       same( jQuery('body > span.unwrap').get(), abcdef, 'body contains 6 .unwrap child spans' );
+
+       jQuery('body > span.unwrap').remove();
+}
+
+test("unwrap()", function() {
+       testUnwrap();
+});
+
 var testAppend = function(valueObj) {
        expect(21);
        var defaultText = 'Try them out:'
@@ -320,7 +351,7 @@ test("prependTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 var testBefore = function(val) {
-       expect(4);
+       expect(6);
        var expected = 'This is a normal link: bugaYahoo';
        jQuery('#yahoo').before(val( '<b>buga</b>' ));
        equals( expected, jQuery('#en').text(), 'Insert String before' );
@@ -339,6 +370,10 @@ var testBefore = function(val) {
        expected = "This is a normal link: diveintomarkTry them out:Yahoo";
        jQuery('#yahoo').before(val( jQuery("#first, #mark") ));
        equals( expected, jQuery('#en').text(), "Insert jQuery before" );
+
+       var set = jQuery("<div/>").before("<span>test</span>");
+       equals( set[0].nodeName.toLowerCase(), "span", "Insert the element before the disconnected node." );
+       equals( set.length, 2, "Insert the element before the disconnected node." );
 }
 
 test("before(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -372,7 +407,7 @@ test("insertBefore(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 var testAfter = function(val) {
-       expect(4);
+       expect(6);
        var expected = 'This is a normal link: Yahoobuga';
        jQuery('#yahoo').after(val( '<b>buga</b>' ));
        equals( expected, jQuery('#en').text(), 'Insert String after' );
@@ -391,6 +426,10 @@ var testAfter = function(val) {
        expected = "This is a normal link: YahoodiveintomarkTry them out:";
        jQuery('#yahoo').after(val( jQuery("#first, #mark") ));
        equals( expected, jQuery('#en').text(), "Insert jQuery after" );
+
+       var set = jQuery("<div/>").after("<span>test</span>");
+       equals( set[1].nodeName.toLowerCase(), "span", "Insert the element after the disconnected node." );
+       equals( set.length, 2, "Insert the element after the disconnected node." );
 };
 
 test("after(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -424,7 +463,7 @@ test("insertAfter(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 var testReplaceWith = function(val) {
-       expect(10);
+       expect(12);
        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' );
@@ -445,6 +484,10 @@ var testReplaceWith = function(val) {
        ok( jQuery("#first")[0], 'Replace element with set of elements' );
        ok( jQuery("#mark")[0], 'Replace element with set of elements' );
        ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after set of elements' );
+
+       var set = jQuery("<div/>").replaceWith(val("<span>test</span>"));
+       equals( set[0].nodeName.toLowerCase(), "span", "Replace the disconnected node." );
+       equals( set.length, 1, "Replace the disconnected node." );
 }
 
 test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -614,7 +657,7 @@ var testHtml = function(valueObj) {
        }
        ok( pass, "Set HTML" );
 
-       window.debug = false;
+       delete window.debug;
 
        reset();
        // using contents will get comments regular, text, and comment nodes
@@ -706,9 +749,11 @@ var testRemove = function(method) {
 
        var count = 0;
        var first = jQuery("#ap").children(":first");
-       first.click(function() { count++ })[method]().appendTo("body").click();
-
+       var cleanUp = first.click(function() { count++ })[method]().appendTo("body").click();
+       
        equals( method == "remove" ? 0 : 1, count );
+       
+       cleanUp.detach();
 };
 
 test("remove()", function() {