X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=test%2Funit%2Fmanipulation.js;h=e387d640eba82b04fb7cf6270c67a92e1b2148a3;hb=0912109ffc86610161c769534df84400ccd1aa65;hp=a0ce302811278dacaeb9d8a64f9bab504ce9f1a1;hpb=c7407bd4fc343783a4e723f21227a6ee43b9a934;p=jquery.git
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index a0ce302..e387d64 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -12,8 +12,44 @@ test("text()", function() {
equals( jQuery(document.createTextNode("foo")).text(), "foo", "Text node was retreived from .text()." );
});
+var testText = function(valueObj) {
+ expect(4);
+ 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(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()" );
+}
+
+test("text(String)", function() {
+ testText(bareObj)
+});
+
+test("text(Function)", function() {
+ testText(functionReturningObj);
+});
+
+test("text(Function) with incoming value", function() {
+ expect(2);
+
+ var old = "This link has class=\"blog\": Simon Willison's Weblog";
+
+ jQuery('#sap').text(function(i, val) {
+ equals( val, old, "Make sure the incoming value is correct." );
+ return "foobar";
+ });
+
+ equals( jQuery("#sap").text(), "foobar", 'Check for merged text of more then one element.' );
+
+ reset();
+});
+
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 +90,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() {
@@ -89,13 +139,8 @@ test("wrapAll(String|Element)", function() {
testWrapAll(bareObj);
});
-// TODO: Figure out why each(wrapAll) is not equivalent to wrapAll
-// test("wrapAll(Function)", function() {
-// testWrapAll(functionReturningObj);
-// })
-
var testWrapInner = function(val) {
- expect(6);
+ expect(8);
var num = jQuery("#first").children().length;
var result = jQuery('#first').wrapInner('
');
equals( jQuery("#first").children().length, 1, "Only one child" );
@@ -108,6 +153,11 @@ var testWrapInner = function(val) {
equals( jQuery("#first").children().length, 1, "Only one child" );
ok( jQuery("#first").children().is("#empty"), "Verify Right Element" );
equals( jQuery("#first").children().children().length, num, "Verify Elements Intact" );
+
+ var div = jQuery("");
+ div.wrapInner("");
+ equals(div.children().length, 1, "The contents were wrapped.");
+ equals(div.children()[0].nodeName.toLowerCase(), "span", "A span was inserted.");
}
test("wrapInner(String|Element)", function() {
@@ -116,10 +166,10 @@ test("wrapInner(String|Element)", function() {
// TODO: wrapInner uses wrapAll -- get wrapAll working with Function
// test("wrapInner(Function)", function() {
-// testWrapInner(functionReturningObj)
+// testWrapInner(functionReturningObj)
// })
-var testUnwrap = function() {
+test("unwrap()", function() {
expect(9);
jQuery("body").append('
ab
cd
ef
');
@@ -127,7 +177,7 @@ var testUnwrap = function() {
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' );
+ equals( jQuery('#unwrap1 span').add('#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' );
@@ -144,14 +194,10 @@ var testUnwrap = function() {
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);
+ expect(22);
var defaultText = 'Try them out:'
var result = jQuery('#first').append(valueObj('buga'));
equals( result.text(), defaultText + 'buga', 'Check if text appending works' );
@@ -224,6 +270,8 @@ var testAppend = function(valueObj) {
t( "Append Select", "#appendSelect1, #appendSelect2", ["appendSelect1", "appendSelect2"] );
+ equals( "Two nodes", jQuery('').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("").appendTo("#nonnodes").append(j);
@@ -235,12 +283,73 @@ var testAppend = function(valueObj) {
}
test("append(String|Element|Array<Element>|jQuery)", function() {
- testAppend(bareObj);
+ testAppend(bareObj);
});
test("append(Function)", function() {
testAppend(functionReturningObj);
-})
+});
+
+test("append(Function) with incoming value", function() {
+ expect(12);
+
+ var defaultText = 'Try them out:', old = jQuery("#first").html();
+
+ var result = jQuery('#first').append(function(i, val){
+ equals( val, old, "Make sure the incoming value is correct." );
+ return 'buga';
+ });
+ equals( result.text(), defaultText + 'buga', 'Check if text appending works' );
+
+ var select = jQuery('#select3');
+ old = select.html();
+
+ equals( select.append(function(i, val){
+ equals( val, old, "Make sure the incoming value is correct." );
+ return '';
+ }).find('option:last-child').attr('value'), 'appendTest', 'Appending html options to select element');
+
+ reset();
+ var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
+ old = jQuery("#sap").html();
+
+ jQuery('#sap').append(function(i, val){
+ equals( val, old, "Make sure the incoming value is correct." );
+ return document.getElementById('first');
+ });
+ equals( expected, jQuery('#sap').text(), "Check for appending of element" );
+
+ reset();
+ expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
+ old = jQuery("#sap").html();
+
+ jQuery('#sap').append(function(i, val){
+ equals( val, old, "Make sure the incoming value is correct." );
+ return [document.getElementById('first'), document.getElementById('yahoo')];
+ });
+ equals( expected, jQuery('#sap').text(), "Check for appending of array of elements" );
+
+ reset();
+ expected = "This link has class=\"blog\": Simon Willison's WeblogYahooTry them out:";
+ old = jQuery("#sap").html();
+
+ jQuery('#sap').append(function(i, val){
+ equals( val, old, "Make sure the incoming value is correct." );
+ return jQuery("#first, #yahoo");
+ });
+ equals( expected, jQuery('#sap').text(), "Check for appending of jQuery object" );
+
+ reset();
+ old = jQuery("#sap").html();
+
+ jQuery("#sap").append(function(i, val){
+ equals( val, old, "Make sure the incoming value is correct." );
+ return 5;
+ });
+ ok( jQuery("#sap")[0].innerHTML.match( /5$/ ), "Check for appending a number" );
+
+ reset();
+});
test("appendTo(String|Element|Array<Element>|jQuery)", function() {
expect(12);
@@ -314,7 +423,7 @@ var testPrepend = function(val) {
expected = "YahooTry them out:This link has class=\"blog\": Simon Willison's Weblog";
jQuery('#sap').prepend(val( jQuery("#first, #yahoo") ));
equals( expected, jQuery('#sap').text(), "Check for prepending of jQuery object" );
-}
+};
test("prepend(String|Element|Array<Element>|jQuery)", function() {
testPrepend(bareObj);
@@ -322,7 +431,58 @@ test("prepend(String|Element|Array<Element>|jQuery)", function() {
test("prepend(Function)", function() {
testPrepend(functionReturningObj);
-})
+});
+
+test("prepend(Function) with incoming value", function() {
+ expect(10);
+
+ var defaultText = 'Try them out:', old = jQuery('#first').html();
+ var result = jQuery('#first').prepend(function(i, val) {
+ equals( val, old, "Make sure the incoming value is correct." );
+ return 'buga';
+ });
+ equals( result.text(), 'buga' + defaultText, 'Check if text prepending works' );
+
+ old = jQuery("#select3").html();
+
+ equals( jQuery('#select3').prepend(function(i, val) {
+ equals( val, old, "Make sure the incoming value is correct." );
+ return '';
+ }).find('option:first-child').attr('value'), 'prependTest', 'Prepending html options to select element');
+
+ reset();
+ var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
+ old = jQuery('#sap').html();
+
+ jQuery('#sap').prepend(function(i, val) {
+ equals( val, old, "Make sure the incoming value is correct." );
+ return document.getElementById('first');
+ });
+
+ equals( expected, jQuery('#sap').text(), "Check for prepending of element" );
+
+ reset();
+ expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
+ old = jQuery('#sap').html();
+
+ jQuery('#sap').prepend(function(i, val) {
+ equals( val, old, "Make sure the incoming value is correct." );
+ return [document.getElementById('first'), document.getElementById('yahoo')];
+ });
+
+ equals( expected, jQuery('#sap').text(), "Check for prepending of array of elements" );
+
+ reset();
+ expected = "YahooTry them out:This link has class=\"blog\": Simon Willison's Weblog";
+ old = jQuery('#sap').html();
+
+ jQuery('#sap').prepend(function(i, val) {
+ equals( val, old, "Make sure the incoming value is correct." );
+ return jQuery("#first, #yahoo");
+ });
+
+ equals( expected, jQuery('#sap').text(), "Check for prepending of jQuery object" );
+});
test("prependTo(String|Element|Array<Element>|jQuery)", function() {
expect(6);
@@ -466,7 +626,7 @@ test("insertAfter(String|Element|Array<Element>|jQuery)", function() {
});
var testReplaceWith = function(val) {
- expect(12);
+ expect(15);
jQuery('#yahoo').replaceWith(val( 'buga' ));
ok( jQuery("#replace")[0], 'Replace element with string' );
ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after string' );
@@ -488,9 +648,46 @@ var testReplaceWith = function(val) {
ok( jQuery("#mark")[0], 'Replace element with set of elements' );
ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after set of elements' );
+ reset();
+ var tmp = jQuery("").appendTo("body").click(function(){ ok(true, "Newly bound click run." ); });
+ var y = jQuery('').appendTo("body").click(function(){ ok(true, "Previously bound click run." ); });
+ var child = y.append("test").find("b").click(function(){ ok(true, "Child bound click run." ); return false; });
+
+ y.replaceWith( tmp );
+
+ tmp.click();
+ y.click(); // Shouldn't be run
+ child.click(); // Shouldn't be run
+
+ tmp.remove();
+ y.remove();
+ child.remove();
+
+ reset();
+
+ y = jQuery('').appendTo("body").click(function(){ ok(true, "Previously bound click run." ); });
+ var child2 = y.append("test").find("u").click(function(){ ok(true, "Child 2 bound click run." ); return false; });
+
+ y.replaceWith( child2 );
+
+ child2.click();
+
+ y.remove();
+ child2.remove();
+
+ reset();
+
var set = jQuery("").replaceWith(val("test"));
equals( set[0].nodeName.toLowerCase(), "span", "Replace the disconnected node." );
equals( set.length, 1, "Replace the disconnected node." );
+
+ var $div = jQuery("").appendTo("body");
+ // TODO: Work on jQuery(...) inline script execution
+ //$div.replaceWith("");
+ equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');
+ jQuery('.replacewith').remove();
}
test("replaceWith(String|Element|Array<Element>|jQuery)", function() {
@@ -526,7 +723,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' );
@@ -571,6 +768,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) {
@@ -590,65 +792,8 @@ test("clone() on XML nodes", function() {
});
}
-test("val()", function() {
- expect(9);
-
- document.getElementById('text1').value = "bla";
- equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
-
- reset();
-
- equals( jQuery("#text1").val(), "Test", "Check for value of input element" );
- // ticket #1714 this caused a JS error in IE
- equals( jQuery("#first").val(), "", "Check a paragraph element to see if it has a value" );
- ok( jQuery([]).val() === undefined, "Check an empty jQuery object will return undefined from val" );
-
- equals( jQuery('#select2').val(), '3', 'Call val() on a single="single" select' );
-
- same( jQuery('#select3').val(), ['1', '2'], 'Call val() on a multiple="multiple" select' );
-
- equals( jQuery('#option3c').val(), '2', 'Call val() on a option element with value' );
-
- equals( jQuery('#option3a').val(), '', 'Call val() on a option element with empty value' );
-
- equals( jQuery('#option3e').val(), 'no value', 'Call val() on a option element with no value attribute' );
-
-});
-
-var testVal = function(valueObj) {
- expect(5);
-
- jQuery("#text1").val(valueObj( 'test' ));
- equals( document.getElementById('text1').value, "test", "Check for modified (via val(String)) value of input element" );
-
- jQuery("#text1").val(valueObj( 67 ));
- equals( document.getElementById('text1').value, "67", "Check for modified (via val(Number)) value of input element" );
-
- jQuery("#select1").val(valueObj( "3" ));
- equals( jQuery("#select1").val(), "3", "Check for modified (via val(String)) value of select element" );
-
- jQuery("#select1").val(valueObj( 2 ));
- equals( jQuery("#select1").val(), "2", "Check for modified (via val(Number)) value of select element" );
-
- // using contents will get comments regular, text, and comment nodes
- var j = jQuery("#nonnodes").contents();
- j.val(valueObj( "asdf" ));
- equals( j.val(), "asdf", "Check node,textnode,comment with val()" );
- j.removeAttr("value");
-}
-
-test("val(String/Number)", function() {
- testVal(bareObj);
-});
-
-test("val(Function)", function() {
- testVal(functionReturningObj);
-})
-
var testHtml = function(valueObj) {
- expect(20);
-
- window.debug = true;
+ expect(22);
jQuery.scriptorder = 0;
@@ -660,8 +805,6 @@ var testHtml = function(valueObj) {
}
ok( pass, "Set HTML" );
- delete window.debug;
-
reset();
// using contents will get comments regular, text, and comment nodes
var j = jQuery("#nonnodes").contents();
@@ -680,10 +823,14 @@ var testHtml = function(valueObj) {
equals( $div.html(valueObj( 0 )).html(), '0', 'Setting a zero as html' );
var $div2 = jQuery(''), insert = "<div>hello1</div>";
- equals( $div2.html(insert).html(), insert, "Verify escaped insertion." );
- equals( $div2.html("x" + insert).html(), "x" + insert, "Verify escaped insertion." );
- equals( $div2.html(" " + insert).html(), " " + insert, "Verify escaped insertion." );
+ equals( $div2.html(insert).html().replace(/>/g, ">"), insert, "Verify escaped insertion." );
+ equals( $div2.html("x" + insert).html().replace(/>/g, ">"), "x" + insert, "Verify escaped insertion." );
+ equals( $div2.html(" " + insert).html().replace(/>/g, ">"), " " + insert, "Verify escaped insertion." );
+
+ var map = jQuery("").html(valueObj(""));
+ equals( map[0].childNodes.length, 1, "The area was inserted." );
+ equals( map[0].firstChild.nodeName.toLowerCase(), "area", "The area was inserted." );
reset();
@@ -707,28 +854,68 @@ 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" );
+test("html(Function) with incoming value", function() {
+ expect(20);
+
+ var div = jQuery("#main > div"), old = div.map(function(){ return jQuery(this).html() });
+
+ div.html(function(i, val) {
+ equals( val, old[i], "Make sure the incoming value is correct." );
+ return "test";
+ });
+
+ var pass = true;
+ div.each(function(){
+ if ( this.childNodes.length !== 1 ) {
+ pass = false;
+ }
+ })
+ ok( pass, "Set HTML" );
+ reset();
// using contents will get comments regular, text, and comment nodes
var j = jQuery("#nonnodes").contents();
- j.text("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()" );
-}
+ old = j.map(function(){ return jQuery(this).html(); });
+
+ j.html(function(i, val) {
+ equals( val, old[i], "Make sure the incoming value is correct." );
+ return "bold";
+ });
+
+ j.find('b').removeData();
+ equals( j.html().replace(/ xmlns="[^"]+"/g, "").toLowerCase(), "bold", "Check node,textnode,comment with html()" );
+
+ var $div = jQuery('');
+
+ equals( $div.html(function(i, val) {
+ equals( val, "", "Make sure the incoming value is correct." );
+ return 5;
+ }).html(), '5', 'Setting a number as html' );
+
+ equals( $div.html(function(i, val) {
+ equals( val, "5", "Make sure the incoming value is correct." );
+ return 0;
+ }).html(), '0', 'Setting a zero as html' );
-test("text(String)", function() {
- testText(bareObj)
+ var $div2 = jQuery(''), insert = "<div>hello1</div>";
+ equals( $div2.html(function(i, val) {
+ equals( val, "", "Make sure the incoming value is correct." );
+ return insert;
+ }).html().replace(/>/g, ">"), insert, "Verify escaped insertion." );
+
+ equals( $div2.html(function(i, val) {
+ equals( val.replace(/>/g, ">"), insert, "Make sure the incoming value is correct." );
+ return "x" + insert;
+ }).html().replace(/>/g, ">"), "x" + insert, "Verify escaped insertion." );
+
+ equals( $div2.html(function(i, val) {
+ equals( val.replace(/>/g, ">"), "x" + insert, "Make sure the incoming value is correct." );
+ return " " + insert;
+ }).html().replace(/>/g, ">"), " " + insert, "Verify escaped insertion." );
});
-test("text(Function)", function() {
- testText(functionReturningObj);
-})
-
var testRemove = function(method) {
expect(9);