kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #42239 from eileencodes/fix-primary-abstract-class-in-lazy-loaded-env

Browse source 
Fix primary_abstract_class in lazy loaded envs
This commit is contained in:
Eileen M. Uchitelle 2021-05-17 15:26:46 -04:00 committed by GitHub
commit 5ddff2beb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
activerecord/lib/active_record/core.rb
View file

@ -209,7 +209,6 @@ module ActiveRecord
self == Base.application_record_class
else
if defined?(ApplicationRecord) && self == ApplicationRecord
Base.application_record_class = self
true
end
end

21
activerecord/test/cases/primary_class_test.rb
View file

@ -79,6 +79,27 @@ class PrimaryClassTest < ActiveRecord::TestCase
Object.send(:remove_const, :ApplicationRecord)
end
def test_setting_primary_abstract_class_explicitly_wins_over_application_record_set_implicitly
Object.const_set(:ApplicationRecord, ApplicationRecord)
assert_predicate ApplicationRecord, :primary_class?
assert_predicate ApplicationRecord, :application_record_class?
assert_predicate ApplicationRecord, :abstract_class?
PrimaryClassTest::PrimaryAppRecord.primary_abstract_class
assert_predicate PrimaryClassTest::PrimaryAppRecord, :primary_class?
assert_predicate PrimaryClassTest::PrimaryAppRecord, :application_record_class?
assert_predicate PrimaryClassTest::PrimaryAppRecord, :abstract_class?
assert_not_predicate ApplicationRecord, :primary_class?
assert_not_predicate ApplicationRecord, :application_record_class?
assert_predicate ApplicationRecord, :abstract_class?
ensure
ActiveRecord::Base.application_record_class = nil
Object.send(:remove_const, :ApplicationRecord)
end
unless in_memory_db?
def test_application_record_shares_a_connection_with_active_record_by_default
Object.const_set(:ApplicationRecord, ApplicationRecord)