Fixed wrap test that was looking for comment values from .text().

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

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 0098416..a0ce302 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/>" ));
@@ -643,7 +646,7 @@ test("val(Function)", function() {
 })
 
 var testHtml = function(valueObj) {
-       expect(17);
+       expect(20);
 
        window.debug = true;
 
@@ -676,6 +679,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>'));