aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/core_ext
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-07 23:45:15 +0200
committerJosé Valim <jose.valim@gmail.com>2011-05-07 23:45:15 +0200
commit0ef978d1d2fc44134ccda2a21ec6f1984fb0b699 (patch)
tree9513a79b8c2915cf0e7995c62259da1a53643f5c /activesupport/test/core_ext
parent0a1ba4eab0c442f3e9f4027e4b5d3418f8eb6ca4 (diff)
downloadrails-0ef978d1d2fc44134ccda2a21ec6f1984fb0b699.tar.gz
rails-0ef978d1d2fc44134ccda2a21ec6f1984fb0b699.tar.bz2
rails-0ef978d1d2fc44134ccda2a21ec6f1984fb0b699.zip
Revert "Merge pull request #275 from pk-amooma/master"
Several AP tests fail after this change. This reverts commit aaf01cd53718c8aa5b69ac056b997e6dd9893777, reversing changes made to 9cc18c52faeebaad6a76bd62cdca1c6b9f96afed.
Diffstat (limited to 'activesupport/test/core_ext')
-rw-r--r--activesupport/test/core_ext/string_ext_test.rb12
1 files changed, 0 insertions, 12 deletions
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index 54ef68c59b..32675c884a 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -387,18 +387,6 @@ class OutputSafetyTest < ActiveSupport::TestCase
assert !@other_combination.html_safe?
end
- test "Escapes special HTML/XML characters" do
- @other_string = "other".html_safe
- @combination = @other_string + "<foo>&\"'"
- @other_combination = @string + "<foo>&\"'"
-
- assert_equal "other&lt;foo&gt;&amp;&quot;&apos;", @combination
- assert_equal "hello<foo>&\"'", @other_combination
-
- assert @combination.html_safe?
- assert !@other_combination.html_safe?
- end
-
test "Concatting safe onto unsafe yields unsafe" do
@other_string = "other"