diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-22 05:31:31 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-22 05:31:31 +0000 |
| commit | 10a129cee72512315e84d5b29a8ca471058e80ff (patch) | |
| tree | 3ac61ac81abd3719c410cddea49a53da6ed60e07 /test/cgi | |
| parent | 1b107d48ef2f67a48cb974890c2944381fd4ee4a (diff) | |
escape.c: should not freeze
* ext/cgi/escape/escape.c (optimized_escape_html): CGI.escapeHTML
should return unfrozen new string.
[ruby-core:72426] [Bug #11858]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/cgi')
| -rw-r--r-- | test/cgi/test_cgi_util.rb | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/test/cgi/test_cgi_util.rb b/test/cgi/test_cgi_util.rb index 08c2ed2056..5565afe9c1 100644 --- a/test/cgi/test_cgi_util.rb +++ b/test/cgi/test_cgi_util.rb @@ -62,20 +62,36 @@ class CGIUtilTest < Test::Unit::TestCase assert_equal("'&"><", CGI::escapeHTML("'&\"><")) end + def test_cgi_escape_html_duplicated + orig = "Ruby".force_encoding("US-ASCII") + str = CGI::escapeHTML(orig) + assert_equal(orig, str) + assert_not_same(orig, str) + end + + def assert_cgi_escape_html_preserve_encoding(str, encoding) + assert_equal(encoding, CGI::escapeHTML(str.dup.force_encoding(encoding)).encoding) + end + def test_cgi_escape_html_preserve_encoding - assert_equal(Encoding::US_ASCII, CGI::escapeHTML("'&\"><".force_encoding("US-ASCII")).encoding) - assert_equal(Encoding::ASCII_8BIT, CGI::escapeHTML("'&\"><".force_encoding("ASCII-8BIT")).encoding) - assert_equal(Encoding::UTF_8, CGI::escapeHTML("'&\"><".force_encoding("UTF-8")).encoding) + Encoding.list do |enc| + assert_cgi_escape_html_preserve_encoding("'&\"><", enc) + assert_cgi_escape_html_preserve_encoding("Ruby", enc) + end end def test_cgi_escape_html_preserve_tainted - assert_equal(false, CGI::escapeHTML("'&\"><").tainted?) - assert_equal(true, CGI::escapeHTML("'&\"><".taint).tainted?) + assert_not_predicate CGI::escapeHTML("'&\"><"), :tainted? + assert_predicate CGI::escapeHTML("'&\"><".taint), :tainted? + assert_not_predicate CGI::escapeHTML("Ruby"), :tainted? + assert_predicate CGI::escapeHTML("Ruby".taint), :tainted? end - def test_cgi_escape_html_preserve_frozen - assert_equal(false, CGI::escapeHTML("'&\"><".dup).frozen?) - assert_equal(true, CGI::escapeHTML("'&\"><".freeze).frozen?) + def test_cgi_escape_html_dont_freeze + assert_not_predicate CGI::escapeHTML("'&\"><".dup), :frozen? + assert_not_predicate CGI::escapeHTML("'&\"><".freeze), :frozen? + assert_not_predicate CGI::escapeHTML("Ruby".dup), :frozen? + assert_not_predicate CGI::escapeHTML("Ruby".freeze), :frozen? end def test_cgi_unescapeHTML |