aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/routing_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-04 16:11:59 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-04 16:27:54 -0800
commita8ed10546d844fc15d87f5c8f168a18d0cdab5f0 (patch)
tree072d00e206d3dfc45c791cdf6d20692207db8bda /actionpack/test/controller/routing_test.rb
parentdc1816da30eace9f292bfc57e21fe76a05ae8ea7 (diff)
downloadrails-a8ed10546d844fc15d87f5c8f168a18d0cdab5f0.tar.gz
rails-a8ed10546d844fc15d87f5c8f168a18d0cdab5f0.tar.bz2
rails-a8ed10546d844fc15d87f5c8f168a18d0cdab5f0.zip
Ruby 1.9: don't assume params are US-ASCII. Hands off the encoding.
Diffstat (limited to 'actionpack/test/controller/routing_test.rb')
-rw-r--r--actionpack/test/controller/routing_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 308e2a85b1..bb0b9247f3 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -450,6 +450,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
assert_equal({:controller => "content", :action => 'show_page', :id => 'foo'}, rs.recognize_path("/page/foo"))
token = "\321\202\320\265\320\272\321\201\321\202" # 'text' in russian
+ token.force_encoding(Encoding::BINARY) if token.respond_to?(:force_encoding)
escaped_token = CGI::escape(token)
assert_equal '/page/' + escaped_token, rs.generate(:controller => 'content', :action => 'show_page', :id => token)