diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-29 07:44:11 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-29 07:44:11 -0700 |
| commit | c2a7084a2df375e2a608767c6079a8d82a783620 (patch) | |
| tree | 5664c84bd48af9f73413640191b88381e5e5dab6 /actionpack/lib/action_controller | |
| parent | e1a10b15c20dc98f19b2a1b9d984d19bedfddcfa (diff) | |
| parent | c53e5def08f7a289a92a8e5f79dcd7caa5c3a2fb (diff) | |
| download | rails-c2a7084a2df375e2a608767c6079a8d82a783620.tar.gz rails-c2a7084a2df375e2a608767c6079a8d82a783620.tar.bz2 rails-c2a7084a2df375e2a608767c6079a8d82a783620.zip | |
Merge pull request #7786 from yabawock/3-2-stable
Backport "Don't paramify ActionDispatch::Http::UploadedFile in tests"
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 05e3cd40b5..717e4043bb 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -422,7 +422,7 @@ module ActionController Hash[hash_or_array_or_value.map{|key, value| [key, paramify_values(value)] }] when Array hash_or_array_or_value.map {|i| paramify_values(i)} - when Rack::Test::UploadedFile + when Rack::Test::UploadedFile, ActionDispatch::Http::UploadedFile hash_or_array_or_value else hash_or_array_or_value.to_param |