diff options
author | Marcelo Casiraghi <marcelocasiraghi@gmail.com> | 2012-04-23 19:16:02 -0300 |
---|---|---|
committer | Alexey Vakhov <vakhov@gmail.com> | 2012-04-24 15:56:35 +0400 |
commit | 5fdd4cd9e47be972f146a8a17a74c8f4700e2ac0 (patch) | |
tree | b5b72a770b65a3a357598dbc771315f8f052709e /actionpack/test | |
parent | ff5b0d699d7cef29a45e51890c6b781a0e70925f (diff) | |
download | rails-5fdd4cd9e47be972f146a8a17a74c8f4700e2ac0.tar.gz rails-5fdd4cd9e47be972f146a8a17a74c8f4700e2ac0.tar.bz2 rails-5fdd4cd9e47be972f146a8a17a74c8f4700e2ac0.zip |
fixed non matching documentation behaviour with method semantics on distance_of_time_in_words
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/template/date_helper_test.rb | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb index 6f6a10472a..cfec2835fa 100644 --- a/actionpack/test/template/date_helper_test.rb +++ b/actionpack/test/template/date_helper_test.rb @@ -129,12 +129,29 @@ class DateHelperTest < ActionView::TestCase end def test_distance_in_words_with_integers - assert_equal "less than a minute", distance_of_time_in_words(59) + assert_equal "1 minute", distance_of_time_in_words(59) assert_equal "about 1 hour", distance_of_time_in_words(60*60) - assert_equal "less than a minute", distance_of_time_in_words(0, 59) + assert_equal "1 minute", distance_of_time_in_words(0, 59) assert_equal "about 1 hour", distance_of_time_in_words(60*60, 0) end + def test_distance_in_words_with_times + assert_equal "1 minute", distance_of_time_in_words(30.seconds) + assert_equal "1 minute", distance_of_time_in_words(59.seconds) + assert_equal "2 minutes", distance_of_time_in_words(119.seconds) + assert_equal "2 minutes", distance_of_time_in_words(1.minute + 59.seconds) + assert_equal "3 minutes", distance_of_time_in_words(2.minute + 30.seconds) + assert_equal "44 minutes", distance_of_time_in_words(44.minutes + 29.seconds) + assert_equal "about 1 hour", distance_of_time_in_words(44.minutes + 30.seconds) + assert_equal "about 1 hour", distance_of_time_in_words(60.minutes) + + # include seconds + assert_equal "half a minute", distance_of_time_in_words(39.seconds, 0, true) + assert_equal "less than a minute", distance_of_time_in_words(40.seconds, 0, true) + assert_equal "less than a minute", distance_of_time_in_words(59.seconds, 0, true) + assert_equal "1 minute", distance_of_time_in_words(60.seconds, 0, true) + end + def test_time_ago_in_words assert_equal "about 1 year", time_ago_in_words(1.year.ago - 1.day) end |