aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template/html-scanner/sanitizer_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-02-24 15:12:13 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-02-24 15:12:13 -0800
commite9d659224bb6610d726bd333a9425b4f8f5796ba (patch)
tree53896b07fb022135d19377a7f2f38aaf22ef4fcc /actionpack/test/template/html-scanner/sanitizer_test.rb
parent2647a3cabfb88ac0dac318207bf611b0b66d495f (diff)
parent2a12a04a54590d3a5f2abf4cd4eff3a7b1ee6ef4 (diff)
downloadrails-e9d659224bb6610d726bd333a9425b4f8f5796ba.tar.gz
rails-e9d659224bb6610d726bd333a9425b4f8f5796ba.tar.bz2
rails-e9d659224bb6610d726bd333a9425b4f8f5796ba.zip
Merge pull request #9406 from rails/3-2-stable-ruby-2
Rails 3.2.x is now compatible with Ruby 2.0.0
Diffstat (limited to 'actionpack/test/template/html-scanner/sanitizer_test.rb')
-rw-r--r--actionpack/test/template/html-scanner/sanitizer_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/template/html-scanner/sanitizer_test.rb b/actionpack/test/template/html-scanner/sanitizer_test.rb
index 62ad6be680..844484ee47 100644
--- a/actionpack/test/template/html-scanner/sanitizer_test.rb
+++ b/actionpack/test/template/html-scanner/sanitizer_test.rb
@@ -210,7 +210,7 @@ class SanitizerTest < ActionController::TestCase
# TODO: Clean up
def test_should_sanitize_attributes
- assert_sanitized %(<SPAN title="'><script>alert()</script>">blah</SPAN>), %(<span title="'&gt;&lt;script&gt;alert()&lt;/script&gt;">blah</span>)
+ assert_sanitized %(<SPAN title="'><script>alert()</script>">blah</SPAN>), %(<span title="#{CGI.escapeHTML "'><script>alert()</script>"}">blah</span>)
end
def test_should_sanitize_illegal_style_properties