diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-09-09 06:57:28 -0700 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-09-09 06:57:28 -0700 |
commit | be8685d9227faf5d3691346e2cc0c4f14d833c53 (patch) | |
tree | fe514834646b3de4be78990f797a53d120101cec /actionpack/test/template/text_helper_test.rb | |
parent | cfbd73c9eaa196a65c90a98a410a18c3c444bc63 (diff) | |
parent | 6b2a24c3bd7ed75326dec50decf6018b3685f113 (diff) | |
download | rails-be8685d9227faf5d3691346e2cc0c4f14d833c53.tar.gz rails-be8685d9227faf5d3691346e2cc0c4f14d833c53.tar.bz2 rails-be8685d9227faf5d3691346e2cc0c4f14d833c53.zip |
Merge pull request #7513 from kalys/master
ERB::Util.html_escape encodes single quote as #39. Decimal form has better support in old browsers.
Diffstat (limited to 'actionpack/test/template/text_helper_test.rb')
-rw-r--r-- | actionpack/test/template/text_helper_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb index 4525efe73c..412d13bb2b 100644 --- a/actionpack/test/template/text_helper_test.rb +++ b/actionpack/test/template/text_helper_test.rb @@ -149,7 +149,7 @@ class TextHelperTest < ActionView::TestCase end def test_truncate_with_block_should_escape_the_block - assert_equal "Here is a long test and ...<script>alert('foo');</script>", + assert_equal "Here is a long test and ...<script>alert('foo');</script>", truncate("Here is a long test and I need a continue to read link", :length => 27) { "<script>alert('foo');</script>" } end |