diff options
author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-04 05:35:40 -0800 |
---|---|---|
committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-04 05:35:40 -0800 |
commit | f402cc5c657b8e6022c3d705eecc4f538647a388 (patch) | |
tree | b426865beb22613fc6b86d53c6a484580335ff5e /actionview | |
parent | c294055a58d125ff719ae17f03015c71790f0df0 (diff) | |
parent | a156562762e795c2e5382570c1fc30c11cfa9a24 (diff) | |
download | rails-f402cc5c657b8e6022c3d705eecc4f538647a388.tar.gz rails-f402cc5c657b8e6022c3d705eecc4f538647a388.tar.bz2 rails-f402cc5c657b8e6022c3d705eecc4f538647a388.zip |
Merge pull request #13152 from mariovisic/text_helper_missing_raw_method
TextHelper#simple_format attempts to call undefined raw method
Diffstat (limited to 'actionview')
-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) |