mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
when the timezone is nil, a TimeWithZone object should not be constructed. [#4881 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
This commit is contained in:
parent
84d387bc0f
commit
5ae7a9d31d
3 changed files with 11 additions and 0 deletions
|
@ -12,6 +12,8 @@ class DateTime
|
|||
#
|
||||
# DateTime.new(2000).in_time_zone('Alaska') # => Fri, 31 Dec 1999 15:00:00 AKST -09:00
|
||||
def in_time_zone(zone = ::Time.zone)
|
||||
return self unless zone
|
||||
|
||||
ActiveSupport::TimeWithZone.new(utc? ? self : getutc, ::Time.__send__(:get_zone, zone))
|
||||
end
|
||||
end
|
||||
|
|
|
@ -73,6 +73,8 @@ class Time
|
|||
#
|
||||
# Time.utc(2000).in_time_zone('Alaska') # => Fri, 31 Dec 1999 15:00:00 AKST -09:00
|
||||
def in_time_zone(zone = ::Time.zone)
|
||||
return self unless zone
|
||||
|
||||
ActiveSupport::TimeWithZone.new(utc? ? self : getutc, ::Time.__send__(:get_zone, zone))
|
||||
end
|
||||
end
|
||||
|
|
|
@ -737,6 +737,13 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
|
|||
end
|
||||
end
|
||||
|
||||
def test_nil_time_zone
|
||||
Time.use_zone nil do
|
||||
assert !@t.in_time_zone.respond_to?(:period), 'no period method'
|
||||
assert !@dt.in_time_zone.respond_to?(:period), 'no period method'
|
||||
end
|
||||
end
|
||||
|
||||
def test_in_time_zone_with_argument
|
||||
Time.use_zone 'Eastern Time (US & Canada)' do # Time.zone will not affect #in_time_zone(zone)
|
||||
assert_equal 'Fri, 31 Dec 1999 15:00:00 AKST -09:00', @t.in_time_zone('Alaska').inspect
|
||||
|
|
Loading…
Reference in a new issue