aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template/template_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-12-03 10:30:58 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-12-03 10:31:18 -0700
commit2797757919e95177c42d70c178e16c88828b674a (patch)
tree53ebbc0d628ae0697f27ff66c2d7df542d07b309 /actionpack/test/template/template_test.rb
parentd7fdcc87171ca0098522c05f844b3ec24a14b0b7 (diff)
downloadrails-2797757919e95177c42d70c178e16c88828b674a.tar.gz
rails-2797757919e95177c42d70c178e16c88828b674a.tar.bz2
rails-2797757919e95177c42d70c178e16c88828b674a.zip
Override <%== to always behave as literal text rather than toggling based on whether escaping is enabled. Fixes that existing plaintext email templates using <%== unexpectedly flipped to *escaping* HTML when #8235 was merged.
Diffstat (limited to 'actionpack/test/template/template_test.rb')
-rw-r--r--actionpack/test/template/template_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index ed9d303158..8d32205fb8 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -82,8 +82,8 @@ class TestERBTemplate < ActiveSupport::TestCase
end
def test_text_template_does_not_html_escape
- @template = new_template("<%= apostrophe %>", format: :text)
- assert_equal "l'apostrophe", render
+ @template = new_template("<%= apostrophe %> <%== apostrophe %>", format: :text)
+ assert_equal "l'apostrophe l'apostrophe", render
end
def test_raw_template