diff --git a/app/lib/actions/middleware/keep_current_request_id.rb b/app/lib/actions/middleware/keep_current_request_id.rb index bb412d2d0..73efd6afb 100644 --- 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 index f5bcc7585..4c838cb38 100644 --- 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 index e7c3f9f8f..d702eaade 100644 --- 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'] }