aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-06-15 06:27:19 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-06-15 06:27:19 -0700
commitfe01752418cec61893f1d0c39aa29e6d9f5bcf4a (patch)
treef1de842a52630d075532fa0f416b59e1ec5b973e /activerecord
parent00519985f3a8091c41f9038db72bb7129e5bb37d (diff)
parente9177816ff9138aa9260f9fe216e1b424177dc0d (diff)
downloadrails-fe01752418cec61893f1d0c39aa29e6d9f5bcf4a.tar.gz
rails-fe01752418cec61893f1d0c39aa29e6d9f5bcf4a.tar.bz2
rails-fe01752418cec61893f1d0c39aa29e6d9f5bcf4a.zip
Merge pull request #10533 from vipulnsward/fix_test
Fix test, addresss => address
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/associations/eager_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 4aa6567d85..1cfaf552af 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -250,7 +250,8 @@ class EagerAssociationTest < ActiveRecord::TestCase
assert_nil Post.all.merge!(:includes => :author).find(posts(:authorless).id).author
end
- def test_nested_loading_with_no_associations
+ # Regression test for 21c75e5
+ def test_nested_loading_does_not_raise_exception_when_association_does_not_exist
assert_nothing_raised do
Post.all.merge!(:includes => {:author => :author_addresss}).find(posts(:authorless).id)
end