X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=44fafa92b1cb09eb3838b18dcf70989145abe546;hb=59802928566b6be3a66d65e77c2418fff37e6f5f;hp=a0ce302811278dacaeb9d8a64f9bab504ce9f1a1;hpb=c7407bd4fc343783a4e723f21227a6ee43b9a934;p=jquery.git

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index a0ce302..44fafa9 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -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' );
@@ -151,7 +151,7 @@ test("unwrap()", function() {
 });
 
 var testAppend = function(valueObj) {
-	expect(21);
+	expect(22);
 	var defaultText = 'Try them out:'
 	var result = jQuery('#first').append(valueObj('<b>buga</b>'));
 	equals( result.text(), defaultText + 'buga', 'Check if text appending works' );
@@ -224,6 +224,8 @@ var testAppend = function(valueObj) {
 
 	t( "Append Select", "#appendSelect1, #appendSelect2", ["appendSelect1", "appendSelect2"] );
 
+	equals( "Two nodes", jQuery('<div />').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("<div/>").appendTo("#nonnodes").append(j);
@@ -466,7 +468,7 @@ test("insertAfter(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 var testReplaceWith = function(val) {
-	expect(12);
+	expect(14);
 	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' );
@@ -491,6 +493,13 @@ var testReplaceWith = function(val) {
 	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." );
+
+	var $div = jQuery("<div class='replacewith'></div>").appendTo("body");
+	$div.replaceWith("<div class='replacewith'></div><script>" +
+		"equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');" +
+		"</script>");
+	equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');
+	jQuery('.replacewith').remove();
 }
 
 test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -616,7 +625,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 +639,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" ));
@@ -646,9 +659,7 @@ test("val(Function)", function() {
 })
 
 var testHtml = function(valueObj) {
-	expect(20);
-
-	window.debug = true;
+	expect(22);
 
 	jQuery.scriptorder = 0;
 
@@ -660,8 +671,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();
@@ -684,6 +693,10 @@ var testHtml = function(valueObj) {
 	equals( $div2.html("x" + insert).html(), "x" + insert, "Verify escaped insertion." );
 	equals( $div2.html(" " + insert).html(), " " + insert, "Verify escaped insertion." );
 
+	var map = jQuery("<map/>").html(valueObj("<area id='map01' shape='rect' coords='50,50,150,150' href='http://www.jquery.com/' alt='jQuery'>"));
+
+	equals( map[0].childNodes.length, 1, "The area was inserted." );
+	equals( map[0].firstChild.nodeName.toLowerCase(), "area", "The area was inserted." );
 
 	reset();