diff options
Diffstat (limited to 'actionpack/test/controller/request_test.rb')
| -rw-r--r-- | actionpack/test/controller/request_test.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb index a81fa4d866..67eb58a75a 100644 --- a/actionpack/test/controller/request_test.rb +++ b/actionpack/test/controller/request_test.rb @@ -731,7 +731,11 @@ class MultipartRequestParameterParsingTest < Test::Unit::TestCase assert_equal 'bar', params['foo'] file = params['file'] - assert_kind_of Tempfile, file + if RUBY_VERSION > '1.9' + assert_kind_of File, file + else + assert_kind_of Tempfile, file + end assert_equal 'file.txt', file.original_filename assert_equal "text/plain", file.content_type assert ('a' * 20480) == file.read |