diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-20 18:38:18 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-20 18:38:18 -0800 |
| commit | 69bbbe9068edb79f914e18940af9021e9da437a4 (patch) | |
| tree | beca6607d4f5477887f629537a7fd896d535e2c2 /activesupport/test/core_ext/uri_ext_test.rb | |
| parent | bfe7d518a78714d70d3d50a2ddf5621057f5b6a0 (diff) | |
| download | rails-69bbbe9068edb79f914e18940af9021e9da437a4.tar.gz rails-69bbbe9068edb79f914e18940af9021e9da437a4.tar.bz2 rails-69bbbe9068edb79f914e18940af9021e9da437a4.zip | |
Broaden URI.unescape fix to all affected 1.9.x by checking for broken behavior instead of specific patchlevel
Diffstat (limited to 'activesupport/test/core_ext/uri_ext_test.rb')
| -rw-r--r-- | activesupport/test/core_ext/uri_ext_test.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/activesupport/test/core_ext/uri_ext_test.rb b/activesupport/test/core_ext/uri_ext_test.rb index f25bc97aa5..0837d3cb2d 100644 --- a/activesupport/test/core_ext/uri_ext_test.rb +++ b/activesupport/test/core_ext/uri_ext_test.rb @@ -1,11 +1,12 @@ require 'abstract_unit' +require 'uri' -class URITest < Test::Unit::TestCase +class URIExtTest < Test::Unit::TestCase def test_uri_decode_handle_multibyte - str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese. - str.force_encoding(Encoding::UTF_8) if(defined? Encoding::UTF_8) + str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese. + str.force_encoding(Encoding::UTF_8) if str.respond_to?(:force_encoding) - assert_equal str, ::URI.unescape( ::URI.escape(str) ) - assert_equal str, ::URI.decode( ::URI.escape(str) ) + assert_equal str, URI.unescape(URI.escape(str)) + assert_equal str, URI.decode(URI.escape(str)) end end |