diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-05 15:46:14 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-05 15:46:14 -0700 |
| commit | a5efd5800c1e93f0932c30e885c98de04cb00572 (patch) | |
| tree | e2e2097ec7e661e4575cf1aff621bc8abdd4aebd /actionpack/lib/action_controller | |
| parent | a7826bd8b7791284148c53eeefe35e8ab1185b31 (diff) | |
| download | rails-a5efd5800c1e93f0932c30e885c98de04cb00572.tar.gz rails-a5efd5800c1e93f0932c30e885c98de04cb00572.tar.bz2 rails-a5efd5800c1e93f0932c30e885c98de04cb00572.zip | |
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.
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 |
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$/, '') |