diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2013-02-21 15:34:02 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2013-02-21 15:34:02 -0200 |
| commit | 389397952460d09218bb407be1142e0b62cf3f4f (patch) | |
| tree | 6247bebf882c76388d6a654cc3cb74629bf11d40 /actionpack/test | |
| parent | c60be72c5243c21303b067c9c5cc398111cf48c8 (diff) | |
| download | rails-389397952460d09218bb407be1142e0b62cf3f4f.tar.gz rails-389397952460d09218bb407be1142e0b62cf3f4f.tar.bz2 rails-389397952460d09218bb407be1142e0b62cf3f4f.zip | |
Revert "Revert "Merge pull request #4803 from lucascaton/master""
This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/template/asset_tag_helper_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb index 185f742c7f..11614a45dc 100644 --- a/actionpack/test/template/asset_tag_helper_test.rb +++ b/actionpack/test/template/asset_tag_helper_test.rb @@ -200,7 +200,7 @@ class AssetTagHelperTest < ActionView::TestCase } FaviconLinkToTag = { - %(favicon_link_tag) => %(<link href="/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />), + %(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 'favicon.ico', :rel => 'foo', :type => 'bar') => %(<link href="/images/favicon.ico" rel="foo" type="bar" />), |