1 files changed, 9 insertions, 4 deletions
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 4e547ab7d5..7433c5ce0c 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -74,7 +74,7 @@ class ResponseTest < ActiveSupport::TestCase
     @response.body = "Hello, World!"
 
     # even though there's no explicitly set content-type,
-    assert_equal nil, @response.content_type
+    assert_nil @response.content_type
 
     # after the action reads back @response.body,
     assert_equal "Hello, World!", @response.body
@@ -110,6 +110,11 @@ class ResponseTest < ActiveSupport::TestCase
     assert_equal "application/aaron", @response.content_type
   end
 
+  def test_empty_content_type_returns_nil
+    @response.headers["Content-Type"] = ""
+    assert_nil @response.content_type
+  end
+
   test "simple output" do
     @response.body = "Hello, World!"
 
@@ -131,7 +136,7 @@ class ResponseTest < ActiveSupport::TestCase
   def test_only_set_charset_still_defaults_to_text_html
     response = ActionDispatch::Response.new
     response.charset = "utf-16"
-    _,headers,_ = response.to_a
+    _, headers, _ = response.to_a
     assert_equal "text/html; charset=utf-16", headers["Content-Type"]
   end
 
@@ -229,7 +234,7 @@ class ResponseTest < ActiveSupport::TestCase
 
   test "multiple cookies" do
     @response.set_cookie("user_name", value: "david", path: "/")
-    @response.set_cookie("login", value: "foo&bar", path: "/", expires: Time.utc(2005, 10, 10,5))
+    @response.set_cookie("login", value: "foo&bar", path: "/", expires: Time.utc(2005, 10, 10, 5))
     _status, headers, _body = @response.to_a
     assert_equal "user_name=david; path=/\nlogin=foo%26bar; path=/; expires=Mon, 10 Oct 2005 05:00:00 -0000", headers["Set-Cookie"]
     assert_equal({ "login" => "foo&bar", "user_name" => "david" }, @response.cookies)
@@ -237,7 +242,7 @@ class ResponseTest < ActiveSupport::TestCase
 
   test "delete cookies" do
     @response.set_cookie("user_name", value: "david", path: "/")
-    @response.set_cookie("login", value: "foo&bar", path: "/", expires: Time.utc(2005, 10, 10,5))
+    @response.set_cookie("login", value: "foo&bar", path: "/", expires: Time.utc(2005, 10, 10, 5))
     @response.delete_cookie("login")
     assert_equal({ "user_name" => "david", "login" => nil }, @response.cookies)
   end