diff options
| author | Prem Sichanugrist <s@sikac.hu> | 2013-10-03 14:05:23 -0400 |
|---|---|---|
| committer | Prem Sichanugrist <s@sikac.hu> | 2013-10-03 14:11:12 -0400 |
| commit | 68421f330b50f39ff58148dc2e734597be8abeef (patch) | |
| tree | 2e37b8c034d7d2828e6f465fde61c50c1ce5b697 | |
| parent | c48c111bb2aa13d72f5ae6cf7d51a921766c7dfe (diff) | |
| download | rails-68421f330b50f39ff58148dc2e734597be8abeef.tar.gz rails-68421f330b50f39ff58148dc2e734597be8abeef.tar.bz2 rails-68421f330b50f39ff58148dc2e734597be8abeef.zip | |
Port test from cf1904f to avoid future regression
Related issue: #11939, #12084
| -rw-r--r-- | activerecord/test/cases/inheritance_test.rb | 6 | ||||
| -rw-r--r-- | activerecord/test/models/company.rb | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb index a9be132801..73cf99a5d7 100644 --- a/activerecord/test/cases/inheritance_test.rb +++ b/activerecord/test/cases/inheritance_test.rb @@ -313,8 +313,12 @@ class InheritanceTest < ActiveRecord::TestCase assert_kind_of SpecialSubscriber, SpecialSubscriber.find("webster132") assert_nothing_raised { s = SpecialSubscriber.new("name" => "And breaaaaathe!"); s.id = 'roger'; s.save } end -end + def test_scope_inherited_properly + assert_nothing_raised { Company.of_first_firm } + assert_nothing_raised { Client.of_first_firm } + end +end class InheritanceComputeTypeTest < ActiveRecord::TestCase fixtures :companies diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb index 1aa77f95bf..0b0b304121 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -11,6 +11,11 @@ class Company < AbstractCompany has_many :contracts has_many :developers, :through => :contracts + scope :of_first_firm, lambda { + joins(:account => :firm). + where('firms.id' => 1) + } + def arbitrary_method "I am Jack's profound disappointment" end |