diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2019-08-04 02:53:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-04 02:53:01 +0200 |
| commit | 5f3848a979e6be15a4d8bedcb9c68587094094fe (patch) | |
| tree | 8253c1554e5c13a4891c48f628492e8532ced9ca /actionpack/test/controller/render_json_test.rb | |
| parent | f1f5024b918ecf303b9908f78d1a6136d9418730 (diff) | |
| parent | 7cf445d3bdc466f26b4a1929822ccd34daac19a7 (diff) | |
| download | rails-5f3848a979e6be15a4d8bedcb9c68587094094fe.tar.gz rails-5f3848a979e6be15a4d8bedcb9c68587094094fe.tar.bz2 rails-5f3848a979e6be15a4d8bedcb9c68587094094fe.zip | |
Merge pull request #36854 from eugeneius/media_type_instead_of_content_type
Use media_type instead of content_type internally
Diffstat (limited to 'actionpack/test/controller/render_json_test.rb')
| -rw-r--r-- | actionpack/test/controller/render_json_test.rb | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb index 82c6aaafe5..0045d2be34 100644 --- a/actionpack/test/controller/render_json_test.rb +++ b/actionpack/test/controller/render_json_test.rb @@ -133,4 +133,22 @@ class RenderJsonTest < ActionController::TestCase get :render_json_without_options assert_equal '{"a":"b"}', @response.body end + + def test_should_not_trigger_content_type_deprecation + original = ActionDispatch::Response.return_only_media_type_on_content_type + ActionDispatch::Response.return_only_media_type_on_content_type = true + + assert_not_deprecated { get :render_json_hello_world } + ensure + ActionDispatch::Response.return_only_media_type_on_content_type = original + end + + def test_should_not_trigger_content_type_deprecation_with_callback + original = ActionDispatch::Response.return_only_media_type_on_content_type + ActionDispatch::Response.return_only_media_type_on_content_type = true + + assert_not_deprecated { get :render_json_hello_world_with_callback, xhr: true } + ensure + ActionDispatch::Response.return_only_media_type_on_content_type = original + end end |