From 437e46aa45c2eebc9a0527c479574ae8403f070a Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Tue, 13 Feb 2024 22:14:34 +0000 Subject: [PATCH] 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 --- app/helpers/application_helper.rb | 2 +- test/integration/lib/redmine/themes_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4054d3274..8be8c699f 100644 --- 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 d058df830..cabe52f34 100644 --- 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