X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=8c3d1a55e679cf1096ac9ef395cfaac4cda95cc2;hb=da51cd0e43d6d61e0d3d6c197cef1e658bad29bc;hp=44fafa92b1cb09eb3838b18dcf70989145abe546;hpb=209278915592fc63bd62039e246046d446d329e0;p=jquery.git
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 44fafa9..8c3d1a5 100644
--- 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( '
' )).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("").wrap(jQuery(""));
+ equals( j[0].parentNode.nodeName.toLowerCase(), "div", "Wrapping works." );
+
+ // Wrap an element with a jQuery set and event
+ result = jQuery("").click(function(){
+ ok(true, "Event triggered.");
+ });
+
+ j = jQuery("").wrap(result);
+ equals( j[0].parentNode.nodeName.toLowerCase(), "div", "Wrapping works." );
+
+ j.parent().trigger("click");
}
test("wrap(String|Element)", function() {
@@ -535,7 +549,7 @@ test("replaceAll(String|Element|Array<Element>|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' );
@@ -580,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("").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) {
@@ -720,15 +739,16 @@ test("html(String)", function() {
test("html(Function)", function() {
testHtml(functionReturningObj);
-})
+});
var testText = function(valueObj) {
expect(4);
- equals( jQuery("#foo").text("Hello cruel world!
")[0].innerHTML.replace(/>/g, ">"), "<div><b>Hello</b> cruel world!</div>", "Check escaped text" );
+ var val = valueObj("Hello cruel world!
");
+ equals( jQuery("#foo").text(val)[0].innerHTML.replace(/>/g, ">"), "<div><b>Hello</b> cruel world!</div>", "Check escaped text" );
// using contents will get comments regular, text, and comment nodes
var j = jQuery("#nonnodes").contents();
- j.text("hi!");
+ j.text(valueObj("hi!"));
equals( jQuery(j[0]).text(), "hi!", "Check node,textnode,comment with text()" );
equals( j[1].nodeValue, " there ", "Check node,textnode,comment with text()" );
equals( j[2].nodeType, 8, "Check node,textnode,comment with text()" );