Merge pull request #15557 from sgrif/sg-specify-time-zone

Specify a time zone when testing TZ aware attributes

1 files changed, 10 insertions, 5 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index 90b72563fa..c78c502478 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -2,6 +2,8 @@
 require "cases/helper"
 
 class PostgresqlArrayTest < ActiveRecord::TestCase
+  include InTimeZone
+
   class PgArray < ActiveRecord::Base
     self.table_name = 'pg_arrays'
   end
@@ -197,17 +199,20 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
   end
 
   def test_datetime_with_timezone_awareness
-    with_timezone_config aware_attributes: true do
+    tz = "Pacific Time (US & Canada)"
+
+    in_time_zone tz do
       PgArray.reset_column_information
-      current_time = [Time.current]
+      time_string = Time.current.to_s
+      time = Time.zone.parse(time_string)
 
-      record = PgArray.new(datetimes: current_time)
-      assert_equal current_time, record.datetimes
+      record = PgArray.new(datetimes: [time_string])
+      assert_equal [time], record.datetimes
 
       record.save!
       record.reload
 
-      assert_equal current_time, record.datetimes
+      assert_equal [time], record.datetimes
     end
   end