2 files changed, 16 insertions, 46 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/infinity_test.rb b/activerecord/test/cases/adapters/postgresql/infinity_test.rb
index 22e8873333..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
 
@@ -41,4 +43,18 @@ class PostgresqlInfinityTest < ActiveRecord::TestCase
     record.reload
     assert_equal Float::INFINITY, record.datetime
   end
+
+  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
diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb
index e3c3c2fcdf..d4cc081f32 100644
--- a/activerecord/test/cases/callbacks_test.rb
+++ b/activerecord/test/cases/callbacks_test.rb
@@ -59,27 +59,6 @@ class ChildDeveloper < ParentDeveloper
 
 end
 
-class RecursiveCallbackDeveloper < ActiveRecord::Base
-  self.table_name = 'developers'
-
-  before_save :on_before_save
-  after_save :on_after_save
-
-  attr_reader :on_before_save_called, :on_after_save_called
-
-  def on_before_save
-    @on_before_save_called ||= 0
-    @on_before_save_called += 1
-    save unless @on_before_save_called > 1
-  end
-
-  def on_after_save
-    @on_after_save_called ||= 0
-    @on_after_save_called += 1
-    save unless @on_after_save_called > 1
-  end
-end
-
 class ImmutableDeveloper < ActiveRecord::Base
   self.table_name = 'developers'
 
@@ -88,37 +67,12 @@ class ImmutableDeveloper < ActiveRecord::Base
   before_save :cancel
   before_destroy :cancel
 
-  def cancelled?
-    @cancelled == true
-  end
-
   private
     def cancel
-      @cancelled = true
       false
     end
 end
 
-class ImmutableMethodDeveloper < ActiveRecord::Base
-  self.table_name = 'developers'
-
-  validates_inclusion_of :salary, :in => 50000..200000
-
-  def cancelled?
-    @cancelled == true
-  end
-
-  before_save do
-    @cancelled = true
-    false
-  end
-
-  before_destroy do
-    @cancelled = true
-    false
-  end
-end
-
 class OnCallbacksDeveloper < ActiveRecord::Base
   self.table_name = 'developers'