From 9669f6f7883787aa209207cab68b1069636aed9e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 3 Jul 2012 18:01:11 -0700
Subject: push parameter instantiation to one method

---
 actionpack/lib/action_controller/test_case.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 398d2e6871..4e6ad179ff 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -457,6 +457,7 @@ 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
@@ -489,7 +490,6 @@ module ActionController
 
         @request.env['REQUEST_METHOD'] = http_method
 
-        parameters ||= {}
         controller_class_name = @controller.class.anonymous? ?
           "anonymous" :
           @controller.class.name.underscore.sub(/_controller$/, '')
-- 
cgit v1.2.3