1 files changed, 14 insertions, 4 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/infinity_test.rb b/activerecord/test/cases/adapters/postgresql/infinity_test.rb
index 30404cd181..74163ac712 100644
--- a/activerecord/test/cases/adapters/postgresql/infinity_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/infinity_test.rb
@@ -1,6 +1,8 @@
 require "cases/helper"
 
 class PostgresqlInfinityTest < ActiveRecord::TestCase
+  include InTimeZone
+
   class PostgresqlInfinity < ActiveRecord::Base
   end
 
@@ -42,9 +44,17 @@ class PostgresqlInfinityTest < ActiveRecord::TestCase
     assert_equal Float::INFINITY, record.datetime
   end
 
-  test "assigning 'infinity' on a datetime column" do
-    record = PostgresqlInfinity.create!(datetime: "infinity")
-    assert_equal Float::INFINITY, record.datetime
-    assert_equal record.datetime, record.reload.datetime
+  test "assigning 'infinity' on a datetime column with TZ aware attributes" do
+    begin
+      in_time_zone "Pacific Time (US & Canada)" do
+        record = PostgresqlInfinity.create!(datetime: "infinity")
+        assert_equal Float::INFINITY, record.datetime
+        assert_equal record.datetime, record.reload.datetime
+      end
+    ensure
+      # setting time_zone_aware_attributes causes the types to change.
+      # There is no way to do this automatically since it can be set on a superclass
+      PostgresqlInfinity.reset_column_information
+    end
   end
 end