diff options
author | rohit <rohit.arondekar@gmail.com> | 2010-06-12 18:35:49 +0530 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-06-12 15:34:05 +0200 |
commit | 7508c0e9d3b126da1a443272550b80c6744e6f39 (patch) | |
tree | 5c6fdb0bf2c241d2a7059ce3a27c7438a2b628ee /actionpack/test | |
parent | 30eaecb3df707ec45859ab1cddb122f811c043a1 (diff) | |
download | rails-7508c0e9d3b126da1a443272550b80c6744e6f39.tar.gz rails-7508c0e9d3b126da1a443272550b80c6744e6f39.tar.bz2 rails-7508c0e9d3b126da1a443272550b80c6744e6f39.zip |
Change sanitize to escape in test names of text_helper_test [#4844 state:resolved]
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/template/text_helper_test.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb index 108cf510ff..b0a4c2a9cc 100644 --- a/actionpack/test/template/text_helper_test.rb +++ b/actionpack/test/template/text_helper_test.rb @@ -40,15 +40,15 @@ class TextHelperTest < ActionView::TestCase assert simple_format("<b> test with html tags </b>").html_safe? end - def test_simple_format_should_sanitize_unsafe_input + def test_simple_format_should_escape_unsafe_input assert_equal "<p><b> test with unsafe string </b><script>code!</script></p>", simple_format("<b> test with unsafe string </b><script>code!</script>") end - def test_simple_format_should_not_sanitize_input_if_safe_option + def test_simple_format_should_not_escape_input_if_safe_option assert_equal "<p><b> test with unsafe string </b><script>code!</script></p>", simple_format("<b> test with unsafe string </b><script>code!</script>", {}, :safe => true) end - def test_simple_format_should_not_sanitize_safe_input + def test_simple_format_should_not_escape_safe_input assert_equal "<p><b> test with safe string </b></p>", simple_format("<b> test with safe string </b>".html_safe) end @@ -61,16 +61,16 @@ class TextHelperTest < ActionView::TestCase assert_equal "Hello Wor...", truncate("Hello World!!", :length => 12) end - def test_truncate_should_sanitize_unsafe_input + def test_truncate_should_escape_unsafe_input assert_equal "Hello <...", truncate("Hello <script>code!</script>World!!", :length => 12) end - def test_truncate_should_not_sanitize_input_if_safe_option + def test_truncate_should_not_escape_input_if_safe_option assert_equal "Hello <sc...", truncate("Hello <script>code!</script>World!", :length => 12, :safe => true) assert_equal "Hello <sc...", truncate("Hello <script>code!</script>World!!", :length => 12, :safe => true) end - def test_truncate_should_not_sanitize_safe_input + def test_truncate_should_not_escape_safe_input assert_equal "Hello <sc...", truncate("Hello <script>code!</script>World!".html_safe, :length => 12) assert_equal "Hello <sc...", truncate("Hello <script>code!</script>World!!".html_safe, :length => 12) end @@ -138,21 +138,21 @@ class TextHelperTest < ActionView::TestCase assert_equal ' ', highlight(' ', 'blank text is returned verbatim') end - def test_highlight_should_sanitize_unsafe_input + def test_highlight_should_escape_unsafe_input assert_equal( "This is a <strong class=\"highlight\">beautiful</strong> morning<script>code!</script>", highlight("This is a beautiful morning<script>code!</script>", "beautiful") ) end - def test_highlight_should_not_sanitize_input_if_safe_option + def test_highlight_should_not_escape_input_if_safe_option assert_equal( "This is a <strong class=\"highlight\">beautiful</strong> morning<script>code!</script>", highlight("This is a beautiful morning<script>code!</script>", "beautiful", :safe => true) ) end - def test_highlight_should_not_sanitize_safe_input + def test_highlight_should_not_escape_safe_input assert_equal( "This is a <strong class=\"highlight\">beautiful</strong> morning<script>code!</script>", highlight("This is a beautiful morning<script>code!</script>".html_safe, "beautiful") |