aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2013-01-23 23:14:47 +0100
committerXavier Noria <fxn@hashref.com>2013-01-23 23:15:26 +0100
commit8ac94d7c8938649984c683a51ee54589ee338166 (patch)
tree880e26d5d032de25118e2b87482aae31fe6e7107 /actionpack/test
parent3af85ed311f37ec4092b1876116a1209faeec812 (diff)
downloadrails-8ac94d7c8938649984c683a51ee54589ee338166.tar.gz
rails-8ac94d7c8938649984c683a51ee54589ee338166.tar.bz2
rails-8ac94d7c8938649984c683a51ee54589ee338166.zip
ActionDispatch::Http::UploadedFile is a permitted scalar [Closes #9051]
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/parameters/parameters_permit_test.rb3
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 734662ae11..aadb142660 100644
--- a/actionpack/test/controller/parameters/parameters_permit_test.rb
+++ b/actionpack/test/controller/parameters/parameters_permit_test.rb
@@ -1,4 +1,5 @@
require 'abstract_unit'
+require 'action_dispatch/http/upload'
require 'action_controller/metal/strong_parameters'
class ParametersPermitTest < ActiveSupport::TestCase
@@ -31,7 +32,7 @@ class ParametersPermitTest < ActiveSupport::TestCase
values += [0, 1.0, 2**128, BigDecimal.new(1)]
values += [true, false]
values += [Date.today, Time.now, DateTime.now]
- values += [StringIO.new]
+ values += [STDOUT, StringIO.new, ActionDispatch::Http::UploadedFile.new(tempfile: __FILE__)]
values.each do |value|
params = ActionController::Parameters.new(id: value)