Updated NumberHelper: Full i18n support (except number_to_phone), consolidated API (almost all methods now support :precision, :delimiter and :separator). Added deprecation notices for old API. Added tests for new options [#716 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>

1 files changed, 41 insertions, 5 deletions

diff --git a/actionpack/test/template/number_helper_i18n_test.rb b/actionpack/test/template/number_helper_i18n_test.rb
index 50c20c3627..ce0da398cc 100644
--- a/actionpack/test/template/number_helper_i18n_test.rb
+++ b/actionpack/test/template/number_helper_i18n_test.rb
@@ -2,17 +2,53 @@ require 'abstract_unit'
 
 class NumberHelperI18nTests < Test::Unit::TestCase
   include ActionView::Helpers::NumberHelper
-  
+
   attr_reader :request
+
   uses_mocha 'number_helper_i18n_tests' do
     def setup
-      @defaults = {:separator => ".", :unit => "$", :format => "%u%n", :delimiter => ",", :precision => 2}
-      I18n.backend.store_translations 'en-US', :currency => {:format => @defaults}
+      @number_defaults = { :precision => 3, :delimiter => ',', :separator => '.' }
+      @currency_defaults = { :unit => '$', :format => '%u%n', :precision => 2 }
+      @human_defaults = { :precision => 1 }
+      @percentage_defaults = { :delimiter => '' }
+      @precision_defaults = { :delimiter => '' }
+
+      I18n.backend.store_translations 'en-US', :number => { :format => @number_defaults,
+        :currency => { :format => @currency_defaults }, :human => @human_defaults }
     end
 
     def test_number_to_currency_translates_currency_formats
-      I18n.expects(:translate).with(:'currency.format', :locale => 'en-US').returns @defaults
+      I18n.expects(:translate).with(
+        [:'number.format', :'number.currency.format'], :locale => 'en-US'
+      ).returns([@number_defaults, @currency_defaults])
       number_to_currency(1, :locale => 'en-US')
     end
+
+    def test_number_with_precision_translates_number_formats
+      I18n.expects(:translate).with(
+        [:'number.format', :'number.precision.format'], :locale => 'en-US'
+      ).returns([@number_defaults, @precision_defaults])
+      number_with_precision(1, :locale => 'en-US')
+    end
+
+    def test_number_with_delimiter_translates_number_formats
+      I18n.expects(:translate).with(:'number.format', :locale => 'en-US').returns(@number_defaults)
+      number_with_delimiter(1, :locale => 'en-US')
+    end
+
+    def test_number_to_percentage_translates_number_formats
+      I18n.expects(:translate).with(
+        [:'number.format', :'number.percentage.format'], :locale => 'en-US'
+      ).returns([@number_defaults, @percentage_defaults])
+      number_to_percentage(1, :locale => 'en-US')
+    end
+
+    def test_number_to_human_size_translates_human_formats
+      I18n.expects(:translate).with(
+        [:'number.format', :'number.human.format'], :locale => 'en-US'
+      ).returns([@number_defaults, @human_defaults])
+      # can't be called with 1 because this directly returns without calling I18n.translate
+      number_to_human_size(1025, :locale => 'en-US')
+    end
   end
-end
\ No newline at end of file
+end