aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-08-07 17:16:34 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-08-07 17:16:34 -0700
commit43b406bdb0a747392f30d3da404da3aa6fb29776 (patch)
tree1a7ca76c67ef5030a6386ee8ede3db811cd2f2e9 /actionpack/test
parent12c271d1d297203a0cb4c09ef6da5be9954e87b6 (diff)
downloadrails-43b406bdb0a747392f30d3da404da3aa6fb29776.tar.gz
rails-43b406bdb0a747392f30d3da404da3aa6fb29776.tar.bz2
rails-43b406bdb0a747392f30d3da404da3aa6fb29776.zip
Ruby 1.9 compat: fix route recognition encoding test
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/routing_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index fb83dba395..5f9ae6292c 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
require 'abstract_unit'
require 'controller/fake_controllers'
require 'active_support/dependencies'
@@ -1179,7 +1180,6 @@ 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("UTF-8") 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)