Update paperclip

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

diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb
index 09965e950cb5ba38548012026989d0abef5c6c67..3aa528ceb819db6244b9e54b7b971d005657cb23 100644 (file)
--- a/test/lib/i18n_test.rb
+++ b/test/lib/i18n_test.rb
@@ -13,20 +13,18 @@ class I18nTest < ActiveSupport::TestCase
         if default_value.is_a?(Hash)
           variables.push("count")
 
         if default_value.is_a?(Hash)
           variables.push("count")
 

-          default_value.each do |_subkey, subvalue|
+          default_value.each_value do |subvalue|

             subvalue.scan(/%\{(\w+)\}/) do
             subvalue.scan(/%\{(\w+)\}/) do

-              variables.push($1)
+              variables.push(Regexp.last_match(1))

             end
           end
         else
           default_value.scan(/%\{(\w+)\}/) do
             end
           end
         else
           default_value.scan(/%\{(\w+)\}/) do

-            variables.push($1)
+            variables.push(Regexp.last_match(1))

           end
         end
 
           end
         end
 

-        if key =~ /^(active(model|record)\.)?errors\./
-          variables.push("attribute")
-        end
+        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)
 


@@ -37,19 +35,19 @@ class I18nTest < ActiveSupport::TestCase
             next if subvalue.nil?
 
             subvalue.scan(/%\{(\w+)\}/) do
             next if subvalue.nil?
 
             subvalue.scan(/%\{(\w+)\}/) do

-              assert variables.include?($1), "#{key}.#{subkey} uses unknown interpolation variable #{$1}"
+              assert variables.include?(Regexp.last_match(1)), "#{key}.#{subkey} uses unknown interpolation variable #{Regexp.last_match(1)}"

             end
           end
         else
           assert value.is_a?(String), "#{key} is not a string"
 
           value.scan(/%\{(\w+)\}/) do
             end
           end
         else
           assert value.is_a?(String), "#{key} is not a string"
 
           value.scan(/%\{(\w+)\}/) do

-            assert variables.include?($1), "#{key} uses unknown interpolation variable #{$1}"
+            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