diff options
| author | Geoff Buesing <gbuesing@gmail.com> | 2007-11-24 03:57:11 +0000 |
|---|---|---|
| committer | Geoff Buesing <gbuesing@gmail.com> | 2007-11-24 03:57:11 +0000 |
| commit | d84846a636fbc180b3d6fcf52aa8559e1b7bb960 (patch) | |
| tree | 5f7a074b5f146396011f273863d9ebc66c9e645b /activesupport/test/core_ext | |
| parent | 96add62ecc46354de3522b00d52a8cfa7ff7bb92 (diff) | |
| download | rails-d84846a636fbc180b3d6fcf52aa8559e1b7bb960.tar.gz rails-d84846a636fbc180b3d6fcf52aa8559e1b7bb960.tar.bz2 rails-d84846a636fbc180b3d6fcf52aa8559e1b7bb960.zip | |
Change Time and DateTime #end_of_month to return last second of month instead of beginning of last day of month. Closes #10200
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8198 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/test/core_ext')
| -rw-r--r-- | activesupport/test/core_ext/date_time_ext_test.rb | 7 | ||||
| -rw-r--r-- | activesupport/test/core_ext/time_ext_test.rb | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb index 0f2c788926..54af69c0ca 100644 --- a/activesupport/test/core_ext/date_time_ext_test.rb +++ b/activesupport/test/core_ext/date_time_ext_test.rb @@ -78,10 +78,9 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase end def test_end_of_month - assert_equal DateTime.civil(2005,3,31,0,0,0), DateTime.civil(2005,3,20,10,10,10).end_of_month - assert_equal DateTime.civil(2005,2,28,0,0,0), DateTime.civil(2005,2,20,10,10,10).end_of_month - assert_equal DateTime.civil(2005,4,30,0,0,0), DateTime.civil(2005,4,20,10,10,10).end_of_month - + assert_equal DateTime.civil(2005,3,31,23,59,59), DateTime.civil(2005,3,20,10,10,10).end_of_month + assert_equal DateTime.civil(2005,2,28,23,59,59), DateTime.civil(2005,2,20,10,10,10).end_of_month + assert_equal DateTime.civil(2005,4,30,23,59,59), DateTime.civil(2005,4,20,10,10,10).end_of_month end def test_beginning_of_year diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb index 8ead0d7fe6..fb60892b69 100644 --- a/activesupport/test/core_ext/time_ext_test.rb +++ b/activesupport/test/core_ext/time_ext_test.rb @@ -84,10 +84,9 @@ class TimeExtCalculationsTest < Test::Unit::TestCase end def test_end_of_month - assert_equal Time.local(2005,3,31,0,0,0), Time.local(2005,3,20,10,10,10).end_of_month - assert_equal Time.local(2005,2,28,0,0,0), Time.local(2005,2,20,10,10,10).end_of_month - assert_equal Time.local(2005,4,30,0,0,0), Time.local(2005,4,20,10,10,10).end_of_month - + assert_equal Time.local(2005,3,31,23,59,59), Time.local(2005,3,20,10,10,10).end_of_month + assert_equal Time.local(2005,2,28,23,59,59), Time.local(2005,2,20,10,10,10).end_of_month + assert_equal Time.local(2005,4,30,23,59,59), Time.local(2005,4,20,10,10,10).end_of_month end def test_beginning_of_year |