aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgbuesing <gbuesing@gmail.com>2008-11-18 09:38:12 -0600
committergbuesing <gbuesing@gmail.com>2008-11-18 09:38:12 -0600
commit1955c164b37342de68306b5d2582d9d2c1776149 (patch)
treea9dd6bb5092ba12c85c2e3de7899cd2347e0f6d0
parent9ad165cb9d4ca5df9b5ba6f01752727427fed949 (diff)
downloadrails-1955c164b37342de68306b5d2582d9d2c1776149.tar.gz
rails-1955c164b37342de68306b5d2582d9d2c1776149.tar.bz2
rails-1955c164b37342de68306b5d2582d9d2c1776149.zip
TimeZone offset tests: use current_period, to ensure TimeZone#utc_offset is up-to-date
-rw-r--r--activesupport/CHANGELOG2
-rw-r--r--activesupport/test/time_zone_test.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 721706c1f7..16d78e0201 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*2.3.0/3.0*
+* TimeZone offset tests: use current_period, to ensure TimeZone#utc_offset is up-to-date [Geoff Buesing]
+
* Update bundled TZInfo to 0.3.12 [Geoff Buesing]
* Added lambda merging to OptionMerger (especially useful with named_scope and with_options) #726 [Paweł Kondzior]
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index d999b9f2a8..60313dc2f7 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -51,7 +51,7 @@ class TimeZoneTest < Test::Unit::TestCase
define_method("test_utc_offset_for_#{name}") do
silence_warnings do # silence warnings raised by tzinfo gem
- period = zone.tzinfo.period_for_utc(Time.utc(2009,1,1,0,0,0))
+ period = zone.tzinfo.current_period
assert_equal period.utc_offset, zone.utc_offset
end
end