Fix rails 6 spec helper

DataDog · Aug 19, 2024 · 108627a · 108627a
1 parent aa3a655
commit 108627a
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/spec/datadog/tracing/contrib/rails/support/rails6.rb b/spec/datadog/tracing/contrib/rails/support/rails6.rb
@@ -185,13 +185,11 @@ def reset_rails_configuration!
     # TODO: Remove this side-effect on missing log entries
     Lograge.remove_existing_log_subscriptions if defined?(::Lograge)
 
-    if Module.const_defined?(:ActiveRecord)
-      reset_class_variable(ActiveRecord::Railtie::Configuration, :@@options)
+    reset_class_variable(ActiveRecord::Railtie::Configuration, :@@options) if Module.const_defined?(:ActiveRecord)
 
-      # After `deep_dup`, the sentinel `NULL_OPTION` is inadvertently changed. We restore it here.
-      if Rails::VERSION::MINOR < 1
-        ActiveRecord::Railtie.config.action_view.finalize_compiled_template_methods = ActionView::Railtie::NULL_OPTION
-      end
+    # After `deep_dup`, the sentinel `NULL_OPTION` is inadvertently changed. We restore it here.
+    if Rails::VERSION::MINOR < 1
+      ActionView::Railtie.config.action_view.finalize_compiled_template_methods = ActionView::Railtie::NULL_OPTION
     end
 
     reset_class_variable(ActiveSupport::Dependencies, :@@autoload_paths)