diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-03-22 07:25:24 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-03-22 07:25:24 -0700 |
| commit | 029dd435e4e13eb4c9490fc0d65f5f976bdffa0a (patch) | |
| tree | 27f9d2d0023b711eb5050da165a967a328861a23 | |
| parent | ae2baab1aa278c065dc742a3ffe65c65a7b87dc9 (diff) | |
| parent | 845cc5c78d409a9cad589be09dda100f96544610 (diff) | |
| download | rails-029dd435e4e13eb4c9490fc0d65f5f976bdffa0a.tar.gz rails-029dd435e4e13eb4c9490fc0d65f5f976bdffa0a.tar.bz2 rails-029dd435e4e13eb4c9490fc0d65f5f976bdffa0a.zip | |
Merge pull request #9873 from senny/use_old_hash_syntax
use ruby 1.8 Hash syntax [ci skip]
| -rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 2 |
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 490aafa86d..42061d3d73 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -1120,7 +1120,7 @@ class EagerAssociationTest < ActiveRecord::TestCase end test "preloading a through association twice does not reset it" do - members = Member.includes(current_membership: :club).includes(:club).to_a + members = Member.includes(:current_membership => :club).includes(:club).to_a assert_no_queries { assert_equal 3, members.map(&:current_membership).map(&:club).size } |