aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/belongs_to_associations_test.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-07-31 11:55:24 +0200
committerXavier Noria <fxn@hashref.com>2010-07-31 11:55:24 +0200
commit3d7099891f07395ed889e7da9e13b3ff9244d539 (patch)
tree6a988362ec4a6b58c90a12e6b715cd6926a111ce /activerecord/test/cases/associations/belongs_to_associations_test.rb
parent0e20e3ebc20250174867f33e0ad3972f7e7c76d0 (diff)
parentd3819daaac0d2f730f2b34af31700c914e697375 (diff)
downloadrails-3d7099891f07395ed889e7da9e13b3ff9244d539.tar.gz
rails-3d7099891f07395ed889e7da9e13b3ff9244d539.tar.bz2
rails-3d7099891f07395ed889e7da9e13b3ff9244d539.zip
Merge remote branch 'rails/master'
Diffstat (limited to 'activerecord/test/cases/associations/belongs_to_associations_test.rb')
-rw-r--r--activerecord/test/cases/associations/belongs_to_associations_test.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 4d5769d173..046433820d 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -215,6 +215,10 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
r1.topic = Topic.find(t2.id)
+ assert_no_queries do
+ r1.topic = t2
+ end
+
assert r1.save
assert_equal 0, Topic.find(t1.id).replies.size
assert_equal 1, Topic.find(t2.id).replies.size