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

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

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 2642688d6c5b367452e602df7255f42595d44157..03edf922cf0a07dc25374696ba9db9941b5f1e02 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -2118,23 +2118,23 @@ class ApplicationHelperTest < Redmine::HelperTest
   end
 
   def test_favicon_path
-    assert_match %r{^/favicon\.ico}, favicon_path
+    assert_match %r{^/assets/favicon-\w+\.ico}, favicon_path
   end
 
   def test_favicon_path_with_suburi
     Redmine::Utils.relative_url_root = '/foo'
-    assert_match %r{^/foo/favicon\.ico}, favicon_path
+    assert_match %r{^/foo/assets/favicon-\w+\.ico}, favicon_path
   ensure
     Redmine::Utils.relative_url_root = ''
   end
 
   def test_favicon_url
-    assert_match %r{^http://test\.host/favicon\.ico}, favicon_url
+    assert_match %r{^http://test\.host/assets/favicon-\w+\.ico}, favicon_url
   end
 
   def test_favicon_url_with_suburi
     Redmine::Utils.relative_url_root = '/foo'
-    assert_match %r{^http://test\.host/foo/favicon\.ico}, favicon_url
+    assert_match %r{^http://test\.host/foo/assets/favicon-\w+\.ico}, favicon_url
   ensure
     Redmine::Utils.relative_url_root = ''
   end