diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-22 01:13:14 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-22 01:13:14 -0500 |
| commit | 99613f01d30f4ab8d4328cd669147e9cb2b8442f (patch) | |
| tree | 55fb982289c23e8dab1adb04d7b673319bf8f1b5 /actionview/test | |
| parent | 0303d3a4bdf9090edd0167e22106fb105bd93cd8 (diff) | |
| parent | c8b7ad1cc5f67b114d1b491dff4bd661b88df81d (diff) | |
| download | rails-99613f01d30f4ab8d4328cd669147e9cb2b8442f.tar.gz rails-99613f01d30f4ab8d4328cd669147e9cb2b8442f.tar.bz2 rails-99613f01d30f4ab8d4328cd669147e9cb2b8442f.zip | |
Merge pull request #13335 from glorieux/favicon_link_tag_mimetype
Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon.
Diffstat (limited to 'actionview/test')
| -rw-r--r-- | actionview/test/template/asset_tag_helper_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionview/test/template/asset_tag_helper_test.rb b/actionview/test/template/asset_tag_helper_test.rb index 3ca71d3376..651978ed80 100644 --- a/actionview/test/template/asset_tag_helper_test.rb +++ b/actionview/test/template/asset_tag_helper_test.rb @@ -195,9 +195,9 @@ class AssetTagHelperTest < ActionView::TestCase } FaviconLinkToTag = { - %(favicon_link_tag) => %(<link href="/images/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />), - %(favicon_link_tag 'favicon.ico') => %(<link href="/images/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />), - %(favicon_link_tag 'favicon.ico', :rel => 'foo') => %(<link href="/images/favicon.ico" rel="foo" type="image/vnd.microsoft.icon" />), + %(favicon_link_tag) => %(<link href="/images/favicon.ico" rel="shortcut icon" type="image/x-icon" />), + %(favicon_link_tag 'favicon.ico') => %(<link href="/images/favicon.ico" rel="shortcut icon" type="image/x-icon" />), + %(favicon_link_tag 'favicon.ico', :rel => 'foo') => %(<link href="/images/favicon.ico" rel="foo" type="image/x-icon" />), %(favicon_link_tag 'favicon.ico', :rel => 'foo', :type => 'bar') => %(<link href="/images/favicon.ico" rel="foo" type="bar" />), %(favicon_link_tag 'mb-icon.png', :rel => 'apple-touch-icon', :type => 'image/png') => %(<link href="/images/mb-icon.png" rel="apple-touch-icon" type="image/png" />) } |