aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template/erb_util_test.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2010-02-01 23:42:38 +0000
committerPratik Naik <pratiknaik@gmail.com>2010-02-01 23:42:38 +0000
commitfdcf4d6c5191b25ee3b6c357dafaf17156eb09d3 (patch)
tree347f771202054a443f9df23a8f65f91d49a52209 /actionpack/test/template/erb_util_test.rb
parent27fa38cc3e162b2f8c4bb2d50130fbc17bad6039 (diff)
parent16c0d1d3b6089bb4b0b0baf7c3eeb5949f31f02b (diff)
downloadrails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.tar.gz
rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.tar.bz2
rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.zip
Merge remote branch 'mainstream/master'
Diffstat (limited to 'actionpack/test/template/erb_util_test.rb')
-rw-r--r--actionpack/test/template/erb_util_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/template/erb_util_test.rb b/actionpack/test/template/erb_util_test.rb
index fa6b263965..06155b1f30 100644
--- a/actionpack/test/template/erb_util_test.rb
+++ b/actionpack/test/template/erb_util_test.rb
@@ -22,7 +22,7 @@ class ErbUtilTest < Test::Unit::TestCase
end
def test_html_escape_passes_html_escpe_unmodified
- escaped = h("<p>".html_safe!)
+ escaped = h("<p>".html_safe)
assert_equal "<p>", escaped
assert escaped.html_safe?
end