|
3 | 3 | require "abstract_unit" |
4 | 4 | require "controller/fake_models" |
5 | 5 | require "active_support/logger" |
| 6 | +require "active_support/core_ext/object/with" |
6 | 7 |
|
7 | 8 | class RenderJsonTest < ActionController::TestCase |
8 | 9 | class JsonRenderable |
@@ -120,10 +121,12 @@ def test_render_json_with_callback_escapes_js_chars |
120 | 121 | assert_equal "text/javascript", @response.media_type |
121 | 122 | end |
122 | 123 |
|
123 | | - def test_render_json_without_callback_does_not_escape_js_chars |
124 | | - get :render_json_unsafe_chars_without_callback |
125 | | - assert_equal %({"hello":"\u2028\u2029<script>"}), @response.body |
126 | | - assert_equal "application/json", @response.media_type |
| 124 | + def test_render_json_with_new_default_and_without_callback_does_not_escape_js_chars |
| 125 | + TestController.with(escape_json_responses: false) do |
| 126 | + get :render_json_unsafe_chars_without_callback |
| 127 | + assert_equal %({"hello":"\u2028\u2029<script>"}), @response.body |
| 128 | + assert_equal "application/json", @response.media_type |
| 129 | + end |
127 | 130 | end |
128 | 131 |
|
129 | 132 | def test_render_json_with_custom_content_type |
@@ -157,6 +160,6 @@ def test_render_json_calls_to_json_from_object |
157 | 160 |
|
158 | 161 | def test_render_json_avoids_view_options |
159 | 162 | get :render_json_inspect_options |
160 | | - assert_equal '{"options":{"escape":false}}', @response.body |
| 163 | + assert_equal '{"options":{}}', @response.body |
161 | 164 | end |
162 | 165 | end |
0 commit comments