diff options
| author | Xavier Noria <fxn@hashref.com> | 2013-02-21 06:26:20 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2013-02-21 06:26:20 -0800 |
| commit | 91d1ac0d210f91056ee574579af0b52ec5324cb8 (patch) | |
| tree | c2d29e25aeace80a0a909aa73851200a1fc98a6c /actionpack/test/controller/parameters | |
| parent | b0fa9b59c8c9cac52d4eb4d8d984b85d4a753e97 (diff) | |
| parent | fa9ec0a678e347f96e613f937323b9f969160f35 (diff) | |
| download | rails-91d1ac0d210f91056ee574579af0b52ec5324cb8.tar.gz rails-91d1ac0d210f91056ee574579af0b52ec5324cb8.tar.bz2 rails-91d1ac0d210f91056ee574579af0b52ec5324cb8.zip | |
Merge pull request #9357 from fabiokr/rack_test_uploaded_file
Rack::Test::UploadedFile is a permitted scalar
Diffstat (limited to 'actionpack/test/controller/parameters')
| -rw-r--r-- | actionpack/test/controller/parameters/parameters_permit_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb index aadb142660..437da43d9b 100644 --- a/actionpack/test/controller/parameters/parameters_permit_test.rb +++ b/actionpack/test/controller/parameters/parameters_permit_test.rb @@ -32,7 +32,8 @@ class ParametersPermitTest < ActiveSupport::TestCase values += [0, 1.0, 2**128, BigDecimal.new(1)] values += [true, false] values += [Date.today, Time.now, DateTime.now] - values += [STDOUT, StringIO.new, ActionDispatch::Http::UploadedFile.new(tempfile: __FILE__)] + values += [STDOUT, StringIO.new, ActionDispatch::Http::UploadedFile.new(tempfile: __FILE__), + Rack::Test::UploadedFile.new(__FILE__)] values.each do |value| params = ActionController::Parameters.new(id: value) |