1 files changed, 14 insertions, 0 deletions
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 25420ead3b..8dc565ac8d 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -233,4 +233,18 @@ class SendFileTest < ActionController::TestCase
     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