diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-01-20 02:10:42 -0500 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-01-20 02:10:42 -0500 |
| commit | 6226f8f0662f66c8189f7e628dc42ca59d8f980a (patch) | |
| tree | cfb209468ae10921ecdf3fbdd9a5e437903e9a17 /actionview/test/template/output_safety_helper_test.rb | |
| parent | 715cbd3fdcade7c4fdae944c4a448252317faff9 (diff) | |
| parent | b387d9a14aeecc372f49544d927b2f24d5a39d49 (diff) | |
| download | rails-6226f8f0662f66c8189f7e628dc42ca59d8f980a.tar.gz rails-6226f8f0662f66c8189f7e628dc42ca59d8f980a.tar.bz2 rails-6226f8f0662f66c8189f7e628dc42ca59d8f980a.zip | |
Merge pull request #23130 from vipulnsward/html_safe_to_raw
Changed html_safe to raw in AV
Diffstat (limited to 'actionview/test/template/output_safety_helper_test.rb')
| -rw-r--r-- | actionview/test/template/output_safety_helper_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/test/template/output_safety_helper_test.rb b/actionview/test/template/output_safety_helper_test.rb index a1bf0e1a5f..8de0ae2f6f 100644 --- a/actionview/test/template/output_safety_helper_test.rb +++ b/actionview/test/template/output_safety_helper_test.rb @@ -18,10 +18,10 @@ class OutputSafetyHelperTest < ActionView::TestCase end test "safe_join should html_escape any items, including the separator, if they are not html_safe" do - joined = safe_join(["<p>foo</p>".html_safe, "<p>bar</p>"], "<br />") + joined = safe_join([raw("<p>foo</p>"), "<p>bar</p>"], "<br />") assert_equal "<p>foo</p><br /><p>bar</p>", joined - joined = safe_join(["<p>foo</p>".html_safe, "<p>bar</p>".html_safe], "<br />".html_safe) + joined = safe_join([raw("<p>foo</p>"), raw("<p>bar</p>")], raw("<br />")) assert_equal "<p>foo</p><br /><p>bar</p>", joined end |