diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-08 11:59:29 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-08 11:59:29 -0300 |
commit | 74d24ea1fe4f83bb7ae7c7b5aa1af82a1592c841 (patch) | |
tree | ac01f0d7c70d54a2b45a68bb228f42b8be19bb66 /activerecord/test/cases | |
parent | dd1d309fa9c158607a35fee2c18b477728811ad8 (diff) | |
parent | b04051d4e0c8066ec79cd4978606e4728dfa6ffa (diff) | |
download | rails-74d24ea1fe4f83bb7ae7c7b5aa1af82a1592c841.tar.gz rails-74d24ea1fe4f83bb7ae7c7b5aa1af82a1592c841.tar.bz2 rails-74d24ea1fe4f83bb7ae7c7b5aa1af82a1592c841.zip |
Merge pull request #9497 from route/subclass_from_attrs
Fix ActiveRecord `subclass_from_attrs` when eager_load is false.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/inheritance_test.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb index 189066eb41..b91146db4e 100644 --- a/activerecord/test/cases/inheritance_test.rb +++ b/activerecord/test/cases/inheritance_test.rb @@ -179,6 +179,17 @@ class InheritanceTest < ActiveRecord::TestCase assert_raise(ActiveRecord::SubclassNotFound) { Company.new(:type => 'Account') } end + def test_new_with_autoload_paths + path = File.expand_path('../../models/autoloadable', __FILE__) + ActiveSupport::Dependencies.autoload_paths << path + + firm = Company.new(:type => 'ExtraFirm') + assert_equal ExtraFirm, firm.class + ensure + ActiveSupport::Dependencies.autoload_paths.reject! { |p| p == path } + ActiveSupport::Dependencies.clear + end + def test_inheritance_condition assert_equal 10, Company.count assert_equal 2, Firm.count |