diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-03 18:01:11 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-03 18:01:11 -0700 |
| commit | 9669f6f7883787aa209207cab68b1069636aed9e (patch) | |
| tree | e1a675a7965cdc81c868c7c0c1787de33a1616a4 /actionpack/lib | |
| parent | 7ef6a27f89ee2cccc3a8f73123d2a7173c85f52f (diff) | |
| download | rails-9669f6f7883787aa209207cab68b1069636aed9e.tar.gz rails-9669f6f7883787aa209207cab68b1069636aed9e.tar.bz2 rails-9669f6f7883787aa209207cab68b1069636aed9e.zip | |
push parameter instantiation to one method
Diffstat (limited to 'actionpack/lib')
| -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 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$/, '') |