diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-12-17 12:29:57 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-12-17 12:29:57 -0800 |
| commit | 39ca25f5c42470b4a446fa7688bce22767d82d79 (patch) | |
| tree | 504d96a497fe6dac441675d09b7b79c41357f7f6 /actionpack/test/controller/render_json_test.rb | |
| parent | 2b096c7170bd8b4892fb3902741c8a4c21e962b2 (diff) | |
| parent | 1650bb3d56897cfef4c7e6b86a36eed4f1a41df5 (diff) | |
| download | rails-39ca25f5c42470b4a446fa7688bce22767d82d79.tar.gz rails-39ca25f5c42470b4a446fa7688bce22767d82d79.tar.bz2 rails-39ca25f5c42470b4a446fa7688bce22767d82d79.zip | |
Merge pull request #13345 from jeremy/get-csrf
CSRF protection from cross-origin <script> tags
Diffstat (limited to 'actionpack/test/controller/render_json_test.rb')
| -rw-r--r-- | actionpack/test/controller/render_json_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb index 7c0a6bd67e..de8d1cbd9b 100644 --- a/actionpack/test/controller/render_json_test.rb +++ b/actionpack/test/controller/render_json_test.rb @@ -100,13 +100,13 @@ class RenderJsonTest < ActionController::TestCase end def test_render_json_with_callback - get :render_json_hello_world_with_callback + xhr :get, :render_json_hello_world_with_callback assert_equal 'alert({"hello":"world"})', @response.body assert_equal 'text/javascript', @response.content_type end def test_render_json_with_custom_content_type - get :render_json_with_custom_content_type + xhr :get, :render_json_with_custom_content_type assert_equal '{"hello":"world"}', @response.body assert_equal 'text/javascript', @response.content_type end |