aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-08-04 11:49:43 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-08-04 11:49:43 -0700
commitd7e55c3429408cf446557d63ba9e2e555eb6d6f1 (patch)
treee3f7853da85c1ada43e5ecf18d560ba440717565 /actionpack/test/template
parentbf5b4c0055df4a02a57c53620badfcab48fc0cba (diff)
parentf0034c75d5a9bc5065652c2fedf39250a6f1847b (diff)
downloadrails-d7e55c3429408cf446557d63ba9e2e555eb6d6f1.tar.gz
rails-d7e55c3429408cf446557d63ba9e2e555eb6d6f1.tar.bz2
rails-d7e55c3429408cf446557d63ba9e2e555eb6d6f1.zip
Merge pull request #2421 from pivotal-casebook/master
Simple_format should not edit it in place. (Fixes https://github.com/rails/rails/issues/1980)
Diffstat (limited to 'actionpack/test/template')
-rw-r--r--actionpack/test/template/text_helper_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index f7c3986bb1..02f9609483 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -48,10 +48,10 @@ class TextHelperTest < ActionView::TestCase
assert_equal "<p><b> test with unsafe string </b><script>code!</script></p>", simple_format("<b> test with unsafe string </b><script>code!</script>", {}, :sanitize => false)
end
- def test_simple_format_should_not_change_the_frozen_text_passed
+ def test_simple_format_should_not_change_the_text_passed
text = "<b>Ok</b><script>code!</script>"
text_clone = text.dup
- simple_format(text.freeze)
+ simple_format(text)
assert_equal text_clone, text
end