1 files changed, 75 insertions, 47 deletions

diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 2820425c31..8dc565ac8d 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -1,9 +1,9 @@
-require 'abstract_unit'
+require "abstract_unit"
 
 module TestFileUtils
   def file_name() File.basename(__FILE__) end
   def file_path() File.expand_path(__FILE__) end
-  def file_data() @data ||= File.open(file_path, 'rb') { |f| f.read } end
+  def file_data() @data ||= File.open(file_path, "rb") { |f| f.read } end
 end
 
 class SendFileController < ActionController::Base
@@ -11,6 +11,8 @@ class SendFileController < ActionController::Base
   include ActionController::Testing
   layout "layouts/standard" # to make sure layouts don't interfere
 
+  before_action :file, only: :file_from_before_action
+
   attr_writer :options
   def options
     @options ||= {}
@@ -20,11 +22,15 @@ class SendFileController < ActionController::Base
     send_file(file_path, options)
   end
 
+  def file_from_before_action
+    raise "No file sent from before action."
+  end
+
   def test_send_file_headers_bang
     options = {
-      :type => Mime[:png],
-      :disposition => 'disposition',
-      :filename => 'filename'
+      type: Mime[:png],
+      disposition: "disposition",
+      filename: "filename"
     }
 
     send_data "foo", options
@@ -32,32 +38,32 @@ class SendFileController < ActionController::Base
 
   def test_send_file_headers_with_disposition_as_a_symbol
     options = {
-      :type => Mime[:png],
-      :disposition => :disposition,
-      :filename => 'filename'
+      type: Mime[:png],
+      disposition: :disposition,
+      filename: "filename"
     }
 
     send_data "foo", options
   end
 
   def test_send_file_headers_with_mime_lookup_with_symbol
-    options = { :type => :png }
+    options = { type: :png }
 
     send_data "foo", options
   end
 
   def test_send_file_headers_with_bad_symbol
-    options = { :type => :this_type_is_not_registered }
+    options = { type: :this_type_is_not_registered }
     send_data "foo", options
   end
 
   def test_send_file_headers_with_nil_content_type
-    options = { :type => nil }
+    options = { type: nil }
     send_data "foo", options
   end
 
   def test_send_file_headers_guess_type_from_extension
-    options = { :filename => params[:filename] }
+    options = { filename: params[:filename] }
     send_data "foo", options
   end
 
@@ -78,9 +84,9 @@ class SendFileTest < ActionController::TestCase
   end
 
   def test_file_nostream
-    @controller.options = { :stream => false }
+    @controller.options = { stream: false }
     response = nil
-    assert_nothing_raised { response = process('file') }
+    assert_nothing_raised { response = process("file") }
     assert_not_nil response
     body = response.body
     assert_kind_of String, body
@@ -89,12 +95,12 @@ class SendFileTest < ActionController::TestCase
 
   def test_file_stream
     response = nil
-    assert_nothing_raised { response = process('file') }
+    assert_nothing_raised { response = process("file") }
     assert_not_nil response
     assert_respond_to response.stream, :each
     assert_respond_to response.stream, :to_path
 
-    require 'stringio'
+    require "stringio"
     output = StringIO.new
     output.binmode
     output.string.force_encoding(file_data.encoding)
@@ -103,16 +109,16 @@ class SendFileTest < ActionController::TestCase
   end
 
   def test_file_url_based_filename
-    @controller.options = { :url_based_filename => true }
+    @controller.options = { url_based_filename: true }
     response = nil
-    assert_nothing_raised { response = process('file') }
+    assert_nothing_raised { response = process("file") }
     assert_not_nil response
     assert_equal "attachment", response.headers["Content-Disposition"]
   end
 
   def test_data
     response = nil
-    assert_nothing_raised { response = process('data') }
+    assert_nothing_raised { response = process("data") }
     assert_not_nil response
 
     assert_kind_of String, response.body
@@ -120,10 +126,10 @@ class SendFileTest < ActionController::TestCase
   end
 
   def test_headers_after_send_shouldnt_include_charset
-    response = process('data')
+    response = process("data")
     assert_equal "application/octet-stream", response.headers["Content-Type"]
 
-    response = process('file')
+    response = process("file")
     assert_equal "application/octet-stream", response.headers["Content-Type"]
   end
 
