Revert "Merge pull request #21994 from mtodd/inherit-scopes"

This reverts commit 60c9701269f5b412849f1a507df61ba4735914d7, reversing
changes made to 6a25202d9ea3b4a7c9f2d6154b97cf8ba58403db.

Reason: Broken build

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)
   }