1 files changed, 14 insertions, 3 deletions
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index c0ddcf7f50..daa38ecbc4 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -89,7 +89,7 @@ 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,
+      :type => Mime::Type[:PNG],
       :disposition => 'disposition',
       :filename => 'filename'
     }
@@ -115,7 +115,7 @@ class SendFileTest < ActionController::TestCase
 
   def test_send_file_headers_with_disposition_as_a_symbol
     options = {
-      :type => Mime::PNG,
+      :type => Mime::Type[:PNG],
       :disposition => :disposition,
       :filename => 'filename'
     }
@@ -143,7 +143,18 @@ class SendFileTest < ActionController::TestCase
     }
 
     @controller.headers = {}
-    assert_raise(ArgumentError) { @controller.send(:send_file_headers!, options) }
+    error = assert_raise(ArgumentError) { @controller.send(:send_file_headers!, options) }
+    assert_equal "Unknown MIME type #{options[:type]}", error.message
+  end
+
+  def test_send_file_headers_with_nil_content_type
+    options = {
+      :type => nil
+    }
+
+    @controller.headers = {}
+    error = assert_raise(ArgumentError) { @controller.send(:send_file_headers!, options) }
+    assert_equal ":type option required", error.message
   end
 
   def test_send_file_headers_guess_type_from_extension