From 702f5ce28bc469876080785f61c11f609d0e6c27 Mon Sep 17 00:00:00 2001 From: Mischa The Evil Date: Wed, 27 Jan 2021 08:52:14 +0100 Subject: [PATCH 5/5] Changed wiki :start_page name to I18n'ed :field_start_page within EnabledModule#module_enabled. This prevents a default 'projectid/wiki/Wiki' URL for the project wiki start page. The test assertion is updated to reflect this change and the containing test is adjusted to handle the i18n'ed text. Code formatting is adjusted whenever code was touched anyways. --- app/models/enabled_module.rb | 3 ++- test/unit/enabled_module_test.rb | 18 +++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/models/enabled_module.rb b/app/models/enabled_module.rb index 4aee2d53c..4719fd308 100644 --- a/app/models/enabled_module.rb +++ b/app/models/enabled_module.rb @@ -34,7 +34,8 @@ class EnabledModule < ActiveRecord::Base when 'wiki' # Create a wiki with a default start page if project && project.wiki.nil? - Wiki.create(:project => project, :start_page => 'Wiki') + Wiki.create(:project => project, + :start_page => ll(Setting.default_language, :field_start_page)) end end end diff --git a/test/unit/enabled_module_test.rb b/test/unit/enabled_module_test.rb index ed1fbff68..559781537 100644 --- a/test/unit/enabled_module_test.rb +++ b/test/unit/enabled_module_test.rb @@ -27,13 +27,17 @@ class EnabledModuleTest < ActiveSupport::TestCase end def test_enabling_wiki_should_create_a_wiki - CustomField.delete_all - project = Project.create!(:name => 'Project with wiki', :identifier => 'wikiproject', :enabled_module_names => []) - assert_nil project.wiki - project.enabled_module_names = ['wiki'] - project.reload - assert_not_nil project.wiki - assert_equal 'Wiki', project.wiki.start_page + with_settings :default_language => 'en' do + CustomField.delete_all + project = Project.create!(:name => 'Project with wiki', + :identifier => 'wikiproject', + :enabled_module_names => []) + assert_nil project.wiki + project.enabled_module_names = ['wiki'] + project.reload + assert_not_nil project.wiki + assert_equal 'Start page', project.wiki.start_page + end end def test_reenabling_wiki_should_not_create_another_wiki -- 2.26.0.windows.1