Switch to TimezoneProxy for later support of deferred TZ loading

2 files changed, 9 insertions, 6 deletions

diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index d88f79ae4f..a808a25821 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -823,9 +823,12 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
     assert_equal(-18_000, Time.zone.utc_offset)
   end
 
-  def test_time_zone_setter_with_non_identifying_argument_returns_nil
+  def test_time_zone_setter_with_invalid_zone
     Time.zone = 'foo'
-    assert_equal nil, Time.zone
+    assert_not_nil Time.zone
+    assert_equal 'foo', Time.zone.name
+    assert_raise(TZInfo::InvalidTimezoneIdentifier) { Time.zone.utc_offset }
+
     Time.zone = -15.hours
     assert_equal nil, Time.zone
   end
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index 3b7fbb7808..516da7a14c 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -268,16 +268,16 @@ class TimeZoneTest < Test::Unit::TestCase
   end
 
   def test_index
-    assert_nil ActiveSupport::TimeZone["bogus"]
+    assert_not_nil ActiveSupport::TimeZone["bogus"]
     assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone["Central Time (US & Canada)"]
     assert_instance_of ActiveSupport::TimeZone, ActiveSupport::TimeZone[8]
     assert_raise(ArgumentError) { ActiveSupport::TimeZone[false] }
   end
 
-  def test_unknown_zone_shouldnt_have_tzinfo_nor_utc_offset
+  def test_unknown_zone_should_have_tzinfo_but_exception_on_utc_offset
     zone = ActiveSupport::TimeZone.create("bogus")
-    assert_nil zone.tzinfo
-    assert_nil zone.utc_offset
+    assert_instance_of TZInfo::TimezoneProxy, zone.tzinfo
+    assert_raise(TZInfo::InvalidTimezoneIdentifier) { zone.utc_offset }
   end
 
   def test_unknown_zone_with_utc_offset