Merge remote-tracking branch 'upstream/pull/5405'

[rails.git] / test / lib / i18n_test.rb

diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb
index def2442bf3120023fcba78ccefe9000147f7e6cf..fe94cbdd3604e1de39d2b8505891d7fcd51a3cdb 100644 (file)
--- a/test/lib/i18n_test.rb
+++ b/test/lib/i18n_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 class I18nTest < ActiveSupport::TestCase
   I18n.available_locales.each do |locale|
 
 class I18nTest < ActiveSupport::TestCase
   I18n.available_locales.each do |locale|

-    define_method("test_#{locale.to_s.underscore}".to_sym) do
+    test locale.to_s do

       without_i18n_exceptions do
         # plural_keys = plural_keys(locale)
 
       without_i18n_exceptions do
         # plural_keys = plural_keys(locale)
 


@@ -42,7 +42,7 @@ class I18nTest < ActiveSupport::TestCase
 
             assert_includes value, :other, "#{key}.other plural key missing"
           else
 
             assert_includes value, :other, "#{key}.other plural key missing"
           else

-            assert value.is_a?(String), "#{key} is not a string"
+            assert_kind_of String, value, "#{key} is not a string"

 
             value.scan(/%\{(\w+)\}/) do
               assert_includes variables, Regexp.last_match(1), "#{key} uses unknown interpolation variable #{Regexp.last_match(1)}"
 
             value.scan(/%\{(\w+)\}/) do
               assert_includes variables, Regexp.last_match(1), "#{key} uses unknown interpolation variable #{Regexp.last_match(1)}"


@@ -55,10 +55,13 @@ class I18nTest < ActiveSupport::TestCase
     end
   end
 
     end
   end
 

-  def test_en_for_raw_html
-    en = YAML.load_file(Rails.root.join("config/locales/en.yml"))
-    assert_nothing_raised do
-      check_values_for_raw_html(en)
+  Rails.root.glob("config/locales/*.yml").each do |filename|
+    lang = File.basename(filename, ".yml")
+    test "#{lang} for raw html" do
+      yml = YAML.load_file(filename)
+      assert_nothing_raised do
+        check_values_for_raw_html(yml)
+      end

     end
   end
 
     end
   end
 


@@ -110,7 +113,7 @@ class I18nTest < ActiveSupport::TestCase
       if v.is_a? Hash
         check_values_for_raw_html(v)
       else
       if v.is_a? Hash
         check_values_for_raw_html(v)
       else

-        next unless k.end_with?("_html")
+        next unless k.to_s.end_with?("_html")

         raise "Avoid using raw html in '#{k}: #{v}'" if v.include? "<"
       end
     end
         raise "Avoid using raw html in '#{k}: #{v}'" if v.include? "<"
       end
     end