From c1ad19c92fde1c3801a93b59003ba2b266e4128f Mon Sep 17 00:00:00 2001 From: Jeremy Daer Date: Wed, 27 Apr 2016 14:36:22 -0500 Subject: Revert "Change 1.week to create 1 week durations instead of 7 days durations." Regression: adding minutes/hours to a time would change its time zone This reverts commit 1bf9fe75a6473cb7501cae544cab772713e68cef. --- activesupport/test/core_ext/duration_test.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'activesupport/test/core_ext') diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb index bef660fe12..69c2c0d936 100644 --- a/activesupport/test/core_ext/duration_test.rb +++ b/activesupport/test/core_ext/duration_test.rb @@ -66,9 +66,8 @@ class DurationTest < ActiveSupport::TestCase assert_equal '10 years, 2 months, and 1 day', (10.years + 2.months + 1.day).inspect assert_equal '10 years, 2 months, and 1 day', (10.years + 1.month + 1.day + 1.month).inspect assert_equal '10 years, 2 months, and 1 day', (1.day + 10.years + 2.months).inspect - assert_equal '7 days', 7.days.inspect - assert_equal '1 week', 1.week.inspect - assert_equal '2 weeks', 1.fortnight.inspect + assert_equal '7 days', 1.week.inspect + assert_equal '14 days', 1.fortnight.inspect end def test_inspect_locale -- cgit v1.2.3