Rails 2.1.1
Among other things, a security fix.
This commit is contained in:
parent
d2c4c8737c
commit
d4f97345db
354 changed files with 21027 additions and 3072 deletions
135
vendor/rails/activesupport/test/time_zone_test.rb
vendored
135
vendor/rails/activesupport/test/time_zone_test.rb
vendored
|
@ -1,10 +1,9 @@
|
|||
require 'abstract_unit'
|
||||
|
||||
class TimeZoneTest < Test::Unit::TestCase
|
||||
|
||||
def test_utc_to_local
|
||||
silence_warnings do # silence warnings raised by tzinfo gem
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
assert_equal Time.utc(1999, 12, 31, 19), zone.utc_to_local(Time.utc(2000, 1)) # standard offset -0500
|
||||
assert_equal Time.utc(2000, 6, 30, 20), zone.utc_to_local(Time.utc(2000, 7)) # dst offset -0400
|
||||
end
|
||||
|
@ -12,41 +11,41 @@ class TimeZoneTest < Test::Unit::TestCase
|
|||
|
||||
def test_local_to_utc
|
||||
silence_warnings do # silence warnings raised by tzinfo gem
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
assert_equal Time.utc(2000, 1, 1, 5), zone.local_to_utc(Time.utc(2000, 1)) # standard offset -0500
|
||||
assert_equal Time.utc(2000, 7, 1, 4), zone.local_to_utc(Time.utc(2000, 7)) # dst offset -0400
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def test_period_for_local
|
||||
silence_warnings do # silence warnings raised by tzinfo gem
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
assert_instance_of TZInfo::TimezonePeriod, zone.period_for_local(Time.utc(2000))
|
||||
end
|
||||
end
|
||||
|
||||
TimeZone::MAPPING.keys.each do |name|
|
||||
|
||||
ActiveSupport::TimeZone::MAPPING.keys.each do |name|
|
||||
define_method("test_map_#{name.downcase.gsub(/[^a-z]/, '_')}_to_tzinfo") do
|
||||
silence_warnings do # silence warnings raised by tzinfo gem
|
||||
zone = TimeZone[name]
|
||||
zone = ActiveSupport::TimeZone[name]
|
||||
assert zone.tzinfo.respond_to?(:period_for_local)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def test_from_integer_to_map
|
||||
assert_instance_of TimeZone, TimeZone[-28800] # PST
|
||||
assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone[-28800] # PST
|
||||
end
|
||||
|
||||
def test_from_duration_to_map
|
||||
assert_instance_of TimeZone, TimeZone[-480.minutes] # PST
|
||||
assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone[-480.minutes] # PST
|
||||
end
|
||||
|
||||
TimeZone.all.each do |zone|
|
||||
ActiveSupport::TimeZone.all.each do |zone|
|
||||
name = zone.name.downcase.gsub(/[^a-z]/, '_')
|
||||
define_method("test_from_#{name}_to_map") do
|
||||
silence_warnings do # silence warnings raised by tzinfo gem
|
||||
assert_instance_of TimeZone, TimeZone[zone.name]
|
||||
assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone[zone.name]
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -62,62 +61,62 @@ class TimeZoneTest < Test::Unit::TestCase
|
|||
def test_now
|
||||
with_env_tz 'US/Eastern' do
|
||||
Time.stubs(:now).returns(Time.local(2000))
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
assert_instance_of ActiveSupport::TimeWithZone, zone.now
|
||||
assert_equal Time.utc(2000,1,1,5), zone.now.utc
|
||||
assert_equal Time.utc(2000), zone.now.time
|
||||
assert_equal zone, zone.now.time_zone
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def test_now_enforces_spring_dst_rules
|
||||
with_env_tz 'US/Eastern' do
|
||||
Time.stubs(:now).returns(Time.local(2006,4,2,2)) # 2AM springs forward to 3AM
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
assert_equal Time.utc(2006,4,2,3), zone.now.time
|
||||
assert_equal true, zone.now.dst?
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def test_now_enforces_fall_dst_rules
|
||||
with_env_tz 'US/Eastern' do
|
||||
Time.stubs(:now).returns(Time.at(1162098000)) # equivalent to 1AM DST
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
assert_equal Time.utc(2006,10,29,1), zone.now.time
|
||||
assert_equal true, zone.now.dst?
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def test_today
|
||||
Time.stubs(:now).returns(Time.utc(2000, 1, 1, 4, 59, 59)) # 1 sec before midnight Jan 1 EST
|
||||
assert_equal Date.new(1999, 12, 31), TimeZone['Eastern Time (US & Canada)'].today
|
||||
assert_equal Date.new(1999, 12, 31), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].today
|
||||
Time.stubs(:now).returns(Time.utc(2000, 1, 1, 5)) # midnight Jan 1 EST
|
||||
assert_equal Date.new(2000, 1, 1), TimeZone['Eastern Time (US & Canada)'].today
|
||||
assert_equal Date.new(2000, 1, 1), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].today
|
||||
Time.stubs(:now).returns(Time.utc(2000, 1, 2, 4, 59, 59)) # 1 sec before midnight Jan 2 EST
|
||||
assert_equal Date.new(2000, 1, 1), TimeZone['Eastern Time (US & Canada)'].today
|
||||
assert_equal Date.new(2000, 1, 1), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].today
|
||||
Time.stubs(:now).returns(Time.utc(2000, 1, 2, 5)) # midnight Jan 2 EST
|
||||
assert_equal Date.new(2000, 1, 2), TimeZone['Eastern Time (US & Canada)'].today
|
||||
assert_equal Date.new(2000, 1, 2), ActiveSupport::TimeZone['Eastern Time (US & Canada)'].today
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def test_local
|
||||
silence_warnings do # silence warnings raised by tzinfo gem
|
||||
time = TimeZone["Hawaii"].local(2007, 2, 5, 15, 30, 45)
|
||||
time = ActiveSupport::TimeZone["Hawaii"].local(2007, 2, 5, 15, 30, 45)
|
||||
assert_equal Time.utc(2007, 2, 5, 15, 30, 45), time.time
|
||||
assert_equal TimeZone["Hawaii"], time.time_zone
|
||||
assert_equal ActiveSupport::TimeZone["Hawaii"], time.time_zone
|
||||
end
|
||||
end
|
||||
|
||||
def test_local_with_old_date
|
||||
silence_warnings do # silence warnings raised by tzinfo gem
|
||||
time = TimeZone["Hawaii"].local(1850, 2, 5, 15, 30, 45)
|
||||
time = ActiveSupport::TimeZone["Hawaii"].local(1850, 2, 5, 15, 30, 45)
|
||||
assert_equal [45,30,15,5,2,1850], time.to_a[0,6]
|
||||
assert_equal TimeZone["Hawaii"], time.time_zone
|
||||
assert_equal ActiveSupport::TimeZone["Hawaii"], time.time_zone
|
||||
end
|
||||
end
|
||||
|
||||
def test_local_enforces_spring_dst_rules
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
twz = zone.local(2006,4,2,1,59,59) # 1 second before DST start
|
||||
assert_equal Time.utc(2006,4,2,1,59,59), twz.time
|
||||
assert_equal Time.utc(2006,4,2,6,59,59), twz.utc
|
||||
|
@ -138,16 +137,16 @@ class TimeZoneTest < Test::Unit::TestCase
|
|||
def test_local_enforces_fall_dst_rules
|
||||
# 1AM during fall DST transition is ambiguous, it could be either DST or non-DST 1AM
|
||||
# Mirroring Time.local behavior, this method selects the DST time
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
twz = zone.local(2006,10,29,1)
|
||||
assert_equal Time.utc(2006,10,29,1), twz.time
|
||||
assert_equal Time.utc(2006,10,29,5), twz.utc
|
||||
assert_equal true, twz.dst?
|
||||
assert_equal true, twz.dst?
|
||||
assert_equal 'EDT', twz.zone
|
||||
end
|
||||
|
||||
def test_at
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
secs = 946684800.0
|
||||
twz = zone.at(secs)
|
||||
assert_equal Time.utc(1999,12,31,19), twz.time
|
||||
|
@ -157,7 +156,7 @@ class TimeZoneTest < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def test_at_with_old_date
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
secs = DateTime.civil(1850).to_f
|
||||
twz = zone.at(secs)
|
||||
assert_equal [1850, 1, 1, 0], [twz.utc.year, twz.utc.mon, twz.utc.day, twz.utc.hour]
|
||||
|
@ -166,7 +165,7 @@ class TimeZoneTest < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def test_parse
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
twz = zone.parse('1999-12-31 19:00:00')
|
||||
assert_equal Time.utc(1999,12,31,19), twz.time
|
||||
assert_equal Time.utc(2000), twz.utc
|
||||
|
@ -175,7 +174,7 @@ class TimeZoneTest < Test::Unit::TestCase
|
|||
|
||||
def test_parse_string_with_timezone
|
||||
(-11..13).each do |timezone_offset|
|
||||
zone = TimeZone[timezone_offset]
|
||||
zone = ActiveSupport::TimeZone[timezone_offset]
|
||||
twz = zone.parse('1999-12-31 19:00:00')
|
||||
assert_equal twz, zone.parse(twz.to_s)
|
||||
end
|
||||
|
@ -183,25 +182,25 @@ class TimeZoneTest < Test::Unit::TestCase
|
|||
|
||||
def test_parse_with_old_date
|
||||
silence_warnings do # silence warnings raised by tzinfo gem
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
twz = zone.parse('1850-12-31 19:00:00')
|
||||
assert_equal [0,0,19,31,12,1850], twz.to_a[0,6]
|
||||
assert_equal zone, twz.time_zone
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def test_parse_far_future_date_with_time_zone_offset_in_string
|
||||
silence_warnings do # silence warnings raised by tzinfo gem
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
twz = zone.parse('2050-12-31 19:00:00 -10:00') # i.e., 2050-01-01 05:00:00 UTC
|
||||
assert_equal [0,0,0,1,1,2051], twz.to_a[0,6]
|
||||
assert_equal zone, twz.time_zone
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def test_parse_returns_nil_when_string_without_date_information_is_passed_in
|
||||
silence_warnings do # silence warnings raised by tzinfo gem
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
assert_nil zone.parse('foobar')
|
||||
assert_nil zone.parse(' ')
|
||||
end
|
||||
|
@ -209,80 +208,80 @@ class TimeZoneTest < Test::Unit::TestCase
|
|||
|
||||
uses_mocha 'TestParseWithIncompleteDate' do
|
||||
def test_parse_with_incomplete_date
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
zone.stubs(:now).returns zone.local(1999,12,31)
|
||||
twz = zone.parse('19:00:00')
|
||||
assert_equal Time.utc(1999,12,31,19), twz.time
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def test_utc_offset_lazy_loaded_from_tzinfo_when_not_passed_in_to_initialize
|
||||
silence_warnings do # silence warnings raised by tzinfo gem
|
||||
tzinfo = TZInfo::Timezone.get('America/New_York')
|
||||
zone = TimeZone.create(tzinfo.name, nil, tzinfo)
|
||||
zone = ActiveSupport::TimeZone.create(tzinfo.name, nil, tzinfo)
|
||||
assert_equal nil, zone.instance_variable_get('@utc_offset')
|
||||
assert_equal(-18_000, zone.utc_offset)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def test_formatted_offset_positive
|
||||
zone = TimeZone['Moscow']
|
||||
zone = ActiveSupport::TimeZone['Moscow']
|
||||
assert_equal "+03:00", zone.formatted_offset
|
||||
assert_equal "+0300", zone.formatted_offset(false)
|
||||
end
|
||||
|
||||
|
||||
def test_formatted_offset_negative
|
||||
zone = TimeZone['Eastern Time (US & Canada)']
|
||||
zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
|
||||
assert_equal "-05:00", zone.formatted_offset
|
||||
assert_equal "-0500", zone.formatted_offset(false)
|
||||
end
|
||||
|
||||
|
||||
def test_formatted_offset_zero
|
||||
zone = TimeZone['London']
|
||||
zone = ActiveSupport::TimeZone['London']
|
||||
assert_equal "+00:00", zone.formatted_offset
|
||||
assert_equal "UTC", zone.formatted_offset(true, 'UTC')
|
||||
end
|
||||
|
||||
|
||||
def test_zone_compare
|
||||
zone1 = TimeZone['Central Time (US & Canada)'] # offset -0600
|
||||
zone2 = TimeZone['Eastern Time (US & Canada)'] # offset -0500
|
||||
zone1 = ActiveSupport::TimeZone['Central Time (US & Canada)'] # offset -0600
|
||||
zone2 = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] # offset -0500
|
||||
assert zone1 < zone2
|
||||
assert zone2 > zone1
|
||||
assert zone1 == zone1
|
||||
end
|
||||
|
||||
|
||||
def test_to_s
|
||||
assert_equal "(GMT+03:00) Moscow", TimeZone['Moscow'].to_s
|
||||
assert_equal "(GMT+03:00) Moscow", ActiveSupport::TimeZone['Moscow'].to_s
|
||||
end
|
||||
|
||||
|
||||
def test_all_sorted
|
||||
all = TimeZone.all
|
||||
all = ActiveSupport::TimeZone.all
|
||||
1.upto( all.length-1 ) do |i|
|
||||
assert all[i-1] < all[i]
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def test_index
|
||||
assert_nil TimeZone["bogus"]
|
||||
assert_instance_of TimeZone, TimeZone["Central Time (US & Canada)"]
|
||||
assert_instance_of TimeZone, TimeZone[8]
|
||||
assert_raises(ArgumentError) { TimeZone[false] }
|
||||
assert_nil ActiveSupport::TimeZone["bogus"]
|
||||
assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone["Central Time (US & Canada)"]
|
||||
assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone[8]
|
||||
assert_raises(ArgumentError) { ActiveSupport::TimeZone[false] }
|
||||
end
|
||||
|
||||
|
||||
def test_new
|
||||
assert_equal TimeZone["Central Time (US & Canada)"], TimeZone.new("Central Time (US & Canada)")
|
||||
assert_equal ActiveSupport::TimeZone["Central Time (US & Canada)"], ActiveSupport::TimeZone.new("Central Time (US & Canada)")
|
||||
end
|
||||
|
||||
|
||||
def test_us_zones
|
||||
assert TimeZone.us_zones.include?(TimeZone["Hawaii"])
|
||||
assert !TimeZone.us_zones.include?(TimeZone["Kuala Lumpur"])
|
||||
end
|
||||
|
||||
assert ActiveSupport::TimeZone.us_zones.include?(ActiveSupport::TimeZone["Hawaii"])
|
||||
assert !ActiveSupport::TimeZone.us_zones.include?(ActiveSupport::TimeZone["Kuala Lumpur"])
|
||||
end
|
||||
|
||||
protected
|
||||
def with_env_tz(new_tz = 'US/Eastern')
|
||||
old_tz, ENV['TZ'] = ENV['TZ'], new_tz
|
||||
yield
|
||||
ensure
|
||||
old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue