mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #8329 from elia/fix-send-data-disposition-with-symbols-master
Accept symbols as #send_data :disposition value
This commit is contained in:
commit
fe4571259d
3 changed files with 15 additions and 0 deletions
|
@ -1,5 +1,7 @@
|
|||
## Rails 4.0.0 (unreleased) ##
|
||||
|
||||
* Accept symbols as #send_data :disposition value *Elia Schito*
|
||||
|
||||
* Add i18n scope to distance_of_time_in_words. *Steve Klabnik*
|
||||
|
||||
* `assert_template`:
|
||||
|
|
|
@ -150,6 +150,7 @@ module ActionController #:nodoc:
|
|||
|
||||
disposition = options.fetch(:disposition, DEFAULT_SEND_FILE_DISPOSITION)
|
||||
unless disposition.nil?
|
||||
disposition = disposition.to_s
|
||||
disposition += %(; filename="#{options[:filename]}") if options[:filename]
|
||||
headers['Content-Disposition'] = disposition
|
||||
end
|
||||
|
|
|
@ -114,6 +114,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
|
||||
|
|
Loading…
Reference in a new issue