diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-12-12 20:41:14 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-12-17 13:14:17 -0700 |
| commit | 1650bb3d56897cfef4c7e6b86a36eed4f1a41df5 (patch) | |
| tree | 6f2e5fc872568c8d0f74e17e0e05230c6173526e /actionpack/test/controller/render_json_test.rb | |
| parent | 290368bdb2c9ecb7d6212a1d3767ae69554788a9 (diff) | |
| download | rails-1650bb3d56897cfef4c7e6b86a36eed4f1a41df5.tar.gz rails-1650bb3d56897cfef4c7e6b86a36eed4f1a41df5.tar.bz2 rails-1650bb3d56897cfef4c7e6b86a36eed4f1a41df5.zip | |
CSRF protection from cross-origin <script> tags
Thanks to @homakov for sounding the alarm about JSONP-style data leaking
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 |