aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-07-31 22:25:54 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-02 17:09:37 -0300
commit2bdb4ec6ad9bb99ac0029fcb030ac757307d08ae (patch)
tree70e5d9cf8bf64b73d60b4798828f8aa59a488236 /railties/test
parent96e92b616264c26a5c1c2a50f0495c119a869772 (diff)
downloadrails-2bdb4ec6ad9bb99ac0029fcb030ac757307d08ae.tar.gz
rails-2bdb4ec6ad9bb99ac0029fcb030ac757307d08ae.tar.bz2
rails-2bdb4ec6ad9bb99ac0029fcb030ac757307d08ae.zip
html_escape should escape single quotes
https://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet#RULE_.231_-_HTML_Escape_Before_Inserting_Untrusted_Data_into_HTML_Element_Content Closes #7215 Conflicts: actionpack/test/template/erb_util_test.rb actionpack/test/template/form_tag_helper_test.rb actionpack/test/template/text_helper_test.rb actionpack/test/template/url_helper_test.rb activesupport/lib/active_support/core_ext/string/output_safety.rb
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/assets_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 673a403fd3..ba32e4904f 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -230,7 +230,7 @@ module ApplicationTests
get '/posts'
assert_match(/AssetNotPrecompiledError/, last_response.body)
- assert_match(/app.js isn't precompiled/, last_response.body)
+ assert_match(/app.js isn&#x27;t precompiled/, last_response.body)
end
test "assets raise AssetNotPrecompiledError when manifest file is present and requested file isn't precompiled if digest is disabled" do
@@ -254,7 +254,7 @@ module ApplicationTests
get '/posts'
assert_match(/AssetNotPrecompiledError/, last_response.body)
- assert_match(/app.js isn't precompiled/, last_response.body)
+ assert_match(/app.js isn&#x27;t precompiled/, last_response.body)
end
test "precompile properly refers files referenced with asset_path and and run in the provided RAILS_ENV" do