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

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 4997634..ec96c10 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -37,7 +37,7 @@ 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/>" ));
@@ -127,7 +127,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' );
@@ -616,7 +616,7 @@ test("val()", function() {
 });
 
 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" );
@@ -630,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" ));
@@ -648,8 +652,6 @@ test("val(Function)", function() {
 var testHtml = function(valueObj) {
 	expect(20);
 
-	window.debug = true;
-
 	jQuery.scriptorder = 0;
 
 	var div = jQuery("#main > div");
@@ -660,8 +662,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();