X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=ec96c10b887bc55679b1cee118166fd62ec91c17;hb=0f0fd1aee34b81411419ae3b152e03dfdf58b4f4;hp=d8dbca96c7b7c5e9d9d4d017ca2dc47537bae8db;hpb=35951021545a3ae88018fc5ea3bebd1bc7d09c6a;p=jquery.git

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index d8dbca9..ec96c10 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -4,13 +4,16 @@ 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) {
-	expect(10);
+	expect(15);
 	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' );
@@ -34,12 +37,23 @@ var testWrap = function(val) {
 	var j = jQuery("#nonnodes").contents();
 	j.wrap(val( "<i></i>" ));
 	equals( jQuery("#nonnodes > i").length, 3, "Check node,textnode,comment wraps ok" );
-	equals( jQuery("#nonnodes > i").text(), j.text() + j[1].nodeValue, "Check node,textnode,comment wraps doesn't hurt text" );
+	equals( jQuery("#nonnodes > i").text(), j.text(), "Check node,textnode,comment wraps doesn't hurt text" );
 
 	// Try wrapping a disconnected node
 	j = jQuery("<label/>").wrap(val( "<li/>" ));
 	equals( j[0].nodeName.toUpperCase(), "LABEL", "Element is a label" );
 	equals( j[0].parentNode.nodeName.toUpperCase(), "LI", "Element has been wrapped" );
+
+	// Wrap an element containing a text node
+	j = jQuery("<span/>").wrap("<div>test</div>");
+	equals( j[0].previousSibling.nodeType, 3, "Make sure the previous node is a text element" );
+	equals( j[0].parentNode.nodeName.toUpperCase(), "DIV", "And that we're in the div element." );
+
+	// Try to wrap an element with multiple elements (should fail)
+	j = jQuery("<div><span></span></div>").children().wrap("<p></p><div></div>");
+	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." );
 }
 
 test("wrap(String|Element)", function() {
@@ -54,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( '<div class="red"><div class="tmp"></div></div>' ));
 	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"' );
@@ -68,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() {
@@ -93,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() {
@@ -105,6 +119,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').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' );
+
+	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:'
@@ -239,7 +284,7 @@ test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	var div = jQuery("<div/>").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" );
@@ -309,7 +354,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' );
@@ -328,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("<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() {
@@ -361,7 +410,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' );
@@ -379,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("<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() {
@@ -413,7 +466,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' );
@@ -433,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("<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() {
@@ -449,7 +506,7 @@ test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	jQuery('<b id="replace">buga</b>').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' );
@@ -538,32 +595,32 @@ 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) {
-	expect(5);
+	expect(6);
 
 	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" );
 
@@ -573,6 +630,10 @@ var testVal = function(valueObj) {
 	jQuery("#select1").val(valueObj( 2 ));
 	equals( jQuery("#select1").val(), "2", "Check for modified (via val(Number)) value of select element" );
 
+  jQuery("#select1").append("<option value='4'>four</option>");
+  jQuery("#select1").val(valueObj( 4 ));
+  equals( jQuery("#select1").val(), "4", "Should be possible to set the val() to a newly created option" );
+
 	// using contents will get comments regular, text, and comment nodes
 	var j = jQuery("#nonnodes").contents();
 	j.val(valueObj( "asdf" ));
@@ -589,12 +650,10 @@ test("val(Function)", function() {
 })
 
 var testHtml = function(valueObj) {
-	expect(17);
-	
-	window.debug = true;
-	
+	expect(20);
+
 	jQuery.scriptorder = 0;
-	
+
 	var div = jQuery("#main > div");
 	div.html(valueObj("<b>test</b>"));
 	var pass = true;
@@ -602,39 +661,43 @@ var testHtml = function(valueObj) {
 		if ( div.get(i).childNodes.length != 1 ) pass = false;
 	}
 	ok( pass, "Set HTML" );
-	
-	window.debug = false;
 
 	reset();
 	// using contents will get comments regular, text, and comment nodes
 	var j = jQuery("#nonnodes").contents();
 	j.html(valueObj("<b>bold</b>"));
-	
+
 	// 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(), "<b>bold</b>", "Check node,textnode,comment with html()" );
-	
+
 	jQuery("#main").html(valueObj("<select/>"));
 	jQuery("#main select").html(valueObj("<option>O1</option><option selected='selected'>O2</option><option>O3</option>"));
 	equals( jQuery("#main select").val(), "O2", "Selected option correct" );
-	
+
 	var $div = jQuery('<div />');
 	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('<div/>'), insert = "&lt;div&gt;hello1&lt;/div&gt;";
+	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('<script type="something/else">ok( false, "Non-script evaluated." );</script><script type="text/javascript">ok( true, "text/javascript is evaluated." );</script><script>ok( true, "No type is evaluated." );</script><div><script type="text/javascript">ok( true, "Inner text/javascript is evaluated." );</script><script>ok( true, "Inner No type is evaluated." );</script><script type="something/else">ok( false, "Non-script evaluated." );</script></div>'));
-	
+
 	stop();
-	
-	jQuery("#main").html(valueObj('<script type="text/javascript">ok( true, "jQuery().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script>'));
-	
-	jQuery("#main").html(valueObj('foo <form><script type="text/javascript">ok( true, "jQuery().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script></form>'));
-	
+
+	jQuery("#main").html(valueObj('<script type="text/javascript">ok( true, "jQuery().html().evalScripts() Evals Scripts Twice in Firefox, see #975 (1)" );</script>'));
+
+	jQuery("#main").html(valueObj('foo <form><script type="text/javascript">ok( true, "jQuery().html().evalScripts() Evals Scripts Twice in Firefox, see #975 (2)" );</script></form>'));
+
 	// 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("<script>equals(jQuery.scriptorder++, 0, 'Script is executed in order');equals(jQuery('#scriptorder').length, 1,'Execute after html (even though appears before)')<\/script><span id='scriptorder'><script>equals(jQuery.scriptorder++, 1, 'Script (nested) is executed in order');equals(jQuery('#scriptorder').length, 1,'Execute after html')<\/script></span><script>equals(jQuery.scriptorder++, 2, 'Script (unnested) is executed in order');equals(jQuery('#scriptorder').length, 1,'Execute after html')<\/script>"));
-	
+
 	setTimeout( start, 100 );
 }
 
@@ -655,7 +718,7 @@ var testText = function(valueObj) {
 	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()" );	
+	equals( j[2].nodeType, 8, "Check node,textnode,comment with text()" );
 }
 
 test("text(String)", function() {
@@ -666,24 +729,48 @@ test("text(Function)", function() {
 	testText(functionReturningObj);
 })
 
-test("remove()", function() {
-	expect(7);
-	jQuery("#ap").children().remove();
+var testRemove = function(method) {
+	expect(9);
+
+	var first = jQuery("#ap").children(":first");
+	first.data("foo", "bar");
+
+	jQuery("#ap").children()[method]();
 	ok( jQuery("#ap").text().length > 10, "Check text is not removed" );
 	equals( jQuery("#ap").children().length, 0, "Check remove" );
 
+	equals( first.data("foo"), method == "remove" ? null : "bar" );
+
 	reset();
-	jQuery("#ap").children().remove("a");
+	jQuery("#ap").children()[method]("a");
 	ok( jQuery("#ap").text().length > 10, "Check text is not removed" );
 	equals( jQuery("#ap").children().length, 1, "Check filtered remove" );
 
-	jQuery("#ap").children().remove("a, code");
+	jQuery("#ap").children()[method]("a, code");
 	equals( jQuery("#ap").children().length, 0, "Check multi-filtered remove" );
 
 	// using contents will get comments regular, text, and comment nodes
 	equals( jQuery("#nonnodes").contents().length, 3, "Check node,textnode,comment remove works" );
-	jQuery("#nonnodes").contents().remove();
+	jQuery("#nonnodes").contents()[method]();
 	equals( jQuery("#nonnodes").contents().length, 0, "Check node,textnode,comment remove works" );
+
+	reset();
+
+	var count = 0;
+	var first = jQuery("#ap").children(":first");
+	var cleanUp = first.click(function() { count++ })[method]().appendTo("body").click();
+	
+	equals( method == "remove" ? 0 : 1, count );
+	
+	cleanUp.detach();
+};
+
+test("remove()", function() {
+	testRemove("remove");
+});
+
+test("detach()", function() {
+	testRemove("detach");
 });
 
 test("empty()", function() {