ThemesTest may fail if a third-party theme with a favicon is installed (#31941).

Patch by Go MAEDA.

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

diff --git a/test/integration/lib/redmine/themes_test.rb b/test/integration/lib/redmine/themes_test.rb
index 53b30d20603f517bdf971a89b407604746a4e0a8..38d3970f3bb6ffccba6623fce07291a0cf744798 100644 (file)
--- a/test/integration/lib/redmine/themes_test.rb
+++ b/test/integration/lib/redmine/themes_test.rb
@@ -59,6 +59,7 @@ class ThemesTest < Redmine::IntegrationTest
   end
 
   def test_use_default_favicon_if_theme_provides_none
+    @theme.favicons.clear
     get '/'
 
     assert_response :success
@@ -67,7 +68,7 @@ class ThemesTest < Redmine::IntegrationTest
 
   def test_use_theme_favicon_if_theme_provides_one
     # Simulate a theme favicon
-    @theme.favicons << 'a.ico'
+    @theme.favicons.unshift('a.ico')
     get '/'
 
     assert_response :success
@@ -77,7 +78,7 @@ class ThemesTest < Redmine::IntegrationTest
   end
 
   def test_use_only_one_theme_favicon_if_theme_provides_many
-    @theme.favicons.concat %w{b.ico a.png}
+    @theme.favicons.unshift('b.ico', 'a.png')
     get '/'
 
     assert_response :success
@@ -90,8 +91,8 @@ class ThemesTest < Redmine::IntegrationTest
 
   def test_with_sub_uri
     Redmine::Utils.relative_url_root = '/foo'
-    @theme.javascripts << 'theme'
-    @theme.favicons << 'a.ico'
+    @theme.javascripts.unshift('theme')
+    @theme.favicons.unshift('a.ico')
     get '/'
 
     assert_response :success