aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-29 07:44:11 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-29 07:44:11 -0700
commitc2a7084a2df375e2a608767c6079a8d82a783620 (patch)
tree5664c84bd48af9f73413640191b88381e5e5dab6 /actionpack/test
parente1a10b15c20dc98f19b2a1b9d984d19bedfddcfa (diff)
parentc53e5def08f7a289a92a8e5f79dcd7caa5c3a2fb (diff)
downloadrails-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/test')
-rw-r--r--actionpack/test/controller/test_test.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 6a5843f9d7..677a933ccb 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -766,6 +766,13 @@ XML
assert_equal '159528', @response.body
end
+ def test_action_dispatch_uploaded_file_upload
+ filename = 'mona_lisa.jpg'
+ path = "#{FILES_DIR}/#{filename}"
+ post :test_file_upload, :file => ActionDispatch::Http::UploadedFile.new(:filename => path, :type => "image/jpg", :tempfile => File.open(path))
+ assert_equal '159528', @response.body
+ end
+
def test_test_uploaded_file_exception_when_file_doesnt_exist
assert_raise(RuntimeError) { Rack::Test::UploadedFile.new('non_existent_file') }
end