diff options
| author | José Valim <jose.valim@gmail.com> | 2011-06-08 08:08:59 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-06-08 08:08:59 -0700 |
| commit | 8bc4771291d899614143550ecff4815542e92442 (patch) | |
| tree | 6b6656d194ed1faa386757f75b363ec8942e6bf9 /actionpack/test | |
| parent | b937c76f0dede1d15795503e5500748655fd0123 (diff) | |
| parent | bf2f039a93d1b5bacffcda14e2c58f39dfcf7fd4 (diff) | |
| download | rails-8bc4771291d899614143550ecff4815542e92442.tar.gz rails-8bc4771291d899614143550ecff4815542e92442.tar.bz2 rails-8bc4771291d899614143550ecff4815542e92442.zip | |
Merge pull request #1560 from sikachu/master-escapejs
Make escape_javascript happy to handle SafeBuffers
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/template/javascript_helper_test.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb index 538e0e9874..15bd6b4c47 100644 --- a/actionpack/test/template/javascript_helper_test.rb +++ b/actionpack/test/template/javascript_helper_test.rb @@ -30,6 +30,13 @@ class JavaScriptHelperTest < ActionView::TestCase assert_equal %(dont <\\/close> tags), j(%(dont </close> tags)) end + def test_escape_javascript_with_safebuffer + given = %('quoted' "double-quoted" new-line:\n </closed>) + expect = %(\\'quoted\\' \\"double-quoted\\" new-line:\\n <\\/closed>) + assert_equal expect, escape_javascript(given) + assert_equal expect, escape_javascript(ActiveSupport::SafeBuffer.new(given)) + end + def test_button_to_function assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />), button_to_function("Greeting", "alert('Hello world!')") |