@@ -135,25 +141,24 @@ class SendFileTest < ActionController::TestCase
     5.times do
       get :test_send_file_headers_bang
 
-      assert_equal 'image/png', response.content_type
-      assert_equal 'disposition; filename="filename"', response.get_header('Content-Disposition')
-      assert_equal 'binary', response.get_header('Content-Transfer-Encoding')
-      assert_equal 'private', response.get_header('Cache-Control')
+      assert_equal "image/png", response.content_type
+      assert_equal 'disposition; filename="filename"', response.get_header("Content-Disposition")
+      assert_equal "binary", response.get_header("Content-Transfer-Encoding")
+      assert_equal "private", response.get_header("Cache-Control")
     end
   end
 
   def test_send_file_headers_with_disposition_as_a_symbol
     get :test_send_file_headers_with_disposition_as_a_symbol
 
-    assert_equal 'disposition; filename="filename"', response.get_header('Content-Disposition')
+    assert_equal 'disposition; filename="filename"', response.get_header("Content-Disposition")
   end
 
   def test_send_file_headers_with_mime_lookup_with_symbol
     get __method__
-    assert_equal 'image/png', response.content_type
+    assert_equal "image/png", response.content_type
   end
 
-
   def test_send_file_headers_with_bad_symbol
     error = assert_raise(ArgumentError) { get __method__ }
     assert_equal "Unknown MIME type this_type_is_not_registered", error.message
@@ -166,15 +171,15 @@ class SendFileTest < ActionController::TestCase
 
   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'
+      "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|
       get __method__, params: { filename: filename }
       assert_equal expected_type, response.content_type
@@ -182,31 +187,40 @@ class SendFileTest < ActionController::TestCase
   end
 
   def test_send_file_with_default_content_disposition_header
-    process('data')
-    assert_equal 'attachment', @controller.headers['Content-Disposition']
+    process("data")
+    assert_equal "attachment", @controller.headers["Content-Disposition"]
   end
 
   def test_send_file_without_content_disposition_header
-    @controller.options = {:disposition => nil}
-    process('data')
-    assert_nil @controller.headers['Content-Disposition']
+    @controller.options = { disposition: nil }
+    process("data")
+    assert_nil @controller.headers["Content-Disposition"]
+  end
+
+  def test_send_file_from_before_action
+    response = nil
+    assert_nothing_raised { response = process("file_from_before_action") }
+    assert_not_nil response
+
+    assert_kind_of String, response.body
+    assert_equal file_data, response.body
   end
 
   %w(file data).each do |method|
     define_method "test_send_#{method}_status" do
-      @controller.options = { :stream => false, :status => 500 }
+      @controller.options = { stream: false, status: 500 }
       assert_not_nil process(method)
       assert_equal 500, @response.status
     end
 
     define_method "test_send_#{method}_content_type" do
-      @controller.options = { :stream => false, :content_type => "application/x-ruby" }
+      @controller.options = { stream: false, content_type: "application/x-ruby" }
       assert_nothing_raised { assert_not_nil process(method) }
       assert_equal "application/x-ruby", @response.content_type
     end
 
     define_method "test_default_send_#{method}_status" do
-      @controller.options = { :stream => false }
+      @controller.options = { stream: false }
       assert_nothing_raised { assert_not_nil process(method) }
       assert_equal 200, @response.status
     end
@@ -214,9 +228,23 @@ class SendFileTest < ActionController::TestCase
 
   def test_send_file_with_action_controller_live
     @controller = SendFileWithActionControllerLive.new
-    @controller.options = { :content_type => "application/x-ruby" }
+    @controller.options = { content_type: "application/x-ruby" }
 
-    response = process('file')
+    response = process("file")
     assert_equal 200, response.status
   end
+
+  def test_send_file_charset_with_type_options_key
+    @controller = SendFileWithActionControllerLive.new
+    @controller.options = { type: "text/calendar; charset=utf-8" }
+    response = process("file")
+    assert_equal "text/calendar; charset=utf-8", response.headers["Content-Type"]
+  end
+
+  def test_send_file_charset_with_content_type_options_key
+    @controller = SendFileWithActionControllerLive.new
+    @controller.options = { content_type: "text/calendar" }
+    response = process("file")
+    assert_equal "text/calendar; charset=utf-8", response.headers["Content-Type"]
+  end
 end