Fix Rails edge tests

state-machines · May 5, 2023 · c4c4a2a · c4c4a2a
1 parent b8eeac1
commit c4c4a2a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/test/machine_with_event_attributes_on_autosave_test.rb b/test/machine_with_event_attributes_on_autosave_test.rb
@@ -42,7 +42,7 @@ def teardown
       remove_const('Vehicle')
       remove_const('Owner')
     end
-    ActiveSupport::Dependencies.clear if defined?(ActiveSupport::Dependencies)
+    clear_active_support_dependencies
     super
   end
 end
diff --git a/test/machine_with_scopes_and_joins_test.rb b/test/machine_with_scopes_and_joins_test.rb
@@ -32,6 +32,7 @@ def teardown
       remove_const('Vehicle')
       remove_const('Company')
     end
-    ActiveSupport::Dependencies.clear
+
+    clear_active_support_dependencies
   end
 end
diff --git a/test/machine_with_static_initial_state_test.rb b/test/machine_with_static_initial_state_test.rb
@@ -159,7 +159,8 @@ def teardown
       remove_const('Owner') if defined?(MachineWithStaticInitialStateTest::Owner)
       remove_const('Driver') if defined?(MachineWithStaticInitialStateTest::Driver)
     end
-    ActiveSupport::Dependencies.clear
+
+    clear_active_support_dependencies
     super
   end
 end

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -49,4 +49,20 @@ class << self;
     model.reset_column_information if create_table
     model
   end
+
+  def clear_active_support_dependencies
+    return unless defined?(ActiveSupport::Dependencies)
+
+    if ActiveSupport::Dependencies.respond_to?(:autoloader=)
+      ActiveSupport::Dependencies.autoloader ||= stubbed_autoloader
+    end
+
+    ActiveSupport::Dependencies.clear
+  end
+
+  def stubbed_autoloader
+    Object.new.tap do |obj|
+      obj.define_singleton_method(:reload) {}
+    end
+  end
 end