X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=9242dddb5f7ebcb5e886d75e1088397cf92ce633;hb=ffb1867a4364ea65e60dad3469e8c8eb420ebcac;hp=4631ead61eac05a8142aec381f4b0e51a79da61d;hpb=f5b649fafbd85a1973a9c46ca6bf163d9de857a7;p=jquery.git

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 4631ead..9242ddd 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -105,7 +105,7 @@ test("wrapAll(String|Element)", function() {
 
 // TODO: Figure out why each(wrapAll) is not equivalent to wrapAll
 // test("wrapAll(Function)", function() {
-// 	testWrapAll(functionReturningObj);
+//	testWrapAll(functionReturningObj);
 // })
 
 var testWrapInner = function(val) {
@@ -130,7 +130,7 @@ 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() {
@@ -251,7 +251,7 @@ var testAppend = function(valueObj) {
 }
 
 test("append(String|Element|Array<Element>|jQuery)", function() {
-  testAppend(bareObj);
+	testAppend(bareObj);
 });
 
 test("append(Function)", function() {
@@ -549,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' );
@@ -594,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) {
@@ -614,7 +619,7 @@ test("clone() on XML nodes", function() {
 }
 
 test("val()", function() {
-	expect(9);
+	expect(17);
 
 	document.getElementById('text1').value = "bla";
 	equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
@@ -636,6 +641,33 @@ test("val()", function() {
 
 	equals( jQuery('#option3e').val(), 'no value', 'Call val() on a option element with no value attribute' );
 
+	equals( jQuery('#option3a').val(), '', 'Call val() on a option element with no value attribute' );
+
+	jQuery('#select3').val("");
+	same( jQuery('#select3').val(), [''], 'Call val() on a multiple="multiple" select' );
+
+	var checks = jQuery("<input type='checkbox' name='test' value='1'/>").appendTo("#form")
+		.add( jQuery("<input type='checkbox' name='test' value='2'/>").appendTo("#form") )
+		.add( jQuery("<input type='checkbox' name='test' value=''/>").appendTo("#form") )
+		.add( jQuery("<input type='checkbox' name='test'/>").appendTo("#form") );
+
+	same( checks.serialize(), "", "Get unchecked values." );
+
+	equals( checks.eq(3).val(), "on", "Make sure a value of 'on' is provided if none is specified." );
+
+	checks.val([ "2" ]);
+	same( checks.serialize(), "test=2", "Get a single checked value." );
+
+	checks.val([ "1", "" ]);
+	same( checks.serialize(), "test=1&test=", "Get multiple checked values." );
+
+	checks.val([ "", "2" ]);
+	same( checks.serialize(), "test=2&test=", "Get multiple checked values." );
+
+	checks.val([ "1", "on" ]);
+	same( checks.serialize(), "test=1&test=on", "Get multiple checked values." );
+
+	checks.remove();
 });
 
 var testVal = function(valueObj) {
@@ -653,9 +685,9 @@ 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" );
+	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();
@@ -734,15 +766,16 @@ test("html(String)", function() {
 
 test("html(Function)", function() {
 	testHtml(functionReturningObj);
-})
+});
 
 var testText = function(valueObj) {
 	expect(4);
-	equals( jQuery("#foo").text("<div><b>Hello</b> cruel world!</div>")[0].innerHTML.replace(/>/g, "&gt;"), "&lt;div&gt;&lt;b&gt;Hello&lt;/b&gt; cruel world!&lt;/div&gt;", "Check escaped text" );
+	var val = valueObj("<div><b>Hello</b> cruel world!</div>");
+	equals( jQuery("#foo").text(val)[0].innerHTML.replace(/>/g, "&gt;"), "&lt;div&gt;&lt;b&gt;Hello&lt;/b&gt; cruel world!&lt;/div&gt;", "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()" );