diff options
| author | Mario Visic <mario@mariovisic.com> | 2013-12-04 13:50:17 +1100 |
|---|---|---|
| committer | Mario Visic <mario@mariovisic.com> | 2013-12-05 00:21:55 +1100 |
| commit | a156562762e795c2e5382570c1fc30c11cfa9a24 (patch) | |
| tree | 5b809c4a7c58d50dc30ae4d8a8d2f54f53f6d8b9 | |
| parent | d261c5cc28d35ae3d493c42edd20d362b61556dc (diff) | |
| download | rails-a156562762e795c2e5382570c1fc30c11cfa9a24.tar.gz rails-a156562762e795c2e5382570c1fc30c11cfa9a24.tar.bz2 rails-a156562762e795c2e5382570c1fc30c11cfa9a24.zip | |
Fix issue where TextHelper#simple_format was calling missing 'raw' method
| -rw-r--r-- | actionview/lib/action_view/helpers/text_helper.rb | 2 | ||||
| -rw-r--r-- | actionview/test/template/text_helper_test.rb | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/actionview/lib/action_view/helpers/text_helper.rb b/actionview/lib/action_view/helpers/text_helper.rb index e75c6cabc9..3478eadbf2 100644 --- a/actionview/lib/action_view/helpers/text_helper.rb +++ b/actionview/lib/action_view/helpers/text_helper.rb @@ -31,6 +31,8 @@ module ActionView include SanitizeHelper include TagHelper + include OutputSafetyHelper + # The preferred method of outputting text in your views is to use the # <%= "text" %> eRuby syntax. The regular _puts_ and _print_ methods # do not operate as expected in an eRuby code block. If you absolutely must diff --git a/actionview/test/template/text_helper_test.rb b/actionview/test/template/text_helper_test.rb index dd1a92acfb..5b3bccf951 100644 --- a/actionview/test/template/text_helper_test.rb +++ b/actionview/test/template/text_helper_test.rb @@ -21,6 +21,11 @@ class TextHelperTest < ActionView::TestCase assert simple_format("<b> test with html tags </b>").html_safe? end + def test_simple_format_included_in_isolation + helper_klass = Class.new { include ActionView::Helpers::TextHelper } + assert helper_klass.new.simple_format("<b> test with html tags </b>").html_safe? + end + def test_simple_format assert_equal "<p></p>", simple_format(nil) |