aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-09-25 04:03:13 -0700
committerJosé Valim <jose.valim@gmail.com>2011-09-25 04:03:13 -0700
commit933ba0cf6e20a5fac72ece21e5b51fbe485b3d90 (patch)
treea2ea6a2a140285da809ad9815c6f47df8649b98e /actionpack/test/template
parentef4d1cebbc0cb4db59cdfca16d74bbf0f68a58f1 (diff)
parent5ffa69793fd3e1d4af41ebc719a6736163eb7433 (diff)
downloadrails-933ba0cf6e20a5fac72ece21e5b51fbe485b3d90.tar.gz
rails-933ba0cf6e20a5fac72ece21e5b51fbe485b3d90.tar.bz2
rails-933ba0cf6e20a5fac72ece21e5b51fbe485b3d90.zip
Merge pull request #3124 from avakhov/patch-6-stylesheet-link
escape options for the stylesheet_link_tag method
Diffstat (limited to 'actionpack/test/template')
-rw-r--r--actionpack/test/template/asset_tag_helper_test.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index d93433deac..aa7304b3ed 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -366,6 +366,10 @@ class AssetTagHelperTest < ActionView::TestCase
assert stylesheet_link_tag('dir/other/file', 'dir/file2').html_safe?
end
+ def test_stylesheet_link_tag_escapes_options
+ assert_dom_equal %(<link href="/file.css" media="&lt;script&gt;" rel="stylesheet" type="text/css" />), stylesheet_link_tag('/file', :media => '<script>')
+ end
+
def test_custom_stylesheet_expansions
ENV["RAILS_ASSET_ID"] = ''
ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :robbery => ["bank", "robber"]