diff options
author | José Valim <jose.valim@gmail.com> | 2011-06-28 02:44:04 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-06-28 02:44:04 -0700 |
commit | 4f372cf4d9f48b76ae3472009167addd26b7d941 (patch) | |
tree | b7c167913424932d9c8732c22ea62a8dd5eebc2e /actionpack/test | |
parent | 9921eca51cfc72c58c127973f75d71febf01d526 (diff) | |
parent | 2a61d47b5537bf94fae2f2c4cb97569a71a09fd7 (diff) | |
download | rails-4f372cf4d9f48b76ae3472009167addd26b7d941.tar.gz rails-4f372cf4d9f48b76ae3472009167addd26b7d941.tar.bz2 rails-4f372cf4d9f48b76ae3472009167addd26b7d941.zip |
Merge pull request #1875 from esad/master
Fixed issue #1847
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/controller/send_file_test.rb | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb index c7c8360ae6..8f885ff28e 100644 --- a/actionpack/test/controller/send_file_test.rb +++ b/actionpack/test/controller/send_file_test.rb @@ -138,6 +138,25 @@ class SendFileTest < ActionController::TestCase @controller.headers = {} assert_raise(ArgumentError){ @controller.send(:send_file_headers!, options) } end + + def test_send_file_headers_guess_type_from_extension + { + 'image.png' => 'image/png', + 'image.jpeg' => 'image/jpeg', + 'image.jpg' => 'image/jpeg', + 'image.tif' => 'image/tiff', + 'image.gif' => 'image/gif', + 'movie.mpg' => 'video/mpeg', + 'file.zip' => 'application/zip', + 'file.unk' => 'application/octet-stream', + 'zip' => 'application/octet-stream' + }.each do |filename,expected_type| + options = { :filename => filename } + @controller.headers = {} + @controller.send(:send_file_headers!, options) + assert_equal expected_type, @controller.content_type + end + end %w(file data).each do |method| define_method "test_send_#{method}_status" do |