diff options
author | Xavier Noria <fxn@hashref.com> | 2010-06-30 00:12:48 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-06-30 00:32:26 +0200 |
commit | ec3bfa2ead7337fe99ff036d4b8b5ae0a321f8cd (patch) | |
tree | 279fc483dc43b82d1c29b9f49263dc686d821bca /actionpack/test | |
parent | cba1460a2fe2bbe1153620582a66e03cec9ba7a5 (diff) | |
download | rails-ec3bfa2ead7337fe99ff036d4b8b5ae0a321f8cd.tar.gz rails-ec3bfa2ead7337fe99ff036d4b8b5ae0a321f8cd.tar.bz2 rails-ec3bfa2ead7337fe99ff036d4b8b5ae0a321f8cd.zip |
s/escape_once/html_escape/, since html safety is the contract that now says whether something has to be escaped
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/template/tag_helper_test.rb | 4 | ||||
-rw-r--r-- | actionpack/test/template/url_helper_test.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/template/tag_helper_test.rb b/actionpack/test/template/tag_helper_test.rb index ec5fe3d1d7..507cdca8d0 100644 --- a/actionpack/test/template/tag_helper_test.rb +++ b/actionpack/test/template/tag_helper_test.rb @@ -95,9 +95,9 @@ class TagHelperTest < ActionView::TestCase assert_equal '1 < 2 & 3', escape_once('1 < 2 & 3') end - def test_double_escaping_attributes + def test_tag_honors_html_safe_for_param_values ['1&2', '1 < 2', '“test“'].each do |escaped| - assert_equal %(<a href="#{escaped}" />), tag('a', :href => escaped) + assert_equal %(<a href="#{escaped}" />), tag('a', :href => escaped.html_safe) end end diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb index 035f501f03..befb55fb48 100644 --- a/actionpack/test/template/url_helper_test.rb +++ b/actionpack/test/template/url_helper_test.rb @@ -65,8 +65,8 @@ class UrlHelperTest < ActiveSupport::TestCase assert_dom_equal "<form method=\"post\" action=\"http://www.example.com/q1=v1&q2=v2\" class=\"button_to\"><div><input type=\"submit\" value=\"Hello\" /></div></form>", button_to("Hello", "http://www.example.com/q1=v1&q2=v2") end - def test_button_to_with_escaped_query - assert_dom_equal "<form method=\"post\" action=\"http://www.example.com/q1=v1&q2=v2\" class=\"button_to\"><div><input type=\"submit\" value=\"Hello\" /></div></form>", button_to("Hello", "http://www.example.com/q1=v1&q2=v2") + def test_button_to_with_html_safe_URL + assert_dom_equal "<form method=\"post\" action=\"http://www.example.com/q1=v1&q2=v2\" class=\"button_to\"><div><input type=\"submit\" value=\"Hello\" /></div></form>", button_to("Hello", "http://www.example.com/q1=v1&q2=v2".html_safe) end def test_button_to_with_query_and_no_name |