aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/core_ext/duration_test.rb
diff options
context:
space:
mode:
authorgbuesing <gbuesing@gmail.com>2008-10-13 20:18:56 -0500
committergbuesing <gbuesing@gmail.com>2008-10-13 20:18:56 -0500
commitc51db4d7ababd6f1c341d2808a298865ee449313 (patch)
tree19c2ff64789e1f3f5e83bfa6b1c5a159871742f2 /activesupport/test/core_ext/duration_test.rb
parenta6e5d29e0839540b6b5a1a89bcb3b1d037120474 (diff)
downloadrails-c51db4d7ababd6f1c341d2808a298865ee449313.tar.gz
rails-c51db4d7ababd6f1c341d2808a298865ee449313.tar.bz2
rails-c51db4d7ababd6f1c341d2808a298865ee449313.zip
Enhance testing for fractional days and weeks. Update changelog.
Diffstat (limited to 'activesupport/test/core_ext/duration_test.rb')
-rw-r--r--activesupport/test/core_ext/duration_test.rb22
1 files changed, 9 insertions, 13 deletions
diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb
index d1b15fd2ef..80cc6d25d3 100644
--- a/activesupport/test/core_ext/duration_test.rb
+++ b/activesupport/test/core_ext/duration_test.rb
@@ -30,21 +30,17 @@ class DurationTest < Test::Unit::TestCase
end
end
- uses_mocha 'TestDurationSinceAndAgoWithCurrentTime' do
- def test_fractional_weeks
- Time.stubs(:now).returns Time.local(2000)
-
- assert_in_delta((24 * 7 * 1.5).hours, 1.5.weeks, 2 ** -20)
- assert_in_delta((24 * 7 * 1.7).hours, 1.7.weeks, 2 ** -20)
- end
-
- def test_fractional_days
- Time.stubs(:now).returns Time.local(2000)
+ def test_fractional_weeks
+ assert_equal (86400 * 7) * 1.5, 1.5.weeks
+ assert_equal (86400 * 7) * 1.7, 1.7.weeks
+ end
- assert_in_delta((24 * 1.5).hours, 1.5.days, 2 ** -20)
- assert_in_delta((24 * 1.7).hours, 1.7.days, 2 ** -20)
- end
+ def test_fractional_days
+ assert_equal 86400 * 1.5, 1.5.days
+ assert_equal 86400 * 1.7, 1.7.days
+ end
+ uses_mocha 'TestDurationSinceAndAgoWithCurrentTime' do
def test_since_and_ago_with_fractional_days
Time.stubs(:now).returns Time.local(2000)
# since