diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-17 23:26:22 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-17 23:42:42 -0700 |
| commit | 7254517f1efe896c53330d4ac0c4a48cd6559614 (patch) | |
| tree | 43d32f68150aad890ee23bf73c76236a9531747e /activesupport/test/core_ext/duration_test.rb | |
| parent | cdce6131500820c9fd88709c46d84e57a9fd3f90 (diff) | |
| parent | 1bf9fe75a6473cb7501cae544cab772713e68cef (diff) | |
| download | rails-7254517f1efe896c53330d4ac0c4a48cd6559614.tar.gz rails-7254517f1efe896c53330d4ac0c4a48cd6559614.tar.bz2 rails-7254517f1efe896c53330d4ac0c4a48cd6559614.zip | |
Merge pull request #22806 from Envek/solid_durations
Introduce weeks and hours periods to Duration.
Change 1.week to create a 1 week duration instead of 7 days and 1.hour
to create a 1 hour duration instead of 3600 seconds.
Diffstat (limited to 'activesupport/test/core_ext/duration_test.rb')
| -rw-r--r-- | activesupport/test/core_ext/duration_test.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb index 9e97acaffb..a6a43048db 100644 --- a/activesupport/test/core_ext/duration_test.rb +++ b/activesupport/test/core_ext/duration_test.rb @@ -66,8 +66,9 @@ 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', 1.week.inspect - assert_equal '14 days', 1.fortnight.inspect + assert_equal '7 days', 7.days.inspect + assert_equal '1 week', 1.week.inspect + assert_equal '2 weeks', 1.fortnight.inspect end def test_inspect_locale |