prevent global timezone state from leaking out of test cases.

1 files changed, 4 insertions, 10 deletions

diff --git a/activerecord/test/cases/yaml_serialization_test.rb b/activerecord/test/cases/yaml_serialization_test.rb
index 302913e095..83a710b1b7 100644
--- a/activerecord/test/cases/yaml_serialization_test.rb
+++ b/activerecord/test/cases/yaml_serialization_test.rb
@@ -5,16 +5,10 @@ class YamlSerializationTest < ActiveRecord::TestCase
   fixtures :topics
 
   def test_to_yaml_with_time_with_zone_should_not_raise_exception
-    tz = Time.zone
-    Time.zone = ActiveSupport::TimeZone["Pacific Time (US & Canada)"]
-    ActiveRecord::Base.time_zone_aware_attributes = true
-
-    topic = Topic.new(:written_on => DateTime.now)
-    assert_nothing_raised { topic.to_yaml }
-
-  ensure
-    Time.zone = tz
-    ActiveRecord::Base.time_zone_aware_attributes = false
+    with_timezone_config aware_attributes: true, zone: "Pacific Time (US & Canada)" do
+      topic = Topic.new(:written_on => DateTime.now)
+      assert_nothing_raised { topic.to_yaml }
+    end
   end
 
   def test_roundtrip