aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-08-21 18:42:17 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-08-21 18:42:17 -0700
commitaae5ebf3eb7d17e668bb05f9c859e239f31b9f50 (patch)
treeb30b5ce03d8f3c5b94fc323b4d65a87f1b889512 /actionpack/test
parent35c8a896fc75c222834e1324fe4710c1ba2645c4 (diff)
parentf6ceb944eaea525362db38aa990cac3e6f76ac5a (diff)
downloadrails-aae5ebf3eb7d17e668bb05f9c859e239f31b9f50.tar.gz
rails-aae5ebf3eb7d17e668bb05f9c859e239f31b9f50.tar.bz2
rails-aae5ebf3eb7d17e668bb05f9c859e239f31b9f50.zip
Merge pull request #2618 from FLOChip/unicode_j
fix escape_javascript for unicode character \u2028.
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/template/javascript_helper_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index dd8b7b7cd5..bab9d42472 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -27,6 +27,7 @@ class JavaScriptHelperTest < ActionView::TestCase
assert_equal %(This \\"thing\\" is really\\n netos\\'), escape_javascript(%(This "thing" is really\n netos'))
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))
assert_equal %(dont <\\/close> tags), j(%(dont </close> tags))
end