From 38f347a825cf132b1e0da9402532b40d6ea68522 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Fri, 22 Feb 2013 19:37:10 -0300 Subject: Move number_to_human test from AP to AS Since all changes from #9347 are related to AS, it seems proper that the test is placed there as well. --- actionpack/test/template/number_helper_test.rb | 5 ----- activesupport/test/number_helper_test.rb | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb index 6a2d5aef18..d8fffe75ed 100644 --- a/actionpack/test/template/number_helper_test.rb +++ b/actionpack/test/template/number_helper_test.rb @@ -266,11 +266,6 @@ class NumberHelperTest < ActionView::TestCase assert_equal '100<script></script>000 Quadrillion', number_to_human(10**20, :delimiter => "") end - def test_number_to_human_with_custom_units_that_are_missing_the_needed_key - assert_equal '123', number_to_human(123, :units => {:thousand => 'k'}) - assert_equal '123', number_to_human(123, :units => {}) - end - def test_number_to_human_with_custom_format assert_equal '123 times Thousand', number_to_human(123456, :format => "%n times %u") volume = {:unit => "ml", :thousand => "lt", :million => "m3"} diff --git a/activesupport/test/number_helper_test.rb b/activesupport/test/number_helper_test.rb index 5f54587f93..1fadef3637 100644 --- a/activesupport/test/number_helper_test.rb +++ b/activesupport/test/number_helper_test.rb @@ -301,6 +301,13 @@ module ActiveSupport end end + def test_number_to_human_with_custom_units_that_are_missing_the_needed_key + [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper| + assert_equal '123', number_helper.number_to_human(123, units: { thousand: 'k'}) + assert_equal '123', number_helper.number_to_human(123, units: {}) + end + end + def test_number_to_human_with_custom_format [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper| assert_equal '123 times Thousand', number_helper.number_to_human(123456, :format => "%n times %u") -- cgit v1.2.3