aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2014-07-10 10:47:56 +0100
committerAndrew White <pixeltrix@users.noreply.github.com>2014-07-10 10:47:56 +0100
commit6b6832eeeb43c5f2553373f84677350ba654346a (patch)
treeb7e194b25eda53d87edf429f3ef1ed51e1007804 /actionpack/test
parentb9ffae8feb453ee2961b5284fe3310b227532179 (diff)
parent8a297131349bf4e0ade4a0941e5da0c987396d89 (diff)
downloadrails-6b6832eeeb43c5f2553373f84677350ba654346a.tar.gz
rails-6b6832eeeb43c5f2553373f84677350ba654346a.tar.bz2
rails-6b6832eeeb43c5f2553373f84677350ba654346a.zip
Merge pull request #16123 from karlentwistle/issues/9299
Force encoding of US-ASCII to UTF-8 in unescape_uri.
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/journey/router/utils_test.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/test/journey/router/utils_test.rb b/actionpack/test/journey/router/utils_test.rb
index 584fd56a5c..9b2b85ec73 100644
--- a/actionpack/test/journey/router/utils_test.rb
+++ b/actionpack/test/journey/router/utils_test.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
require 'abstract_unit'
module ActionDispatch
@@ -20,6 +21,10 @@ module ActionDispatch
assert_equal "a/b c+d", Utils.unescape_uri("a%2Fb%20c+d")
end
+ def test_uri_unescape_with_utf8_string
+ assert_equal "Šašinková", Utils.unescape_uri("%C5%A0a%C5%A1inkov%C3%A1".force_encoding(Encoding::US_ASCII))
+ end
+
def test_normalize_path_not_greedy
assert_equal "/foo%20bar%20baz", Utils.normalize_path("/foo%20bar%20baz")
end