aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/core_ext/uri_ext_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-01 10:38:02 +0100
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-02 17:50:12 -0800
commita2de13e1e0de5bba3cbd6050fe4884595704e1e2 (patch)
tree202994595c109501dddaa84de0a69082e7e30d59 /activesupport/test/core_ext/uri_ext_test.rb
parent36121d29a53c71cbdf4f0280718d572f16360f8c (diff)
downloadrails-a2de13e1e0de5bba3cbd6050fe4884595704e1e2.tar.gz
rails-a2de13e1e0de5bba3cbd6050fe4884595704e1e2.tar.bz2
rails-a2de13e1e0de5bba3cbd6050fe4884595704e1e2.zip
Ruby 1.9.2: URI.escape is obsolete
Diffstat (limited to 'activesupport/test/core_ext/uri_ext_test.rb')
-rw-r--r--activesupport/test/core_ext/uri_ext_test.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/activesupport/test/core_ext/uri_ext_test.rb b/activesupport/test/core_ext/uri_ext_test.rb
index 2d4f38d095..e4a242abc4 100644
--- a/activesupport/test/core_ext/uri_ext_test.rb
+++ b/activesupport/test/core_ext/uri_ext_test.rb
@@ -7,7 +7,11 @@ class URIExtTest < Test::Unit::TestCase
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))
+ if URI.const_defined?(:Parser)
+ parser = URI::Parser.new
+ assert_equal str, parser.unescape(parser.escape(str))
+ else
+ assert_equal str, URI.unescape(URI.escape(str))
+ end
end
end