Fixes #37452 - Support Zeitwerk loader

theforeman · Jul 8, 2024 · 20963b9 · 20963b9
1 parent bb6761f
commit 20963b9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/lib/actions/middleware/keep_current_request_id.rb b/app/lib/actions/middleware/keep_current_request_id.rb
@@ -1,6 +1,6 @@
 module Actions
   module Middleware
-    class KeepCurrentRequestID < Dynflow::Middleware
+    class KeepCurrentRequestId < Dynflow::Middleware
       def delay(*args)
         pass(*args).tap { store_current_request_id }
       end

diff --git a/lib/foreman_tasks/engine.rb b/lib/foreman_tasks/engine.rb
@@ -18,7 +18,7 @@ class Engine < ::Rails::Engine
 
     initializer 'foreman_tasks.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :"foreman-tasks" do
-        requires_foreman '>= 3.9'
+        requires_foreman '>= 3.12'
         divider :top_menu, :parent => :monitor_menu, :last => true, :caption => N_('Foreman Tasks')
         menu :top_menu, :tasks,
              :url_hash => { :controller => 'foreman_tasks/tasks', :action => :index },
@@ -160,7 +160,7 @@ class Engine < ::Rails::Engine
         world.middleware.use Actions::Middleware::KeepCurrentTaxonomies
         world.middleware.use Actions::Middleware::KeepCurrentUser, :before => ::Dynflow::Middleware::Common::Transaction
         world.middleware.use Actions::Middleware::KeepCurrentTimezone
-        world.middleware.use Actions::Middleware::KeepCurrentRequestID
+        world.middleware.use Actions::Middleware::KeepCurrentRequestId
         world.middleware.use ::Actions::Middleware::LoadSettingValues
         ForemanTasks.register_scheduled_task(Actions::CheckLongRunningTasks, ENV['FOREMAN_TASKS_CHECK_LONG_RUNNING_TASKS_CRONLINE'] || '0 0 * * *')
       end

diff --git a/test/lib/actions/middleware/keep_current_request_id_test.rb b/test/lib/actions/middleware/keep_current_request_id_test.rb
@@ -1,9 +1,9 @@
 require 'foreman_tasks_test_helper'
 
 module ForemanTasks
-  class KeepCurrentRequestIDTest < ActiveSupport::TestCase
+  class KeepCurrentRequestIdTest < ActiveSupport::TestCase
     class DummyAction < Actions::EntryAction
-      middleware.use ::Actions::Middleware::KeepCurrentRequestID
+      middleware.use ::Actions::Middleware::KeepCurrentRequestId
 
       def plan(plan = false)
         plan_self if plan
@@ -18,7 +18,7 @@ def finalize
       end
     end
 
-    describe Actions::Middleware::KeepCurrentRequestID do
+    describe Actions::Middleware::KeepCurrentRequestId do
       include ::Dynflow::Testing
 
       before { @old_id = ::Logging.mdc['request'] }