diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:06 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-17 19:46:06 -0300 |
| commit | c01c8967a02537f132d437d5ae15332982119651 (patch) | |
| tree | 76ed47f6bffd5fe1aa11c65cd32b222d881f43aa /activerecord/test/cases/associations | |
| parent | 770fca10fba68fa14308f33e923493e6f63bfa35 (diff) | |
| parent | ccf28d2499d1b4e2aba41291eb800e0e02120923 (diff) | |
| download | rails-c01c8967a02537f132d437d5ae15332982119651.tar.gz rails-c01c8967a02537f132d437d5ae15332982119651.tar.bz2 rails-c01c8967a02537f132d437d5ae15332982119651.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/calculations.rb
Diffstat (limited to 'activerecord/test/cases/associations')
| -rw-r--r-- | activerecord/test/cases/associations/join_model_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb index c035600e69..e9af5a60d8 100644 --- a/activerecord/test/cases/associations/join_model_test.rb +++ b/activerecord/test/cases/associations/join_model_test.rb @@ -381,7 +381,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase end def test_has_many_through_polymorphic_has_one - assert_equal Tagging.find(1,2), authors(:david).tagging + assert_equal Tagging.find(1,2).sort_by { |t| t.id }, authors(:david).tagging end def test_has_many_through_polymorphic_has_many |