Merge pull request #28937 from maclover7/jm-fix-28927

Default content type for `head` is `text/html`
This commit is contained in:
Rafael França 2018-07-31 15:54:23 -04:00 committed by GitHub
commit b66bf91316
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions

View File

@ -38,7 +38,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

View File

@ -250,6 +250,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
@ -814,6 +823,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