Permalink
Browse files

Revert "push parameter instantiation to one method"

This reverts commit 9669f6f.

This breaks Sam Ruby's tests for some reason.  Revert until we figure it
out.
  • Loading branch information...
1 parent a7826bd commit a5efd5800c1e93f0932c30e885c98de04cb00572 @tenderlove tenderlove committed Jul 5, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/lib/action_controller/test_case.rb
@@ -462,7 +462,6 @@ def paramify_values(hash_or_array_or_value)
hash_or_array_or_value.map {|i| paramify_values(i)}
when Rack::Test::UploadedFile, ActionDispatch::Http::UploadedFile
hash_or_array_or_value
- when nil then {}
else
hash_or_array_or_value.to_param
end
@@ -495,6 +494,7 @@ def process(action, http_method = 'GET', *args)
@request.env['REQUEST_METHOD'] = http_method
+ parameters ||= {}
controller_class_name = @controller.class.anonymous? ?
"anonymous" :
@controller.class.name.underscore.sub(/_controller$/, '')

0 comments on commit a5efd58

Please sign in to comment.