Fix failing tests related to favicon in themes after r22692 (#39111).

git-svn-id: https://svn.redmine.org/redmine/trunk@22705 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4054d3274d9f3693f243d8e3fbd28ebeffd7d222..8be8c699f0d5b9bd62516bc0a6828041baaef4ae 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -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

diff --git a/test/integration/lib/redmine/themes_test.rb b/test/integration/lib/redmine/themes_test.rb
index d058df830888c2de32ef06b33b5aae0cd38d6ad7..cabe52f3425e429380646bb8cf8bd7d71b10ca2b 100644 (file)
--- a/test/integration/lib/redmine/themes_test.rb
+++ b/test/integration/lib/redmine/themes_test.rb
@@ -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