Made .clone(true) also copy over element data. Fixes #4191.

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

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index c8ea240..6de3e14 100644 (file)
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -13,7 +13,7 @@ test("text()", function() {
 });
 
 var testWrap = function(val) {
-       expect(15);
+       expect(18);
        var defaultText = 'Try them out:'
        var result = jQuery('#first').wrap(val( '<div class="red"><span></span></div>' )).text();
        equals( defaultText, result, 'Check for wrapping of on-the-fly html' );
@@ -54,6 +54,20 @@ var testWrap = function(val) {
        equals( j[0].parentNode.parentNode.childNodes.length, 1, "There should only be one element wrapping." );
        equals( j.length, 1, "There should only be one element (no cloning)." );
        equals( j[0].parentNode.nodeName.toUpperCase(), "P", "The span should be in the paragraph." );
+
+       // Wrap an element with a jQuery set
+       j = jQuery("<span/>").wrap(jQuery("<div></div>"));
+       equals( j[0].parentNode.nodeName.toLowerCase(), "div", "Wrapping works." );
+
+       // Wrap an element with a jQuery set and event
+       result = jQuery("<div></div>").click(function(){
+               ok(true, "Event triggered.");
+       });
+
+       j = jQuery("<span/>").wrap(result);
+       equals( j[0].parentNode.nodeName.toLowerCase(), "div", "Wrapping works." );
+
+       j.parent().trigger("click");
 }
 
 test("wrap(String|Element)", function() {
@@ -151,7 +165,7 @@ test("unwrap()", function() {
 });
 
 var testAppend = function(valueObj) {
-       expect(21);
+       expect(22);
        var defaultText = 'Try them out:'
        var result = jQuery('#first').append(valueObj('<b>buga</b>'));
        equals( result.text(), defaultText + 'buga', 'Check if text appending works' );
@@ -224,6 +238,8 @@ var testAppend = function(valueObj) {
 
        t( "Append Select", "#appendSelect1, #appendSelect2", ["appendSelect1", "appendSelect2"] );
 
+       equals( "Two nodes", jQuery('<div />').append("Two", " nodes").text(), "Appending two text nodes (#4011)" );
+
        // using contents will get comments regular, text, and comment nodes
        var j = jQuery("#nonnodes").contents();
        var d = jQuery("<div/>").appendTo("#nonnodes").append(j);
@@ -533,7 +549,7 @@ test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 test("clone()", function() {
-       expect(28);
+       expect(30);
        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' );
@@ -578,6 +594,11 @@ test("clone()", function() {
        div = div.clone(true);
        equals( div.length, 1, "One element cloned" );
        equals( div[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
+
+       div = jQuery("<div/>").data({ a: true, b: true });
+       div = div.clone(true);
+       equals( div.data("a"), true, "Data cloned." );
+       equals( div.data("b"), true, "Data cloned." );
 });
 
 if (!isLocal) {
@@ -657,7 +678,7 @@ test("val(Function)", function() {
 })
 
 var testHtml = function(valueObj) {
-       expect(20);
+       expect(22);
 
        jQuery.scriptorder = 0;
 
@@ -691,6 +712,10 @@ var testHtml = function(valueObj) {
        equals( $div2.html("x" + insert).html(), "x" + insert, "Verify escaped insertion." );
        equals( $div2.html(" " + insert).html(), " " + 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'>"));
+
+       equals( map[0].childNodes.length, 1, "The area was inserted." );
+       equals( map[0].firstChild.nodeName.toLowerCase(), "area", "The area was inserted." );
 
        reset();