git-svn-id: https://svn.redmine.org/redmine/trunk@22705 e93f8b46-1217-0410-a6f0-8f06a7374b81pull/149/head
@@ -1749,7 +1749,7 @@ module ApplicationHelper | |||
end | |||
def favicon | |||
favicon_link_tag(favicon_path, rel: "icon shortcut") | |||
favicon_link_tag(favicon_path, rel: "shortcut icon") | |||
end | |||
# Returns the path to the favicon |
@@ -63,7 +63,7 @@ class ThemesTest < Redmine::IntegrationTest | |||
get '/' | |||
assert_response :success | |||
assert_select 'link[rel="shortcut icon"][href^="/favicon.ico"]' | |||
assert_select "link[rel='shortcut icon']:match('href',?)", %r{/assets/favicon-\w+\.ico} | |||
end | |||
def test_use_theme_favicon_if_theme_provides_one |