Adding a test that a new option can be selected with val(N)

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

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index b9cb35d..494e7f5 100644 (file)
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -4,9 +4,12 @@ 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) {
@@ -34,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/>" ));
@@ -124,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' );
@@ -602,7 +605,7 @@ test("val()", function() {
 
        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' );
 
@@ -613,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" );
@@ -627,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" ));
@@ -643,7 +650,7 @@ test("val(Function)", function() {
 })
 
 var testHtml = function(valueObj) {
-       expect(17);
+       expect(20);
 
        window.debug = true;
 
@@ -676,6 +683,12 @@ var testHtml = function(valueObj) {
        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>'));