diff options
| author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2019-06-01 16:51:56 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-01 16:51:56 +0900 |
| commit | 2a015f6c0be0593a624b0c800e5335319ac4c660 (patch) | |
| tree | 76458f7e7c743bdee8d979a2af83494c21f636af /actionpack/test/controller/render_xml_test.rb | |
| parent | d3e87efedb8cf9d072584bc8703841a80c07648f (diff) | |
| parent | ea5f509643d6d9c468a9b26f6c45bd4e40fd67cf (diff) | |
| download | rails-2a015f6c0be0593a624b0c800e5335319ac4c660.tar.gz rails-2a015f6c0be0593a624b0c800e5335319ac4c660.tar.bz2 rails-2a015f6c0be0593a624b0c800e5335319ac4c660.zip | |
Merge pull request #36034 from y-yagi/fixes_35709
Change `ActionDispatch::Response#content_type` returning Content-Type header as it is
Diffstat (limited to 'actionpack/test/controller/render_xml_test.rb')
| -rw-r--r-- | actionpack/test/controller/render_xml_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/render_xml_test.rb b/actionpack/test/controller/render_xml_test.rb index a72d14e4bb..7d61076e7c 100644 --- a/actionpack/test/controller/render_xml_test.rb +++ b/actionpack/test/controller/render_xml_test.rb @@ -92,11 +92,11 @@ class RenderXmlTest < ActionController::TestCase def test_should_render_xml_but_keep_custom_content_type get :render_xml_with_custom_content_type - assert_equal "application/atomsvc+xml", @response.content_type + assert_equal "application/atomsvc+xml", @response.media_type end def test_should_use_implicit_content_type get :implicit_content_type, format: "atom" - assert_equal Mime[:atom], @response.content_type + assert_equal Mime[:atom], @response.media_type end end |