aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/number_helper_test.rb
diff options
context:
space:
mode:
authorMichael Hoy <mjh@mjhoy.com>2016-09-26 17:09:37 -0500
committerMichael Hoy <mjh@mjhoy.com>2017-03-16 16:36:47 -0500
commit202aadd4f4bc0bdce7e376add98c36098ff5086b (patch)
tree5b63d5b756ea7d19a0fe4f1aedee1b721619750c /activesupport/test/number_helper_test.rb
parent8bdc9e8d8793c4ce3eb25f56f0d229166261248e (diff)
downloadrails-202aadd4f4bc0bdce7e376add98c36098ff5086b.tar.gz
rails-202aadd4f4bc0bdce7e376add98c36098ff5086b.tar.bz2
rails-202aadd4f4bc0bdce7e376add98c36098ff5086b.zip
number_to_human_converter: round before calculating exponent
fixes #25664
Diffstat (limited to 'activesupport/test/number_helper_test.rb')
-rw-r--r--activesupport/test/number_helper_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/test/number_helper_test.rb b/activesupport/test/number_helper_test.rb
index dc0c34d4e2..4caf1428ea 100644
--- a/activesupport/test/number_helper_test.rb
+++ b/activesupport/test/number_helper_test.rb
@@ -321,12 +321,18 @@ module ActiveSupport
gangster = { hundred: "hundred bucks", million: "thousand quids" }
assert_equal "1 hundred bucks", number_helper.number_to_human(100, units: gangster)
assert_equal "25 hundred bucks", number_helper.number_to_human(2500, units: gangster)
+ assert_equal "1000 hundred bucks", number_helper.number_to_human(100_000, units: gangster)
+ assert_equal "1 thousand quids", number_helper.number_to_human(999_999, units: gangster)
+ assert_equal "1 thousand quids", number_helper.number_to_human(1_000_000, units: gangster)
assert_equal "25 thousand quids", number_helper.number_to_human(25000000, units: gangster)
assert_equal "12300 thousand quids", number_helper.number_to_human(12345000000, units: gangster)
#Spaces are stripped from the resulting string
assert_equal "4", number_helper.number_to_human(4, units: { unit: "", ten: "tens " })
assert_equal "4.5 tens", number_helper.number_to_human(45, units: { unit: "", ten: " tens " })
+
+ #Uses only the provided units and does not try to use larger ones
+ assert_equal "1000 kilometers", number_helper.number_to_human(1_000_000, units: { unit: "meter", thousand: "kilometers" })
end
end