Make sure that the previous element is removed from the page before the next is inser...

[jquery.git] / test / unit / manipulation.js

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index a0ce302..c8ea240 100644 (file)
--- 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' );
@@ -466,7 +466,7 @@ test("insertAfter(String|Element|Array<Element>|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 +491,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 +623,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 +637,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 +659,6 @@ test("val(Function)", function() {
 var testHtml = function(valueObj) {
        expect(20);
 
-       window.debug = true;
-
        jQuery.scriptorder = 0;
 
        var div = jQuery("#main > div");
@@ -660,8 +669,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();