aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_case.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
-rw-r--r--actionpack/lib/action_controller/test_case.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 49b411f34d..0498b9d138 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -462,7 +462,6 @@ module ActionController
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 @@ module ActionController
@request.env['REQUEST_METHOD'] = http_method
+ parameters ||= {}
controller_class_name = @controller.class.anonymous? ?
"anonymous" :
@controller.class.name.underscore.sub(/_controller$/, '')