diff options
author | Jon Moss <me@jonathanmoss.me> | 2017-04-30 11:05:20 -0400 |
---|---|---|
committer | Jon Moss <me@jonathanmoss.me> | 2017-04-30 11:05:20 -0400 |
commit | f4b57b904dd4b6f6b4db6ff397cab23463890cc0 (patch) | |
tree | 350a41a5bc8a9fd519950e5350f9b58a3a3a5e31 | |
parent | da70168715c02980986279d60e3c6631cfb164d2 (diff) | |
download | rails-f4b57b904dd4b6f6b4db6ff397cab23463890cc0.tar.gz rails-f4b57b904dd4b6f6b4db6ff397cab23463890cc0.tar.bz2 rails-f4b57b904dd4b6f6b4db6ff397cab23463890cc0.zip |
Default content type for `head` is `text/html`
Otherwise Mime::NullType will be returned as the `Content-Type` header.
-rw-r--r-- | actionpack/lib/action_controller/metal/head.rb | 2 | ||||
-rw-r--r-- | actionpack/test/controller/render_test.rb | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb index 0c50894bce..1748fbd7c8 100644 --- a/actionpack/lib/action_controller/metal/head.rb +++ b/actionpack/lib/action_controller/metal/head.rb @@ -36,7 +36,7 @@ module ActionController self.response_body = "" if include_content?(response_code) - self.content_type = content_type || (Mime[formats.first] if formats) + self.content_type = content_type || (Mime[formats.first] if formats) || Mime[:html] response.charset = false end diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index 3a0a0a8bde..313368eec4 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -227,6 +227,15 @@ class TestController < ActionController::Base head 204 end + def head_default_content_type + # simulating path like "/1.foobar" + request.formats = [] + + respond_to do |format| + format.any { head 200 } + end + end + private def set_variable_for_layout @@ -759,6 +768,11 @@ class HeadRenderTest < ActionController::TestCase get :head_and_return end end + + def test_head_default_content_type + post :head_default_content_type + assert_equal "text/html", @response.header["Content-Type"] + end end class HttpCacheForeverTest < ActionController::TestCase |