diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-01 12:23:33 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-01 12:23:33 -0300 |
commit | 03ddab096f42d4dea191b4b4da5709a4ac723884 (patch) | |
tree | f9168a5013f6b3b1457eca9fd303d52f91632850 /activesupport/test | |
parent | b8e8b67290443b91304ac7c1e36f94c72e0dc819 (diff) | |
parent | d98928019a1ecc0c0ceacb46a220bf465057f033 (diff) | |
download | rails-03ddab096f42d4dea191b4b4da5709a4ac723884.tar.gz rails-03ddab096f42d4dea191b4b4da5709a4ac723884.tar.bz2 rails-03ddab096f42d4dea191b4b4da5709a4ac723884.zip |
Merge pull request #20398 from nkondratyev/fix-time-change
Fix a range of values for parameters of the Time#change
Diffstat (limited to 'activesupport/test')
-rw-r--r-- | activesupport/test/core_ext/time_ext_test.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb index d59775001b..62868d146b 100644 --- a/activesupport/test/core_ext/time_ext_test.rb +++ b/activesupport/test/core_ext/time_ext_test.rb @@ -149,6 +149,9 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase assert_equal Time.local(2006,3,19,23,59,59,Rational(999999999, 1000)), Time.local(2006,3,19,10,10,10).end_of_day, 'ends DST' assert_equal Time.local(2006,10,1,23,59,59,Rational(999999999, 1000)), Time.local(2006,10,1,10,10,10).end_of_day, 'start DST' end + with_env_tz 'Asia/Yekaterinburg' do + assert_equal Time.local(2015, 2, 8, 23, 59, 59, Rational(999999999, 1000)), Time.new(2015, 2, 8, 8, 0, 0, '+05:00').end_of_day + end end def test_end_of_hour @@ -389,6 +392,7 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase assert_equal Time.local(2005,1,2,11,22,33, 8), Time.local(2005,1,2,11,22,33,44).change(:usec => 8) assert_equal Time.local(2005,1,2,11,22,33, 8), Time.local(2005,1,2,11,22,33,2).change(:nsec => 8000) assert_raise(ArgumentError) { Time.local(2005,1,2,11,22,33, 8).change(:usec => 1, :nsec => 1) } + assert_nothing_raised(ArgumentError) { Time.new(2015, 5, 9, 10, 00, 00, '+03:00').change(nsec: 999999999) } end def test_utc_change |