diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-06-01 15:57:29 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 15:57:29 +0930 |
| commit | f52fde15e1d3f0bd31c20e101e8f64930d671505 (patch) | |
| tree | 5d3c87869376b18f4a179490662076cdd7539629 /activerecord/test/cases | |
| parent | d83558249c69577c3145c1db64870de98411a612 (diff) | |
| parent | c11109da934d71b1d0a139da36e52423844fa36e (diff) | |
| download | rails-f52fde15e1d3f0bd31c20e101e8f64930d671505.tar.gz rails-f52fde15e1d3f0bd31c20e101e8f64930d671505.tar.bz2 rails-f52fde15e1d3f0bd31c20e101e8f64930d671505.zip | |
Merge pull request #29293 from kamipo/fix_sti_with_default_scope
Fix `default_scoped` with defined `default_scope` on STI model
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/inheritance_test.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb index b4bbdc6dad..fb5a7bcc31 100644 --- a/activerecord/test/cases/inheritance_test.rb +++ b/activerecord/test/cases/inheritance_test.rb @@ -1,6 +1,7 @@ require "cases/helper" require "models/author" require "models/company" +require "models/membership" require "models/person" require "models/post" require "models/project" @@ -29,7 +30,7 @@ end class InheritanceTest < ActiveRecord::TestCase include InheritanceTestHelper - fixtures :companies, :projects, :subscribers, :accounts, :vegetables + fixtures :companies, :projects, :subscribers, :accounts, :vegetables, :memberships def test_class_with_store_full_sti_class_returns_full_name with_store_full_sti_class do @@ -435,6 +436,10 @@ class InheritanceTest < ActiveRecord::TestCase assert_nothing_raised { Company.of_first_firm } assert_nothing_raised { Client.of_first_firm } end + + def test_inheritance_with_default_scope + assert_equal 1, SelectedMembership.count(:all) + end end class InheritanceComputeTypeTest < ActiveRecord::TestCase |