4 files changed, 72 insertions, 11 deletions
diff --git a/activerecord/test/cases/integration_test.rb b/activerecord/test/cases/integration_test.rb
index 2e71b1a40d..dfb8a608cb 100644
--- a/activerecord/test/cases/integration_test.rb
+++ b/activerecord/test/cases/integration_test.rb
@@ -3,12 +3,11 @@
 require 'cases/helper'
 require 'models/company'
 require 'models/developer'
-require 'models/car'
-require 'models/bulb'
 require 'models/owner'
+require 'models/pet'
 
 class IntegrationTest < ActiveRecord::TestCase
-  fixtures :companies, :developers, :owners
+  fixtures :companies, :developers, :owners, :pets
 
   def test_to_param_should_return_string
     assert_kind_of String, Client.first.to_param
@@ -91,13 +90,14 @@ class IntegrationTest < ActiveRecord::TestCase
   end
 
   def test_cache_key_changes_when_child_touched
-    car = Car.create
-    Bulb.create(car: car)
+    owner = owners(:blackbeard)
+    pet   = pets(:parrot)
+
+    owner.update_column :updated_at, Time.current
+    key = owner.cache_key
 
-    key = car.cache_key
-    car.bulb.touch
-    car.reload
-    assert_not_equal key, car.cache_key
+    assert pet.touch
+    assert_not_equal key, owner.reload.cache_key
   end
 
   def test_cache_key_format_for_existing_record_with_nil_updated_timestamps
diff --git a/activerecord/test/cases/transaction_callbacks_test.rb b/activerecord/test/cases/transaction_callbacks_test.rb
index 5644a35385..fe0781b7ec 100644
--- a/activerecord/test/cases/transaction_callbacks_test.rb
+++ b/activerecord/test/cases/transaction_callbacks_test.rb
@@ -1,9 +1,11 @@
 require "cases/helper"
+require 'models/owner'
+require 'models/pet'
 require 'models/topic'
 
 class TransactionCallbacksTest < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
-  fixtures :topics
+  fixtures :topics, :owners, :pets
 
   class ReplyWithCallbacks < ActiveRecord::Base
     self.table_name = :topics
@@ -120,6 +122,18 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
     assert_equal [], reply.history
   end
 
+  def test_only_call_after_commit_on_update_after_transaction_commits_for_existing_record_on_touch
+    @first.after_commit_block(:create){|r| r.history << :commit_on_create}
+    @first.after_commit_block(:update){|r| r.history << :commit_on_update}
+    @first.after_commit_block(:destroy){|r| r.history << :commit_on_destroy}
+    @first.after_rollback_block(:create){|r| r.history << :rollback_on_create}
+    @first.after_rollback_block(:update){|r| r.history << :rollback_on_update}
+    @first.after_rollback_block(:destroy){|r| r.history << :rollback_on_destroy}
+
+    @first.touch
+    assert_equal [:commit_on_update], @first.history
+  end
+
   def test_call_after_rollback_after_transaction_rollsback
     @first.after_commit_block{|r| r.history << :after_commit}
     @first.after_rollback_block{|r| r.history << :after_rollback}
@@ -148,6 +162,22 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
     assert_equal [:rollback_on_update], @first.history
   end
 
+  def test_only_call_after_rollback_on_update_after_transaction_rollsback_for_existing_record_on_touch
+    @first.after_commit_block(:create){|r| r.history << :commit_on_create}
+    @first.after_commit_block(:update){|r| r.history << :commit_on_update}
+    @first.after_commit_block(:destroy){|r| r.history << :commit_on_destroy}
+    @first.after_rollback_block(:create){|r| r.history << :rollback_on_create}
+    @first.after_rollback_block(:update){|r| r.history << :rollback_on_update}
+    @first.after_rollback_block(:destroy){|r| r.history << :rollback_on_destroy}
+
+    Topic.transaction do
+      @first.touch
+      raise ActiveRecord::Rollback
+    end
+
+    assert_equal [:rollback_on_update], @first.history
+  end
+
   def test_only_call_after_rollback_on_destroy_after_transaction_rollsback_for_destroyed_record
     @first.after_commit_block(:create){|r| r.history << :commit_on_create}
     @first.after_commit_block(:update){|r| r.history << :commit_on_update}
@@ -279,6 +309,21 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
   def test_after_commit_callbacks_should_validate_on_condition
     assert_raise(ArgumentError) { Topic.send(:after_commit, :on => :save) }
   end
+
+  def test_saving_a_record_with_a_belongs_to_that_specifies_touching_the_parent_should_call_callbacks_on_the_parent_object
+    pet   = Pet.first
+    owner = pet.owner
+    flag = false
+
+    owner.on_after_commit do
+      flag = true
+    end
+
+    pet.name = "Fluffy the Third"
+    pet.save
+
+    assert flag
+  end
 end
 
 class CallbacksOnMultipleActionsTest < ActiveRecord::TestCase
diff --git a/activerecord/test/models/car.rb b/activerecord/test/models/car.rb
index c4a15a79e2..db0f93f63b 100644
--- a/activerecord/test/models/car.rb
+++ b/activerecord/test/models/car.rb
@@ -15,7 +15,6 @@ class Car < ActiveRecord::Base
   scope :incl_engines, -> { includes(:engines) }
 
   scope :order_using_new_style,  -> { order('name asc') }
-
 end
 
 class CoolCar < Car
diff --git a/activerecord/test/models/owner.rb b/activerecord/test/models/owner.rb
index 1c7ed4aa3e..cf24502d3a 100644
--- a/activerecord/test/models/owner.rb
+++ b/activerecord/test/models/owner.rb
@@ -2,4 +2,21 @@ class Owner < ActiveRecord::Base
   self.primary_key = :owner_id
   has_many :pets, -> { order 'pets.name desc' }
   has_many :toys, :through => :pets
+
+  after_commit :execute_blocks
+
+  def blocks
+    @blocks ||= []
+  end
+
+  def on_after_commit(&block)
+    blocks << block
+  end
+
+  def execute_blocks
+    blocks.each do |block|
+      block.call(self)
+    end
+    @blocks = []
+  end
 end