diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-10-27 01:12:03 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-10-27 01:12:03 -0200 |
commit | 8e57ed1a39f69a710be530cbfd90fc8c681b1d01 (patch) | |
tree | 58a06d14438376f68295dc72eb06b2ccca7e8ebf /activerecord/test/cases | |
parent | 60c9701269f5b412849f1a507df61ba4735914d7 (diff) | |
download | rails-8e57ed1a39f69a710be530cbfd90fc8c681b1d01.tar.gz rails-8e57ed1a39f69a710be530cbfd90fc8c681b1d01.tar.bz2 rails-8e57ed1a39f69a710be530cbfd90fc8c681b1d01.zip |
Revert "Merge pull request #21994 from mtodd/inherit-scopes"
This reverts commit 60c9701269f5b412849f1a507df61ba4735914d7, reversing
changes made to 6a25202d9ea3b4a7c9f2d6154b97cf8ba58403db.
Reason: Broken build
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/inheritance_test.rb | 4 |
1 files changed, 2 insertions, 2 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 |