diff options
author | =?utf-8?q?Adam=20Cig=C3=A1nek?= <adam.ciganek@gmail.com> | 2008-12-21 18:58:55 +0000 |
---|---|---|
committer | Frederick Cheung <frederick.cheung@gmail.com> | 2008-12-21 18:58:55 +0000 |
commit | fcd58dc27a99085b161f2463988d4ee373d44ec6 (patch) | |
tree | b137e8fcc185c97068aeae54d8927c6bb3d8f243 /actionpack/test/controller | |
parent | 7cda0df7f1511a10c515165dbce76e5c68b654ff (diff) | |
download | rails-fcd58dc27a99085b161f2463988d4ee373d44ec6.tar.gz rails-fcd58dc27a99085b161f2463988d4ee373d44ec6.tar.bz2 rails-fcd58dc27a99085b161f2463988d4ee373d44ec6.zip |
Allow use of symbols for :type option of ActionController::Streaming#send_file/#send_data [#1232 state:resolved]
Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r-- | actionpack/test/controller/send_file_test.rb | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb index c4349bfc7f..1b7486ad34 100644 --- a/actionpack/test/controller/send_file_test.rb +++ b/actionpack/test/controller/send_file_test.rb @@ -119,6 +119,31 @@ class SendFileTest < Test::Unit::TestCase assert_equal 'private', h['Cache-Control'] end + def test_send_file_headers_with_mime_lookup_with_symbol + options = { + :length => 1, + :type => :png + } + + @controller.headers = {} + @controller.send(:send_file_headers!, options) + + headers = @controller.headers + + assert_equal 'image/png', headers['Content-Type'] + end + + + def test_send_file_headers_with_bad_symbol + options = { + :length => 1, + :type => :this_type_is_not_registered + } + + @controller.headers = {} + assert_raises(ArgumentError){ @controller.send(:send_file_headers!, options) } + end + %w(file data).each do |method| define_method "test_send_#{method}_status" do @controller.options = { :stream => false, :status => 500 } |