From a5efd5800c1e93f0932c30e885c98de04cb00572 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 5 Jul 2012 15:46:14 -0700
Subject: Revert "push parameter instantiation to one method"

This reverts commit 9669f6f7883787aa209207cab68b1069636aed9e.

This breaks Sam Ruby's tests for some reason.  Revert until we figure it
out.
---
 actionpack/lib/action_controller/test_case.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib')

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$/, '')
-- 
cgit v1.2.3