aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-07-03 16:35:07 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-07-03 16:35:07 -0700
commitb5442b5a3aba2c1e9c3c54c4ec824595536b8f6c (patch)
tree26f6c3f75c662cd75cf9c8c16add92b83ab016ab /actionpack/lib/action_controller
parente136fbd7fa3286006766b59485a0e3348c776e5c (diff)
downloadrails-b5442b5a3aba2c1e9c3c54c4ec824595536b8f6c.tar.gz
rails-b5442b5a3aba2c1e9c3c54c4ec824595536b8f6c.tar.bz2
rails-b5442b5a3aba2c1e9c3c54c4ec824595536b8f6c.zip
test should be testing to_param not to_s, remove Array subclass
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/test_case.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 91814bbcb4..9a5fa719a8 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -150,10 +150,6 @@ module ActionController
self.session_options = TestSession::DEFAULT_OPTIONS.merge(:id => SecureRandom.hex(16))
end
- class Result < ::Array #:nodoc:
- def to_s() join '/' end
- end
-
def assign_parameters(routes, controller_path, action, parameters = {})
parameters = parameters.symbolize_keys.merge(:controller => controller_path, :action => action)
extra_keys = routes.extra_keys(parameters)
@@ -171,7 +167,7 @@ module ActionController
non_path_parameters[key] = value
else
if value.is_a?(Array)
- value = Result.new(value.map(&:to_param))
+ value = value.map(&:to_param)
else
value = value.to_param
end