1 files changed, 61 insertions, 48 deletions

diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index c002cf4d8f..2820425c31 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'abstract_unit'
 
 module TestFileUtils
@@ -21,6 +20,47 @@ class SendFileController < ActionController::Base
     send_file(file_path, options)
   end
 
+  def test_send_file_headers_bang
+    options = {
+      :type => Mime[:png],
+      :disposition => 'disposition',
+      :filename => 'filename'
+    }
+
+    send_data "foo", options
+  end
+
+  def test_send_file_headers_with_disposition_as_a_symbol
+    options = {
+      :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 }
+
+    send_data "foo", options
+  end
+
+  def test_send_file_headers_with_bad_symbol
+    options = { :type => :this_type_is_not_registered }
+    send_data "foo", options
+  end
+
+  def test_send_file_headers_with_nil_content_type
+    options = { :type => nil }
+    send_data "foo", options
+  end
+
+  def test_send_file_headers_guess_type_from_extension
+    options = { :filename => params[:filename] }
+    send_data "foo", options
+  end
+
   def data
     send_data(file_data, options)
   end
@@ -35,8 +75,6 @@ class SendFileTest < ActionController::TestCase
 
   def setup
     @controller = SendFileController.new
-    @request = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
   end
 
   def test_file_nostream
@@ -91,62 +129,39 @@ class SendFileTest < ActionController::TestCase
 
   # Test that send_file_headers! is setting the correct HTTP headers.
   def test_send_file_headers_bang
-    options = {
-      :type => Mime::PNG,
-      :disposition => 'disposition',
-      :filename => 'filename'
-    }
-
     # Do it a few times: the resulting headers should be identical
     # no matter how many times you send with the same options.
     # Test resolving Ticket #458.
-    @controller.headers = {}
-    @controller.send(:send_file_headers!, options)
-    @controller.send(:send_file_headers!, options)
-    @controller.send(:send_file_headers!, options)
+    5.times do
+      get :test_send_file_headers_bang
 
-    h = @controller.headers
-    assert_equal 'image/png', @controller.content_type
-    assert_equal 'disposition; filename="filename"', h['Content-Disposition']
-    assert_equal 'binary', h['Content-Transfer-Encoding']
-
-    # test overriding Cache-Control: no-cache header to fix IE open/save dialog
-    @controller.send(:send_file_headers!, options)
-    @controller.response.prepare!
-    assert_equal 'private', h['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
-    options = {
-      :type => Mime::PNG,
-      :disposition => :disposition,
-      :filename => 'filename'
-    }
+    get :test_send_file_headers_with_disposition_as_a_symbol
 
-    @controller.headers = {}
-    @controller.send(:send_file_headers!, options)
-    assert_equal 'disposition; filename="filename"', @controller.headers['Content-Disposition']
+    assert_equal 'disposition; filename="filename"', response.get_header('Content-Disposition')
   end
 
   def test_send_file_headers_with_mime_lookup_with_symbol
-    options = {
-      :type => :png
-    }
-
-    @controller.headers = {}
-    @controller.send(:send_file_headers!, options)
-
-    assert_equal 'image/png', @controller.content_type
+    get __method__
+    assert_equal 'image/png', response.content_type
   end
 
 
   def test_send_file_headers_with_bad_symbol
-    options = {
-      :type => :this_type_is_not_registered
-    }
+    error = assert_raise(ArgumentError) { get __method__ }
+    assert_equal "Unknown MIME type this_type_is_not_registered", error.message
+  end
 
-    @controller.headers = {}
-    assert_raise(ArgumentError) { @controller.send(:send_file_headers!, options) }
+  def test_send_file_headers_with_nil_content_type
+    error = assert_raise(ArgumentError) { get __method__ }
+    assert_equal ":type option required", error.message
   end
 
   def test_send_file_headers_guess_type_from_extension
@@ -161,10 +176,8 @@ class SendFileTest < ActionController::TestCase
       '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
+      get __method__, params: { filename: filename }
+      assert_equal expected_type, response.content_type
     end
   end
 
@@ -182,7 +195,7 @@ class SendFileTest < ActionController::TestCase
   %w(file data).each do |method|
     define_method "test_send_#{method}_status" do
       @controller.options = { :stream => false, :status => 500 }
-      assert_nothing_raised { assert_not_nil process(method) }
+      assert_not_nil process(method)
       assert_equal 500, @response.status
     end