aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-25 19:08:14 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-25 19:08:14 -0700
commite82cecae351a514c87a05eeeabf55f6bdfb0f280 (patch)
tree492cc58936de3229d4941bac3a3b7ed9018b9f2e /activerecord/test/cases
parentfdc3c08e55dff879f154eef6dc6227ca3b50e2de (diff)
parente1bb9fc671a8d33fb70f94f094bc5644e9c81a18 (diff)
downloadrails-e82cecae351a514c87a05eeeabf55f6bdfb0f280.tar.gz
rails-e82cecae351a514c87a05eeeabf55f6bdfb0f280.tar.bz2
rails-e82cecae351a514c87a05eeeabf55f6bdfb0f280.zip
Merge pull request #12364 from arthurnn/test_fix_validate
Fix query counters when testing with IdentityMap on 3.2
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/associations/has_many_associations_test.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index 0a35012e67..eec78f95c5 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -656,7 +656,9 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
def test_inverse_on_before_validate
firm = companies(:first_firm)
assert_queries(1) do
- firm.clients_of_firm << Client.new("name" => "Natural Company")
+ client = Client.new("name" => "Natural Company")
+ client.touch_firm_on_validate = true
+ firm.clients_of_firm << client
end
end