Add Zeitwerk loader support

ATIX-AG · Oct 8, 2024 · 8ecc5e2 · 8ecc5e2
1 parent 6f66bde
commit 8ecc5e2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/app/controllers/ui_acd_controller.rb b/app/controllers/ui_acd_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Controller to create JSON data to be used in react app
-class UiAcdController < ::Api::V2::BaseController
+class UIAcdController < ::Api::V2::BaseController
   include ::ForemanAcd::Concerns::AppInstanceMixins
 
   def app

diff --git a/db/migrate/20210503122809_add_git_url_to_ansible_playbooks.rb b/db/migrate/20210503122809_add_git_url_to_ansible_playbooks.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Add git_url column to ansible_playbook
-class AddGitUrlToAnsiblePlaybooks < ActiveRecord::Migration[6.0]
+class AddGitURLToAnsiblePlaybooks < ActiveRecord::Migration[6.0]
   def change
     add_column :acd_ansible_playbooks, :git_url, :string
   end

diff --git a/lib/foreman_acd/engine.rb b/lib/foreman_acd/engine.rb
@@ -9,14 +9,6 @@ module ForemanAcd
   class Engine < ::Rails::Engine
     engine_name 'foreman_acd'
 
-    config.autoload_paths += Dir["#{config.root}/app/controllers/foreman_acd/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models"]
-    config.autoload_paths += Dir["#{config.root}/app/services"]
-    config.autoload_paths += Dir["#{config.root}/app/helpers"]
-    config.autoload_paths += Dir["#{config.root}/app/overrides"]
-    config.autoload_paths += Dir["#{config.root}/app/lib"]
-    config.autoload_paths += Dir["#{config.root}/lib"]
-
     # Add any db migrations
     initializer 'foreman_acd.load_app_instance_data' do |app|
       ForemanAcd::Engine.paths['db/migrate'].existent.each do |path|
@@ -40,8 +32,10 @@ class Engine < ::Rails::Engine
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
 
-    initializer 'foreman_acd.register_plugin', :before => :finisher_hook do
-      require 'foreman_acd/plugin'
+    initializer 'foreman_acd.register_plugin', :before => :finisher_hook do |app|
+      app.reloader.to_prepare do
+        require 'foreman_acd/plugin'
+      end
     end
 
     initializer 'foreman_acd.register_actions', :before => :finisher_hook do |_app|

diff --git a/lib/foreman_acd/plugin.rb b/lib/foreman_acd/plugin.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Foreman::Plugin.register :foreman_acd do
-  requires_foreman '>= 2.1'
+  requires_foreman '>= 3.13'
 
   apipie_documented_controllers ["#{ForemanAcd::Engine.root}/app/controllers/foreman_acd/api/v2/*.rb"]
 

diff --git a/test/controllers/ui_acd_controller_test.rb b/test/controllers/ui_acd_controller_test.rb
@@ -13,7 +13,7 @@ def self.all
 end
 
 # UI Controller tests
-class UiAcdControllerTest < ActionController::TestCase
+class UIAcdControllerTest < ActionController::TestCase
   test 'get app json' do
     app_def = FactoryBot.create(:app_definition)
     get :app, :params => { :id => app_def.id }, :session => set_session_user