Permalink
Browse files

Improved tests for NumberHelper

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1151 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 5fe0ecc commit 988dc1e8624ab429537006d9cf86008e8b9eedd0 @dhh dhh committed Apr 13, 2005
@@ -35,13 +35,13 @@ def number_to_phone(number, options = {})
# Examples:
# number_to_currency(1234567890.50) => $1,234,567,890.50
# number_to_currency(1234567890.506) => $1,234,567,890.51
- # number_to_currency(1234567890.50, {:unit => "£", :separator => ",", :delimiter => ""}) => £123456789,50
+ # number_to_currency(1234567890.50, {:unit => "£", :separator => ",", :delimiter => ""}) => £1234567890,50
def number_to_currency(number, options = {})
options = options.stringify_keys
precision, unit, separator, delimiter = options.delete("precision") { 2 }, options.delete("unit") { "$" }, options.delete("separator") { "." }, options.delete("delimiter") { "," }
begin
parts = number_with_precision(number, precision).split('.')
- unit + number_with_delimiter(parts[0]) + separator + parts[1].to_s
+ unit + number_with_delimiter(parts[0], delimiter) + separator + parts[1].to_s
rescue
number
end
@@ -72,9 +72,9 @@ def number_to_percentage(number, options = {})
# Formats a +number+ with a +delimiter+.
# Example:
- # number_with_delimiter(12345678) => 1,235,678
+ # number_with_delimiter(12345678) => 12,345,678
def number_with_delimiter(number, delimiter=",")
- number.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
+ number.to_s.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{delimiter}")
end
# Returns a formatted-for-humans file size.
@@ -1,10 +1,34 @@
require 'test/unit'
require File.dirname(__FILE__) + '/../../lib/action_view/helpers/number_helper'
+require File.dirname(__FILE__) + '/../../../activesupport/lib/active_support/core_ext/hash' # for stringify_keys
require File.dirname(__FILE__) + '/../../../activesupport/lib/active_support/core_ext/numeric' # for human_size
class NumberHelperTest < Test::Unit::TestCase
include ActionView::Helpers::NumberHelper
-
+ include ActiveSupport::CoreExtensions::Hash
+
+ def test_number_to_phone
+ assert_equal("123-555-1234", number_to_phone(1235551234))
+ assert_equal("(123) 555-1234", number_to_phone(1235551234, {:area_code => true}))
+ assert_equal("123 555 1234", number_to_phone(1235551234, {:delimiter => " "}))
+ end
+
+ def test_number_to_currency
+ assert_equal("$1,234,567,890.50", number_to_currency(1234567890.50))
+ assert_equal("$1,234,567,890.51", number_to_currency(1234567890.506))
+ assert_equal("&pound;1234567890,50", number_to_currency(1234567890.50, {:unit => "&pound;", :separator => ",", :delimiter => ""}))
+ end
+
+ def test_number_to_percentage
+ assert_equal("100.000%", number_to_percentage(100))
+ assert_equal("100%", number_to_percentage(100, {:precision => 0}))
+ assert_equal("302.06%", number_to_percentage(302.0574, {:precision => 2}))
+ end
+
+ def test_number_with_delimiter
+ assert_equal("12,345,678", number_with_delimiter(12345678))
+ end
+
def test_number_to_human_size
assert_equal("0 Bytes", number_to_human_size(0))
assert_equal("3 Bytes", number_to_human_size(3.14159265))
@@ -20,4 +44,8 @@ def test_number_to_human_size
assert_equal("3.0 TB", number_to_human_size(3.terabytes))
assert_nil number_to_human_size('x')
end
+
+ def test_number_with_precision
+ assert_equal("111.235", number_with_precision(111.2346))
+ end
end

0 comments on commit 988dc1e

Please sign in to comment.