diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-19 19:37:36 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-19 19:37:36 -0300 |
| commit | aa5512299041efb923cd582fd26009a72b9ec670 (patch) | |
| tree | 4ba3cd70b4988293b99a89b72f0dbb177426a9f0 /activerecord/test/cases/associations | |
| parent | 1cc44599397e061901cd59233397129625839a60 (diff) | |
| parent | d8fffe7b23acce42bc3941d7bba47e07a66aed67 (diff) | |
| download | rails-aa5512299041efb923cd582fd26009a72b9ec670.tar.gz rails-aa5512299041efb923cd582fd26009a72b9ec670.tar.bz2 rails-aa5512299041efb923cd582fd26009a72b9ec670.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/test/cases/associations')
| -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 c9baef5f7e..4254badef2 100644 --- a/activerecord/test/cases/associations/has_many_through_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb @@ -13,7 +13,7 @@ require 'models/pet' require 'models/toy' class HasManyThroughAssociationsTest < ActiveRecord::TestCase - fixtures :posts, :readers, :people, :comments, :authors, :owners, :pets, :toys + fixtures :posts, :readers, :people, :comments, :authors, :owners, :pets, :toys, :jobs, :references def test_associate_existing assert_queries(2) { posts(:thinking);people(:david) } |