diff --git a/activerecord/test/cases/multiple_db_test.rb b/activerecord/test/cases/multiple_db_test.rb index 18c97090c7930..3f05178ab107c 100644 --- a/activerecord/test/cases/multiple_db_test.rb +++ b/activerecord/test/cases/multiple_db_test.rb @@ -57,12 +57,11 @@ def test_associations assert_equal e3.course.id, c2.id end - def test_course_connection_should_survive_dependency_reload + def test_course_connection_should_survive_reloads assert Course.connection - ActiveSupport::Dependencies.clear - Object.send(:remove_const, :Course) - require_dependency "models/course" + assert Object.send(:remove_const, :Course) + assert load("models/course.rb") assert Course.connection end diff --git a/activerecord/test/models/college.rb b/activerecord/test/models/college.rb index 52017dda42cae..2efa4bc42bf62 100644 --- a/activerecord/test/models/college.rb +++ b/activerecord/test/models/college.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_dependency "models/arunit2_model" +require "models/arunit2_model" require "active_support/core_ext/object/with_options" class College < ARUnit2Model diff --git a/activerecord/test/models/course.rb b/activerecord/test/models/course.rb index 4f346124ea51f..5bb3fe9a487aa 100644 --- a/activerecord/test/models/course.rb +++ b/activerecord/test/models/course.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_dependency "models/arunit2_model" +require "models/arunit2_model" class Course < ARUnit2Model belongs_to :college diff --git a/activerecord/test/models/other_dog.rb b/activerecord/test/models/other_dog.rb index a0fda5ae1b3ca..47c1f448ae1fa 100644 --- a/activerecord/test/models/other_dog.rb +++ b/activerecord/test/models/other_dog.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_dependency "models/arunit2_model" +require "models/arunit2_model" class OtherDog < ARUnit2Model self.table_name = "dogs" diff --git a/activerecord/test/models/professor.rb b/activerecord/test/models/professor.rb index abc23f40fff76..fe320226abdb0 100644 --- a/activerecord/test/models/professor.rb +++ b/activerecord/test/models/professor.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_dependency "models/arunit2_model" +require "models/arunit2_model" class Professor < ARUnit2Model has_and_belongs_to_many :courses