diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-08-25 21:57:41 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-08-25 21:57:41 +0000 |
| commit | e03617881e5f4c1240b9d494df975968da4a9478 (patch) | |
| tree | 3bce4d756b838aa4edda10bab59bd7f6eca547f2 /test/integration/lib | |
| parent | 331dcfbadc7eb827d0c62575aa0ea840fde70a33 (diff) | |
| download | redmine-e03617881e5f4c1240b9d494df975968da4a9478.tar.gz redmine-e03617881e5f4c1240b9d494df975968da4a9478.zip | |
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
Diffstat (limited to 'test/integration/lib')
| -rw-r--r-- | test/integration/lib/redmine/themes_test.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/integration/lib/redmine/themes_test.rb b/test/integration/lib/redmine/themes_test.rb index 53b30d206..38d3970f3 100644 --- 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 |