X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=49976345d55e4e3c1ccbe9171706405c5b43dbb7;hb=ac00fe5bbb2a95fdb747f76fd9dd7c58ba6a531c;hp=88e7d71076ca97936e0bab89fbd4ee270ba039f8;hpb=7a04d1da54caec00b900620390df820fb85b1227;p=jquery.git
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 88e7d71..4997634 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -4,9 +4,12 @@ var bareObj = function(value) { return value; };
var functionReturningObj = function(value) { return (function() { return value; }); };
test("text()", function() {
- expect(1);
+ expect(2);
var expected = "This link has class=\"blog\": Simon Willison's Weblog";
equals( jQuery('#sap').text(), expected, 'Check for merged text of more then one element.' );
+
+ // Check serialization of text values
+ equals( jQuery(document.createTextNode("foo")).text(), "foo", "Text node was retreived from .text()." );
});
var testWrap = function(val) {
@@ -65,7 +68,7 @@ var testWrapAll = function(val) {
expect(8);
var prev = jQuery("#firstp")[0].previousSibling;
var p = jQuery("#firstp,#first")[0].parentNode;
-
+
var result = jQuery('#firstp,#first').wrapAll(val( '
' ));
equals( result.parent().length, 1, 'Check for wrapping of on-the-fly html' );
ok( jQuery('#first').parent().parent().is('.red'), 'Check if wrapper has class "red"' );
@@ -79,7 +82,7 @@ var testWrapAll = function(val) {
var result = jQuery('#firstp,#first').wrapAll(val( document.getElementById('empty') ));
equals( jQuery("#first").parent()[0], jQuery("#firstp").parent()[0], "Same Parent" );
equals( jQuery("#first").parent()[0].previousSibling, prev, "Correct Previous Sibling" );
- equals( jQuery("#first").parent()[0].parentNode, p, "Correct Parent" );
+ equals( jQuery("#first").parent()[0].parentNode, p, "Correct Parent" );
}
test("wrapAll(String|Element)", function() {
@@ -104,7 +107,7 @@ var testWrapInner = function(val) {
var result = jQuery('#first').wrapInner(document.getElementById('empty'));
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" );
+ equals( jQuery("#first").children().children().length, num, "Verify Elements Intact" );
}
test("wrapInner(String|Element)", function() {
@@ -116,6 +119,37 @@ test("wrapInner(String|Element)", function() {
// testWrapInner(functionReturningObj)
// })
+var testUnwrap = function() {
+ expect(9);
+
+ jQuery("body").append('
ab
cd
ef
');
+
+ 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:'
@@ -250,7 +284,7 @@ test("appendTo(String|Element|Array<Element>|jQuery)", function() {
var div = jQuery("").appendTo("#main, #moretests");
equals( div.length, 2, "appendTo returns the inserted elements" );
-
+
div.addClass("test");
ok( jQuery("#main div:last").hasClass("test"), "appendTo element was modified after the insertion" );
@@ -320,7 +354,7 @@ test("prependTo(String|Element|Array<Element>|jQuery)", function() {
});
var testBefore = function(val) {
- expect(4);
+ expect(6);
var expected = 'This is a normal link: bugaYahoo';
jQuery('#yahoo').before(val( 'buga' ));
equals( expected, jQuery('#en').text(), 'Insert String before' );
@@ -339,6 +373,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("").before("test");
+ 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<Element>|jQuery)", function() {
@@ -372,7 +410,7 @@ test("insertBefore(String|Element|Array<Element>|jQuery)", function() {
});
var testAfter = function(val) {
- expect(4);
+ expect(6);
var expected = 'This is a normal link: Yahoobuga';
jQuery('#yahoo').after(val( 'buga' ));
equals( expected, jQuery('#en').text(), 'Insert String after' );
@@ -390,7 +428,11 @@ var testAfter = function(val) {
reset();
expected = "This is a normal link: YahoodiveintomarkTry them out:";
jQuery('#yahoo').after(val( jQuery("#first, #mark") ));
- equals( expected, jQuery('#en').text(), "Insert jQuery after" );
+ equals( expected, jQuery('#en').text(), "Insert jQuery after" );
+
+ var set = jQuery("").after("test");
+ 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<Element>|jQuery)", function() {
@@ -424,7 +466,7 @@ test("insertAfter(String|Element|Array<Element>|jQuery)", function() {
});
var testReplaceWith = function(val) {
- expect(10);
+ expect(12);
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' );
@@ -444,7 +486,11 @@ var testReplaceWith = function(val) {
jQuery('#yahoo').replaceWith(val( jQuery("#first, #mark") ));
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' );
+ ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after set of elements' );
+
+ var set = jQuery("").replaceWith(val("test"));
+ equals( set[0].nodeName.toLowerCase(), "span", "Replace the disconnected node." );
+ equals( set.length, 1, "Replace the disconnected node." );
}
test("replaceWith(String|Element|Array<Element>|jQuery)", function() {
@@ -460,7 +506,7 @@ test("replaceAll(String|Element|Array<Element>|jQuery)", function() {
jQuery('buga').replaceAll("#yahoo");
ok( jQuery("#replace")[0], 'Replace element with string' );
ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after string' );
-
+
reset();
jQuery(document.getElementById('first')).replaceAll("#yahoo");
ok( jQuery("#first")[0], 'Replace element with element' );
@@ -549,24 +595,24 @@ test("val()", function() {
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' );
- isSet( jQuery('#select3').val(), ['1', '2'], 'Call val() on a multiple="multiple" 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) {
@@ -574,7 +620,7 @@ var testVal = function(valueObj) {
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" );
@@ -600,12 +646,12 @@ test("val(Function)", function() {
})
var testHtml = function(valueObj) {
- expect(17);
-
+ expect(20);
+
window.debug = true;
-
+
jQuery.scriptorder = 0;
-
+
var div = jQuery("#main > div");
div.html(valueObj("test"));
var pass = true;
@@ -613,39 +659,45 @@ var testHtml = function(valueObj) {
if ( div.get(i).childNodes.length != 1 ) pass = false;
}
ok( pass, "Set HTML" );
-
- window.debug = false;
+
+ delete window.debug;
reset();
// using contents will get comments regular, text, and comment nodes
var j = jQuery("#nonnodes").contents();
j.html(valueObj("bold"));
-
+
// this is needed, or the expando added by jQuery unique will yield a different html
j.find('b').removeData();
equals( j.html().replace(/ xmlns="[^"]+"/g, "").toLowerCase(), "bold", "Check node,textnode,comment with html()" );
-
+
jQuery("#main").html(valueObj(""));
jQuery("#main select").html(valueObj(""));
equals( jQuery("#main select").val(), "O2", "Selected option correct" );
-
+
var $div = jQuery('');
equals( $div.html(valueObj( 5 )).html(), '5', 'Setting a number as html' );
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." );
+
+
reset();
-
+
jQuery("#main").html(valueObj(''));
-
+
stop();
-
- jQuery("#main").html(valueObj(''));
-
- jQuery("#main").html(valueObj('foo '));
-
+
+ jQuery("#main").html(valueObj(''));
+
+ jQuery("#main").html(valueObj('foo '));
+
// it was decided that waiting to execute ALL scripts makes sense since nested ones have to wait anyway so this test case is changed, see #1959
jQuery("#main").html(valueObj("