diff options
| -rw-r--r-- | activerecord/test/cases/inheritance_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/models/company.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb index 2d939dc3d7..f67d85603a 100644 --- a/activerecord/test/cases/inheritance_test.rb +++ b/activerecord/test/cases/inheritance_test.rb @@ -352,8 +352,8 @@ class InheritanceTest < ActiveRecord::TestCase end def test_scope_inherited_properly - assert_nothing_raised { Company.of_first_firm.to_sql } - assert_nothing_raised { Client.of_first_firm.to_sql } + assert_nothing_raised { Company.of_first_firm } + assert_nothing_raised { Client.of_first_firm } end end diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb index dd890909ab..1dcd9fc21e 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -12,7 +12,7 @@ class Company < AbstractCompany has_many :developers, :through => :contracts scope :of_first_firm, lambda { - joins(:accounts => :firm). + joins(:account => :firm). where('firms.id' => 1) } |