diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-09 05:58:07 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-09 05:58:07 -0700 |
| commit | 7c6f8f8fd6be19663d02ea418142a346adf73bbd (patch) | |
| tree | 332901b3060ab9645c92157d533648c83258f09e /activerecord | |
| parent | a0c0c1cbc1c092c4488389b9fb2faba5cb21a913 (diff) | |
| parent | be8d8ba8b5d57a59f0f8d17b9c2fab4b98966e52 (diff) | |
| download | rails-7c6f8f8fd6be19663d02ea418142a346adf73bbd.tar.gz rails-7c6f8f8fd6be19663d02ea418142a346adf73bbd.tar.bz2 rails-7c6f8f8fd6be19663d02ea418142a346adf73bbd.zip | |
Merge pull request #12481 from arunagw/fixes
Few fixes which includes revert fixes
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/associations/has_many_through_associations_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb index 5299e4e17e..3b61b91d62 100644 --- a/activerecord/test/cases/associations/has_many_through_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb @@ -785,7 +785,7 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase sarah = Person.create!(:first_name => 'Sarah', :primary_contact_id => people(:susan).id, :gender => 'F', :number1_fan_id => 1) john = Person.create!(:first_name => 'John', :primary_contact_id => sarah.id, :gender => 'M', :number1_fan_id => 1) assert_equal sarah.agents, [john] - assert_equal people(:susan).agents.map(&:agents).flatten, people(:susan).agents_of_agents + assert_equal people(:susan).agents.flat_map(&:agents), people(:susan).agents_of_agents end def test_associate_existing_with_nonstandard_primary_key_on_belongs_to |