Merge pull request #8327 from elia/fix-send-data-disposition-with-symbols

Accept symbols as #send_data :disposition value

1 files changed, 13 insertions, 1 deletions

diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 8f885ff28e..4e4dd8d005 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -118,6 +118,18 @@ class SendFileTest < ActionController::TestCase
     assert_equal 'private', h['Cache-Control']
   end
 
+  def test_send_file_headers_with_disposition_as_a_symbol
+    options = {
+      :type => Mime::PNG,
+      :disposition => :disposition,
+      :filename => 'filename'
+    }
+
+    @controller.headers = {}
+    @controller.send(:send_file_headers!, options)
+    assert_equal 'disposition; filename="filename"', @controller.headers['Content-Disposition']
+  end
+
   def test_send_file_headers_with_mime_lookup_with_symbol
     options = {
       :type => :png
@@ -138,7 +150,7 @@ 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',