diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-24 05:47:21 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-24 05:47:21 -0800 |
| commit | f5b9aefb574bf3cf1d3779606e54bd0a0a73d2aa (patch) | |
| tree | da7a9a4d9cd8ad05648bde5d283715d5feea4d81 /actionpack/test/template/javascript_helper_test.rb | |
| parent | a5fa310f406e299a1ac54d1a227bde93b7ce282b (diff) | |
| parent | 5ca86ac8f924b333a5a01a47cc07cbcf39c16e80 (diff) | |
| download | rails-f5b9aefb574bf3cf1d3779606e54bd0a0a73d2aa.tar.gz rails-f5b9aefb574bf3cf1d3779606e54bd0a0a73d2aa.tar.bz2 rails-f5b9aefb574bf3cf1d3779606e54bd0a0a73d2aa.zip | |
Merge pull request #4160 from lest/deprecate-encoding-aware
deprecate String#encoding_aware? and remove its usage
Diffstat (limited to 'actionpack/test/template/javascript_helper_test.rb')
| -rw-r--r-- | actionpack/test/template/javascript_helper_test.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb index 4b9c3c97b1..d98ffe8fa7 100644 --- a/actionpack/test/template/javascript_helper_test.rb +++ b/actionpack/test/template/javascript_helper_test.rb @@ -28,11 +28,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)) - if "ruby".encoding_aware? - assert_equal %(unicode 
 newline), escape_javascript(%(unicode \342\200\250 newline).force_encoding('UTF-8').encode!) - else - assert_equal %(unicode 
 newline), escape_javascript(%(unicode \342\200\250 newline)) - end + assert_equal %(unicode 
 newline), escape_javascript(%(unicode \342\200\250 newline).force_encoding('UTF-8').encode!) assert_equal %(dont <\\/close> tags), j(%(dont </close> tags)) end |