From 9e03b5c69a0ed308b7803930581cebbc8740aa36 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 15 Nov 2017 12:50:20 -0500 Subject: [PATCH] FIX: Don't load other locales in test mode --- app/models/locale_site_setting.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/models/locale_site_setting.rb b/app/models/locale_site_setting.rb index fad31b53e1f..ec9e81ec7c1 100644 --- a/app/models/locale_site_setting.rb +++ b/app/models/locale_site_setting.rb @@ -30,11 +30,13 @@ class LocaleSiteSetting < EnumSiteSetting File.join(Rails.root, 'config', 'locales', 'client.*.yml') ) - plugin_client_files = Dir.glob( - File.join(Rails.root, 'plugins', '*', 'config', 'locales', 'client.*.yml') - ) + unless Rails.env.test? && ENV['LOAD_PLUGINS'] != "1" + app_client_files += Dir.glob( + File.join(Rails.root, 'plugins', '*', 'config', 'locales', 'client.*.yml') + ) + end - (app_client_files + plugin_client_files).map { |x| x.split('.')[-2] }.uniq.sort + app_client_files.map { |x| x.split('.')[-2] }.uniq.sort end end end