Make all translation lookup errors throw exceptions in test mode

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index 6e09300170d239d2fbc9171d90ffca06cc2d265d..266e41cbb98d501435ba985efbdba9af475c8d63 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -42,6 +42,12 @@ I18n.fallbacks.map("no" => "nb")
 
 I18n.enforce_available_locales = false
 
 
 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
 Rails.configuration.after_initialize do
   I18n.available_locales
 end

diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb
index 3aa528ceb819db6244b9e54b7b971d005657cb23..cdfd234af46c284a3e71d727e26bbf110b8365d5 100644 (file)
--- 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
 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
               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

-          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
         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
 
     end
   end
 

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 05385b4f9c8678b85b207e352fe047e52bb9956c..4d9372148f270cd447df619f1c438f2f4335b238 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -42,6 +42,18 @@ module ActiveSupport
       end
     end
 
       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
     ##
     # work round minitest insanity that causes it to tell you
     # to use assert_nil to test for nil, which is fine if you're