diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-30 20:47:26 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-30 20:47:26 +0200 |
| commit | c63cf7bf0db708fe46a929cf57649ab5a92034af (patch) | |
| tree | 8f0974852b51597652e6ae73da26f3eb80fe878b /activesupport/test/core_ext | |
| parent | 52c56f9f7ec46ee39f1a6319ff4017e2492683ed (diff) | |
| parent | b07e6fdaa0aa07016d1425ada5b7f966142d0212 (diff) | |
| download | rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.tar.gz rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.tar.bz2 rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activesupport/test/core_ext')
| -rw-r--r-- | activesupport/test/core_ext/time_with_zone_test.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb index cf11f4d28f..5ce4277672 100644 --- a/activesupport/test/core_ext/time_with_zone_test.rb +++ b/activesupport/test/core_ext/time_with_zone_test.rb @@ -832,9 +832,7 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase def test_time_zone_setter_with_invalid_zone Time.zone = 'foo' - assert_not_nil Time.zone - assert_equal 'foo', Time.zone.name - assert_raise(TZInfo::InvalidTimezoneIdentifier) { Time.zone.utc_offset } + assert_nil Time.zone Time.zone = -15.hours assert_nil Time.zone |