diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-12-24 00:14:46 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-12-26 19:38:04 +0000 |
| commit | f2230c06edf9c1ca72892bbe00e816be1dafa840 (patch) | |
| tree | 2a67ed902f4acf0666873ff2cc2b51916a0178e5 | |
| parent | 7021b6b851c1567a73eae5e74eba437a52b112bf (diff) | |
| download | rails-f2230c06edf9c1ca72892bbe00e816be1dafa840.tar.gz rails-f2230c06edf9c1ca72892bbe00e816be1dafa840.tar.bz2 rails-f2230c06edf9c1ca72892bbe00e816be1dafa840.zip | |
Fix dodgy tests which were effectively asserting nil == nil
| -rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 6 | ||||
| -rw-r--r-- | activerecord/test/fixtures/companies.yml | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index 6efb0d57e4..ad7eb6e4e6 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -886,15 +886,15 @@ class EagerAssociationTest < ActiveRecord::TestCase end def test_preload_has_one_using_primary_key - expected = Firm.find(:first).account_using_primary_key - firm = Firm.find :first, :include => :account_using_primary_key + expected = accounts(:signals37) + firm = Firm.find :first, :include => :account_using_primary_key, :order => 'companies.id' assert_no_queries do assert_equal expected, firm.account_using_primary_key end end def test_include_has_one_using_primary_key - expected = Firm.find(1).account_using_primary_key + expected = accounts(:signals37) firm = Firm.find(:all, :include => :account_using_primary_key, :order => 'accounts.id').detect {|f| f.id == 1} assert_no_queries do assert_equal expected, firm.account_using_primary_key diff --git a/activerecord/test/fixtures/companies.yml b/activerecord/test/fixtures/companies.yml index 30b73d8e84..c75bc5dad3 100644 --- a/activerecord/test/fixtures/companies.yml +++ b/activerecord/test/fixtures/companies.yml @@ -13,6 +13,7 @@ first_firm: type: Firm name: 37signals ruby_type: Firm + firm_id: 1 second_client: id: 3 |