From: jeresig Date: Wed, 13 Jan 2010 20:23:05 +0000 (-0500) Subject: We only care that some of the html return value is escaped, not necessarily all of... X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=d431519d61f55af8bd1714d00126c948d888f3a9 We only care that some of the html return value is escaped, not necessarily all of it (as is the case in Safari 3.x). --- diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js index bb78bdd..c250b53 100644 --- a/test/unit/manipulation.js +++ b/test/unit/manipulation.js @@ -828,9 +828,9 @@ var testHtml = function(valueObj) { equals( $div.html(valueObj( 0 )).html(), '0', 'Setting a zero as html' ); var $div2 = jQuery('
'), insert = "<div>hello1</div>"; - 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." ); + equals( $div2.html(insert).html().replace(/>/g, ">"), insert, "Verify escaped insertion." ); + equals( $div2.html("x" + insert).html().replace(/>/g, ">"), "x" + insert, "Verify escaped insertion." ); + equals( $div2.html(" " + insert).html().replace(/>/g, ">"), " " + insert, "Verify escaped insertion." ); var map = jQuery("").html(valueObj("jQuery")); @@ -908,17 +908,17 @@ test("html(Function) with incoming value", function() { equals( $div2.html(function(i, val) { equals( val, "", "Make sure the incoming value is correct." ); return insert; - }).html(), insert, "Verify escaped insertion." ); + }).html().replace(/>/g, ">"), insert, "Verify escaped insertion." ); equals( $div2.html(function(i, val) { - equals( val, insert, "Make sure the incoming value is correct." ); + equals( val.replace(/>/g, ">"), insert, "Make sure the incoming value is correct." ); return "x" + insert; - }).html(), "x" + insert, "Verify escaped insertion." ); + }).html().replace(/>/g, ">"), "x" + insert, "Verify escaped insertion." ); equals( $div2.html(function(i, val) { - equals( val, "x" + insert, "Make sure the incoming value is correct." ); + equals( val.replace(/>/g, ">"), "x" + insert, "Make sure the incoming value is correct." ); return " " + insert; - }).html(), " " + insert, "Verify escaped insertion." ); + }).html().replace(/>/g, ">"), " " + insert, "Verify escaped insertion." ); }); var testRemove = function(method) {