aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-02-25 10:18:55 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-02-25 10:18:55 -0300
commitfa8a78d12ee470eb29d314a4f9ae5318bad4ae09 (patch)
treeca7c545af3f5cbcd56225e420db06b5191c06c53
parent2b7b5f535cac4b2e17955e23d05604388ef72c04 (diff)
downloadrails-fa8a78d12ee470eb29d314a4f9ae5318bad4ae09.tar.gz
rails-fa8a78d12ee470eb29d314a4f9ae5318bad4ae09.tar.bz2
rails-fa8a78d12ee470eb29d314a4f9ae5318bad4ae09.zip
:scissors:
-rw-r--r--activerecord/test/cases/associations/eager_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 46f3c38ac5..6ed3cb7b58 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -218,7 +218,7 @@ class EagerAssociationTest < ActiveRecord::TestCase
def test_finding_with_includes_on_null_belongs_to_association_with_same_include_includes_only_once
post = posts(:welcome)
post.update!(author: nil)
- post = assert_queries(1) { Post.all.merge!(includes: {author_with_address: :author_address}).find(post.id) }
+ post = assert_queries(1) { Post.all.merge!(includes: {author_with_address: :author_address}).find(post.id) }
# find the post, then find the author which is null so no query for the author or address
assert_no_queries do
assert_equal nil, post.author_with_address