From b04051d4e0c8066ec79cd4978606e4728dfa6ffa Mon Sep 17 00:00:00 2001 From: Dmitry Vorotilin Date: Fri, 1 Mar 2013 02:32:38 +0400 Subject: Fix ActiveRecord `subclass_from_attrs` when eager_load is false. It cannot find subclass because all classes are loaded automatically when it needs. --- activerecord/test/cases/inheritance_test.rb | 11 +++++++++++ activerecord/test/models/autoloadable/extra_firm.rb | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 activerecord/test/models/autoloadable/extra_firm.rb (limited to 'activerecord/test') 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 diff --git a/activerecord/test/models/autoloadable/extra_firm.rb b/activerecord/test/models/autoloadable/extra_firm.rb new file mode 100644 index 0000000000..5578ba0d9b --- /dev/null +++ b/activerecord/test/models/autoloadable/extra_firm.rb @@ -0,0 +1,2 @@ +class ExtraFirm < Company +end -- cgit v1.2.3