From 4ee60c0f8f28904d2a2b4aad27dfecf8cd21f015 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 16 Dec 2019 21:39:05 +0000 Subject: [PATCH] Make all translation lookup errors throw exceptions in test mode --- config/initializers/i18n.rb | 6 ++++ test/lib/i18n_test.rb | 58 +++++++++++++++++++------------------ test/test_helper.rb | 12 ++++++++ 3 files changed, 48 insertions(+), 28 deletions(-) diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb index 6e0930017..266e41cbb 100644 --- a/config/initializers/i18n.rb +++ b/config/initializers/i18n.rb @@ -42,6 +42,12 @@ I18n.fallbacks.map("no" => "nb") I18n.enforce_available_locales = false +if Rails.env.test? + I18n.exception_handler = proc do |exception| + raise exception.to_exception + end +end + Rails.configuration.after_initialize do I18n.available_locales end diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb index 3aa528ceb..cdfd234af 100644 --- a/test/lib/i18n_test.rb +++ b/test/lib/i18n_test.rb @@ -3,51 +3,53 @@ require "test_helper" class I18nTest < ActiveSupport::TestCase I18n.available_locales.each do |locale| define_method("test_#{locale.to_s.underscore}".to_sym) do - # plural_keys = plural_keys(locale) + without_i18n_exceptions do + # plural_keys = plural_keys(locale) - translation_keys.each do |key| - variables = [] + translation_keys.each do |key| + variables = [] - default_value = I18n.t(key, :locale => I18n.default_locale) + default_value = I18n.t(key, :locale => I18n.default_locale) - if default_value.is_a?(Hash) - variables.push("count") + if default_value.is_a?(Hash) + variables.push("count") - default_value.each_value do |subvalue| - subvalue.scan(/%\{(\w+)\}/) do + default_value.each_value do |subvalue| + subvalue.scan(/%\{(\w+)\}/) do + variables.push(Regexp.last_match(1)) + end + end + else + default_value.scan(/%\{(\w+)\}/) do variables.push(Regexp.last_match(1)) end end - else - default_value.scan(/%\{(\w+)\}/) do - variables.push(Regexp.last_match(1)) - end - end - variables.push("attribute") if key =~ /^(active(model|record)\.)?errors\./ + variables.push("attribute") if key =~ /^(active(model|record)\.)?errors\./ - value = I18n.t(key, :locale => locale, :fallback => true) + value = I18n.t(key, :locale => locale, :fallback => true) - if value.is_a?(Hash) - value.each do |subkey, subvalue| - # assert plural_keys.include?(subkey), "#{key}.#{subkey} is not a valid plural key" + if value.is_a?(Hash) + value.each do |subkey, subvalue| + # assert plural_keys.include?(subkey), "#{key}.#{subkey} is not a valid plural key" - next if subvalue.nil? + next if subvalue.nil? - subvalue.scan(/%\{(\w+)\}/) do - assert variables.include?(Regexp.last_match(1)), "#{key}.#{subkey} uses unknown interpolation variable #{Regexp.last_match(1)}" + subvalue.scan(/%\{(\w+)\}/) do + assert variables.include?(Regexp.last_match(1)), "#{key}.#{subkey} uses unknown interpolation variable #{Regexp.last_match(1)}" + end end - end - else - assert value.is_a?(String), "#{key} is not a string" + else + assert value.is_a?(String), "#{key} is not a string" - value.scan(/%\{(\w+)\}/) do - assert variables.include?(Regexp.last_match(1)), "#{key} uses unknown interpolation variable #{Regexp.last_match(1)}" + value.scan(/%\{(\w+)\}/) do + assert variables.include?(Regexp.last_match(1)), "#{key} uses unknown interpolation variable #{Regexp.last_match(1)}" + end end end - end - assert %w[ltr rtl].include?(I18n.t("html.dir", :locale => locale)), "html.dir must be ltr or rtl" + assert %w[ltr rtl].include?(I18n.t("html.dir", :locale => locale)), "html.dir must be ltr or rtl" + end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 05385b4f9..4d9372148 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -42,6 +42,18 @@ module ActiveSupport end end + ## + # execute a block with missing translation exceptions suppressed + def without_i18n_exceptions + exception_handler = I18n.exception_handler + begin + I18n.exception_handler = nil + yield + ensure + I18n.exception_handler = exception_handler + end + end + ## # work round minitest insanity that causes it to tell you # to use assert_nil to test for nil, which is fine if you're -- 2.43.2