diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 88d70a53a..483c92e44 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -2352,7 +2352,7 @@ class IssuesControllerTest < Redmine::ControllerTest assert_select 'div.attachments a.icon-attachment[href=?]', '/attachments/4' assert_select 'div.attachments span.attachment-journal a', 1 assert_select 'div.attachments span.attachment-journal a[href=?][title=?]', '#note-1', '#note-1' do - assert_select "svg.icon-svg use:match('href', ?)", /assets\/icons-\w+.svg#icon--chevrons-down/ + assert_select "svg.icon-svg use:match('href', ?)", %r{assets/icons-[0-9a-f]+.svg#icon--chevrons-down} end end @@ -2379,10 +2379,10 @@ class IssuesControllerTest < Redmine::ControllerTest assert_response :success assert_select 'div.attachments' do assert_select 'a.icon-attachment[href=?]', '/attachments/1' do - assert_select "svg.icon-svg use:match('href', ?)", /assets\/icons-\w+.svg#icon--text-plain/ + assert_select "svg.icon-svg use:match('href', ?)", %r{assets/icons-[0-9a-f]+.svg#icon--text-plain} end assert_select 'a.icon-attachment[href=?]', '/attachments/6' do - assert_select "svg.icon-svg use:match('href', ?)", /assets\/icons-\w+.svg#icon--application-zip/ + assert_select "svg.icon-svg use:match('href', ?)", %r{assets/icons-[0-9a-f]+.svg#icon--application-zip} end end end @@ -6462,7 +6462,7 @@ class IssuesControllerTest < Redmine::ControllerTest assert_response :success reason = l(:notice_issue_not_closable_by_blocking_issue) assert_select 'span.icon-warning[title=?]', reason do - assert_select "svg.icon-svg use:match('href', ?)", /assets\/icons-\w+.svg#icon--warning/ + assert_select "svg.icon-svg use:match('href', ?)", %r{assets/icons-[0-9a-f]+.svg#icon--warning} assert_select 'span.icon-label', test: reason end end diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb index 7c8a5e2dc..b317b0d23 100644 --- a/test/integration/layout_test.rb +++ b/test/integration/layout_test.rb @@ -58,7 +58,7 @@ class LayoutTest < Redmine::IntegrationTest get '/projects/ecookbook/issues/new' assert_select "head script:match('src',?)", %r{/assets/jstoolbar/}, 0 - assert_select "head link[rel=stylesheet]:match('href',?)", %r{/assets/jstoolbar-\w+.css} + assert_select "head link[rel=stylesheet]:match('href',?)", %r{/assets/jstoolbar-[0-9a-f]+.css} assert_include "var wikiImageMimeTypes = #{Redmine::MimeType.by_type('image').to_json};", response.body assert_select 'div.jstBlock:has(textarea#issue_description)' do UserPreference::DEFAULT_TOOLBAR_LANGUAGE_OPTIONS.each do |lang| diff --git a/test/integration/lib/redmine/themes_test.rb b/test/integration/lib/redmine/themes_test.rb index 7fe7d3192..9f75f786e 100644 --- a/test/integration/lib/redmine/themes_test.rb +++ b/test/integration/lib/redmine/themes_test.rb @@ -34,7 +34,7 @@ class ThemesTest < Redmine::IntegrationTest get '/' assert_response :success - assert_select "link[rel=stylesheet]:match('href', ?)", %r{/assets/themes/#{@theme.dir}/application-\w+\.css} + assert_select "link[rel=stylesheet]:match('href', ?)", %r{/assets/themes/#{@theme.dir}/application-[0-9a-f]+.css} end def test_without_theme_js @@ -62,7 +62,7 @@ class ThemesTest < Redmine::IntegrationTest get '/' assert_response :success - assert_select "link[rel='shortcut icon']:match('href',?)", %r{/assets/favicon-\w+\.ico} + assert_select "link[rel='shortcut icon']:match('href',?)", %r{/assets/favicon-[0-9a-f]+.ico} end def test_use_theme_favicon_if_theme_provides_one @@ -108,7 +108,7 @@ class ThemesTest < Redmine::IntegrationTest get '/' assert_response :success - assert_select "link[rel=stylesheet]:match('href', ?)", %r{/foo/assets/themes/#{@theme.dir}/application-\w+\.css} + assert_select "link[rel=stylesheet]:match('href', ?)", %r{/foo/assets/themes/#{@theme.dir}/application-[0-9a-f]+.css} assert_select "script[src^=?]", "/foo/assets/themes/#{@theme.dir}/theme.js" assert_select 'link[rel="shortcut icon"][href^=?]', "/foo/assets/themes/#{@theme.dir}/a.ico" ensure