Fix test

Author: ishikawa999

test/functional/custom_message_settings_controller_test.rb

@@ -1,13 +1,13 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class CustomMessageSettingsControllerTest < defined?(Redmine::ControllerTest) ? Redmine::ControllerTest : ActionController::TestCase
-  fixtures :custom_message_settings, :users
+  fixtures :users, :email_addresses, :roles, :custom_message_settings
   include Redmine::I18n
   prepend ::RailsKwargsTesting::ControllerMethods if defined?(RailsKwargsTesting)
 
   def setup
     @request.session[:user_id] = 1 # admin
-    MessageCustomize::Locale.reload!('en')
+    MessageCustomize::Locale.reload!(['en', 'ja'])
     Rails.application.config.i18n.load_path = (Rails.application.config.i18n.load_path + Dir.glob(Rails.root.join('plugins', 'redmine_message_customize', 'config', 'locales', 'custom_messages', '*.rb'))).uniq
   end
 

test/integration/application_controller_patch_test.rb

@@ -11,34 +11,34 @@ def setup
   end
 
   def test_reload_if_messages_are_not_latest
-    User.find_by_login('admin').update(language: 'ja')
     log_user('admin', 'admin')
     custom_message_setting = CustomMessageSetting.find_or_default
 
     # 値が書き換わっただけでは用語は置き換わらない(MessageCustomize::Locale.reload!の実行が必要)
-    custom_message_setting.update_with_custom_messages({'label_home' => 'Changed home'}, 'ja')
-    assert_equal 'Home2', I18n.backend.send(:translations)[:ja][:label_home]
-    assert_equal '1640995200', I18n.backend.send(:translations)[:ja][:redmine_message_customize_timestamp]
+    custom_message_setting.update_with_custom_messages({'label_home' => 'Changed home'}, 'en')
+    assert_equal 'Home1', I18n.backend.send(:translations)[:en][:label_home]
+    assert_equal '1640995200', I18n.backend.send(:translations)[:en][:redmine_message_customize_timestamp]
 
     # ApplicationControllerのbefore_actionによって、redmine_message_customize_timestampの値を見て最新かが判断される
     # get '/issues'は最新じゃない状態でのリクエストのためMessageCustomize::Locale.reload!が実行されること
     get '/issues'
-    assert_equal 'Changed home', I18n.backend.send(:translations)[:ja][:label_home]
-    assert_equal custom_message_setting.updated_on.to_i.to_s, I18n.backend.send(:translations)[:ja][:redmine_message_customize_timestamp]
+    assert_equal 'Changed home', I18n.backend.send(:translations)[:en][:label_home]
+    assert_equal custom_message_setting.updated_on.to_i.to_s, I18n.backend.send(:translations)[:en][:redmine_message_customize_timestamp]
   end
 
   def test_reload_if_user_language_is_auto_and_default_language_messages_are_not_latest
     # User.currentのlanguageが''(auto)でもSetting.default_languageを元に用語の最新化を行うこと
     User.find_by_login('admin').update(language: '')
-    Setting.default_language = 'ja'
     log_user('admin', 'admin')
     custom_message_setting = CustomMessageSetting.find_or_default
 
     custom_message_setting.update_with_custom_messages({'label_home' => 'Changed home'}, 'ja')
     assert_equal 'Home2', I18n.backend.send(:translations)[:ja][:label_home]
     assert_equal '1640995200', I18n.backend.send(:translations)[:ja][:redmine_message_customize_timestamp]
 
-    get '/issues'
+    with_settings :default_language => 'ja' do
+      get '/issues'
+    end
     assert_equal 'Changed home', I18n.backend.send(:translations)[:ja][:label_home]
     assert_equal custom_message_setting.updated_on.to_i.to_s, I18n.backend.send(:translations)[:ja][:redmine_message_customize_timestamp]
   end

test/unit/custom_message_setting_test.rb

@@ -1,12 +1,13 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class CustomMessageSettingTest < ActiveSupport::TestCase
-  fixtures :custom_message_settings
+  fixtures :users, :email_addresses, :roles, :custom_message_settings
   include Redmine::I18n
 
   def setup
+    User.current = User.find_by(login: 'admin')
     @custom_message_setting = CustomMessageSetting.find(1)
-    MessageCustomize::Locale.reload!('en')
+    MessageCustomize::Locale.reload!(['en', 'ja'])
     Rails.application.config.i18n.load_path = (Rails.application.config.i18n.load_path + Dir.glob(Rails.root.join('plugins', 'redmine_message_customize', 'config', 'locales', 'custom_messages', '*.rb'))).uniq
   end
 

test/unit/lib/message_customize/locale_test.rb

@@ -5,7 +5,7 @@ class LocaleTest < ActiveSupport::TestCase
   include Redmine::I18n
 
     def setup
-      MessageCustomize::Locale.reload!('en')
+      MessageCustomize::Locale.reload!(['en', 'ja'])
       Rails.application.config.i18n.load_path = (Rails.application.config.i18n.load_path + Dir.glob(Rails.root.join('plugins', 'redmine_message_customize', 'config', 'locales', 'custom_messages', '*.rb'))).uniq
     end
 
@@ -18,7 +18,7 @@ def test_reload!
     setting.save
 
     assert_equal 'Home1', I18n.backend.send(:translations)[:en][:label_home]
-    MessageCustomize::Locale.reload!('en')
+    MessageCustomize::Locale.reload!(['en'])
     assert_equal 'Changed home', I18n.backend.send(:translations)[:en][:label_home]
     assert_equal [:en], MessageCustomize::Locale.instance_variable_get(:@available_messages).keys
   end