diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-23 13:06:12 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-23 13:06:12 -0700 |
| commit | ebe8a45444fb42b42768fba826f56a498c8b389a (patch) | |
| tree | 7be0d9fc17148301820b4f7f83032c32cf856ecd /actionpack/lib/action_controller | |
| parent | 5fb21ba5193c6a98003d6924923b552368618f26 (diff) | |
| parent | 8471edc6725aa905dc9f7b800438acb255b1512e (diff) | |
| download | rails-ebe8a45444fb42b42768fba826f56a498c8b389a.tar.gz rails-ebe8a45444fb42b42768fba826f56a498c8b389a.tar.bz2 rails-ebe8a45444fb42b42768fba826f56a498c8b389a.zip | |
Merge pull request #6805 from tim-vandecasteele/uploadedfile-paramify
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 67c9efc0ab..a1f29ea1bc 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -450,7 +450,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 |