Moved TextHelper#human_size to NumberHelper#number_to_human_size, but kept an deprecated alias to the old method name

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1147 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 23 insertions, 16 deletions

diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb
new file mode 100644
index 0000000000..a8a3158e80
--- /dev/null
+++ b/actionpack/test/template/number_helper_test.rb
@@ -0,0 +1,23 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../../lib/action_view/helpers/number_helper'
+require File.dirname(__FILE__) + '/../../../activesupport/lib/active_support/core_ext/numeric'  # for human_size
+
+class NumberHelperTest < Test::Unit::TestCase
+  include ActionView::Helpers::NumberHelper
+  
+  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))
+    assert_equal("123 Bytes", number_to_human_size(123.0))
+    assert_equal("123 Bytes", number_to_human_size(123))
+    assert_equal("1.2 KB", number_to_human_size(1234))
+    assert_equal("12.1 KB", number_to_human_size(12345))
+    assert_equal("1.2 MB", number_to_human_size(1234567))
+    assert_equal("1.1 GB", number_to_human_size(1234567890))
+    assert_equal("1.1 TB", number_to_human_size(1234567890123))
+    assert_equal("444.0 KB", number_to_human_size(444.kilobytes))
+    assert_equal("1023.0 MB", number_to_human_size(1023.megabytes))
+    assert_equal("3.0 TB", number_to_human_size(3.terabytes))
+    assert_nil number_to_human_size('x')
+  end
+end
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index fe170d6720..ed2f08e755 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -53,22 +53,6 @@ class TextHelperTest < Test::Unit::TestCase
       highlight("This is a beautiful? morning", "beautiful? morning")
     )
   end
-  
-  def test_human_size
-    assert_equal("0 Bytes", human_size(0))
-    assert_equal("3 Bytes", human_size(3.14159265))
-    assert_equal("123 Bytes", human_size(123.0))
-    assert_equal("123 Bytes", human_size(123))
-    assert_equal("1.2 KB", human_size(1234))
-    assert_equal("12.1 KB", human_size(12345))
-    assert_equal("1.2 MB", human_size(1234567))
-    assert_equal("1.1 GB", human_size(1234567890))
-    assert_equal("1.1 TB", human_size(1234567890123))
-    assert_equal("444.0 KB", human_size(444.kilobytes))
-    assert_equal("1023.0 MB", human_size(1023.megabytes))
-    assert_equal("3.0 TB", human_size(3.terabytes))
-    assert_nil human_size('x')
-  end
 
   def test_excerpt
     assert_equal("...is a beautiful morni...", excerpt("This is a beautiful morning", "beautiful", 5))