aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2013-04-03 09:56:43 -0700
committerDavid Heinemeier Hansson <david@loudthinking.com>2013-04-03 09:56:43 -0700
commit9035cfc0dfc2a34b27df926afd6dd1b7862c1076 (patch)
tree0837534502212349cef63fb46a4329e519885002 /activerecord/test
parentdb924e1257f37dff441fee7c6e2bbd8ba382d7a6 (diff)
parent8fccbc1ad4fff215c63d17b9321fc69ad17e89dc (diff)
downloadrails-9035cfc0dfc2a34b27df926afd6dd1b7862c1076.tar.gz
rails-9035cfc0dfc2a34b27df926afd6dd1b7862c1076.tar.bz2
rails-9035cfc0dfc2a34b27df926afd6dd1b7862c1076.zip
Merge pull request #9141 from adamgamble/issue-9091
belongs_to :touch should touch old record when transitioning.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/timestamp_test.rb26
-rw-r--r--activerecord/test/fixtures/toys.yml4
2 files changed, 30 insertions, 0 deletions
diff --git a/activerecord/test/cases/timestamp_test.rb b/activerecord/test/cases/timestamp_test.rb
index 777a2b70dd..0c13bb946a 100644
--- a/activerecord/test/cases/timestamp_test.rb
+++ b/activerecord/test/cases/timestamp_test.rb
@@ -176,6 +176,32 @@ class TimestampTest < ActiveRecord::TestCase
assert_not_equal time, owner.updated_at
end
+ def test_changing_parent_of_a_record_touches_both_new_and_old_parent_record
+ klass = Class.new(ActiveRecord::Base) do
+ def self.name; 'Toy'; end
+ belongs_to :pet, touch: true
+ end
+
+ toy1 = klass.find(1)
+ old_pet = toy1.pet
+
+ toy2 = klass.find(2)
+ new_pet = toy2.pet
+ time = 3.days.ago
+
+ old_pet.update_columns(updated_at: time)
+ new_pet.update_columns(updated_at: time)
+
+ toy1.pet = new_pet
+ toy1.save!
+
+ old_pet.reload
+ new_pet.reload
+
+ assert_not_equal time, new_pet.updated_at
+ assert_not_equal time, old_pet.updated_at
+ end
+
def test_timestamp_attributes_for_create
toy = Toy.first
assert_equal toy.send(:timestamp_attributes_for_create), [:created_at, :created_on]
diff --git a/activerecord/test/fixtures/toys.yml b/activerecord/test/fixtures/toys.yml
index 037e335e0a..07ed75e98e 100644
--- a/activerecord/test/fixtures/toys.yml
+++ b/activerecord/test/fixtures/toys.yml
@@ -2,3 +2,7 @@ bone:
toy_id: 1
name: Bone
pet_id: 1
+doll:
+ toy_id: 2
+ name: Doll
+ pet_id: 2