Fixes #37629 - Support zeitwerk loader

theforeman · Sep 11, 2024 · 798f642 · 798f642
1 parent 542d163
commit 798f642
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/app/lib/actions/preupgrade_job.rb → ...b/actions/foreman_leapp/preupgrade_job.rb b/app/lib/actions/preupgrade_job.rb → ...b/actions/foreman_leapp/preupgrade_job.rb
@@ -8,8 +8,8 @@ def self.subscribe
       end
 
       def plan(job_invocation, host, *_args)
-        return unless ::Helpers::JobHelper.correct_feature?(job_invocation, 'leapp_preupgrade') ||
-                      ::Helpers::JobHelper.correct_feature?(job_invocation, 'leapp_remediation_plan')
+        return unless ::JobHelper.correct_feature?(job_invocation, 'leapp_preupgrade') ||
+                      ::JobHelper.correct_feature?(job_invocation, 'leapp_remediation_plan')
 
         plan_self(host_id: host.id, job_invocation_id: job_invocation.id)
       end

diff --git a/app/lib/helpers/job_helper.rb b/app/lib/helpers/job_helper.rb
@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-module Helpers
-  module JobHelper
-    class << self
-      def correct_feature?(job_invocation, feature)
-        RemoteExecutionFeature.where(job_template_id: job_invocation.pattern_template_invocations
-                                                                    .first
-                                                                    .template_id, label: feature).any?
-      end
+module JobHelper
+  class << self
+    def correct_feature?(job_invocation, feature)
+      RemoteExecutionFeature.where(job_template_id: job_invocation.pattern_template_invocations
+                                                                  .first
+                                                                  .template_id, label: feature).any?
     end
   end
 end
diff --git a/lib/foreman_leapp/engine.rb b/lib/foreman_leapp/engine.rb
@@ -7,6 +7,9 @@ module ForemanLeapp
   class Engine < ::Rails::Engine
     engine_name 'foreman_leapp'
 
+    config.eager_load_paths += Dir["#{config.root}/app/controllers/api/v2/concerns"]
+    config.eager_load_paths += Dir["#{config.root}/app/lib/helpers"]
+
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/controllers/api/v2/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
@@ -36,8 +39,8 @@ class Engine < ::Rails::Engine
                          name: _('Leapp preupgrade report'),
                          id: 'leapp_preupgrade_report',
                          onlyif: proc { |subject|
-                           ::Helpers::JobHelper.correct_feature?(subject, 'leapp_preupgrade') ||
-                             ::Helpers::JobHelper.correct_feature?(subject, 'leapp_remediation_plan')
+                           ::JobHelper.correct_feature?(subject, 'leapp_preupgrade') ||
+                             ::JobHelper.correct_feature?(subject, 'leapp_remediation_plan')
                          }
         end
 

diff --git a/test/unit/helpers/job_helper_test.rb b/test/unit/helpers/job_helper_test.rb
@@ -4,7 +4,7 @@
 
 module Helpers
   class JobHelperTest < ActionView::TestCase
-    let(:helper) { ::Helpers::JobHelper }
+    let(:helper) { ::JobHelper }
 
     let(:job_template) do
       FactoryBot.create(:job_template, template: 'echo "1"', job_category: 'leapp',