aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/mime/respond_to_test.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-07-10 10:20:25 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-07-10 10:20:25 -0700
commit6e76031e8f1f815b390f966cb21e25c66e5ded50 (patch)
treed614c3eed3fc10a3d77c2a9fd95f684a76e20d77 /actionpack/test/controller/mime/respond_to_test.rb
parent6b6832eeeb43c5f2553373f84677350ba654346a (diff)
parent93fb4c1e62dc9605eecbfaffda2becc85890fa5f (diff)
downloadrails-6e76031e8f1f815b390f966cb21e25c66e5ded50.tar.gz
rails-6e76031e8f1f815b390f966cb21e25c66e5ded50.tar.bz2
rails-6e76031e8f1f815b390f966cb21e25c66e5ded50.zip
* gcampbell-rosetta_flash:
Address CVE-2014-4671 (JSONP Flash exploit)
Diffstat (limited to 'actionpack/test/controller/mime/respond_to_test.rb')
-rw-r--r--actionpack/test/controller/mime/respond_to_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/mime/respond_to_test.rb b/actionpack/test/controller/mime/respond_to_test.rb
index c89b95de3b..1bc7ad3015 100644
--- a/actionpack/test/controller/mime/respond_to_test.rb
+++ b/actionpack/test/controller/mime/respond_to_test.rb
@@ -520,7 +520,7 @@ class RespondToControllerTest < ActionController::TestCase
def test_json_with_callback_sets_javascript_content_type
@request.accept = 'application/json'
get :json_with_callback
- assert_equal 'alert(JS)', @response.body
+ assert_equal '/**/alert(JS)', @response.body
assert_equal 'text/javascript', @response.content_type
end