aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-01-07 08:12:34 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-01-07 08:12:34 +0000
commit07fcac508adf1740699701adfe309d53316d8e3a (patch)
tree7f1bce2795d590c2675ad738c802d7985582b96f /actionpack
parent7324444344b428727e2fcfed674dd818ef57b1ad (diff)
downloadrails-07fcac508adf1740699701adfe309d53316d8e3a.tar.gz
rails-07fcac508adf1740699701adfe309d53316d8e3a.tar.bz2
rails-07fcac508adf1740699701adfe309d53316d8e3a.zip
Ruby 1.9 compat: don't rely on Array#to_s to flatten and join as string
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8590 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/routing_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 177b95a3af..fa467f0796 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -31,8 +31,8 @@ class UriReservedCharactersRoutingTest < Test::Unit::TestCase
safe, unsafe = %w(: @ & = + $ , ;), %w(^ / ? # [ ])
hex = unsafe.map { |char| '%' + char.unpack('H2').first.upcase }
- @segment = "#{safe}#{unsafe}".freeze
- @escaped = "#{safe}#{hex}".freeze
+ @segment = "#{safe.join}#{unsafe.join}".freeze
+ @escaped = "#{safe.join}#{hex.join}".freeze
end
def test_route_generation_escapes_unsafe_path_characters