aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-12 10:09:34 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-12 10:09:34 -0700
commitdea486d00ed8b9beec767324dfd15bec72d8a1ca (patch)
treee4a851f32a9c6bae53e0d7703a14b41593eb849b /actionpack/test/template
parent2b0558585fa495e61e67f4226aa3ba2eb7771106 (diff)
parentc8168a7cdcdda114f634e8a429ba7ebac86eaf18 (diff)
downloadrails-dea486d00ed8b9beec767324dfd15bec72d8a1ca.tar.gz
rails-dea486d00ed8b9beec767324dfd15bec72d8a1ca.tar.bz2
rails-dea486d00ed8b9beec767324dfd15bec72d8a1ca.zip
Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_separator
ensure u2029 is escaped in escape_javascript helper
Diffstat (limited to 'actionpack/test/template')
-rw-r--r--actionpack/test/template/javascript_helper_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index 9441bd6b38..64898f7ad1 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -28,6 +28,8 @@ class JavaScriptHelperTest < ActionView::TestCase
assert_equal %(backslash\\\\test), escape_javascript( %(backslash\\test) )
assert_equal %(dont <\\/close> tags), escape_javascript(%(dont </close> tags))
assert_equal %(unicode &#x2028; newline), escape_javascript(%(unicode \342\200\250 newline).force_encoding('UTF-8').encode!)
+ assert_equal %(unicode &#x2029; newline), escape_javascript(%(unicode \342\200\251 newline).force_encoding('UTF-8').encode!)
+
assert_equal %(dont <\\/close> tags), j(%(dont </close> tags))
end