Refs #38006 - Make it rails7-compatible

theforeman · Dec 3, 2024 · 3881e02 · 3881e02
1 parent 18aef07
commit 3881e02
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 4 deletions.
diff --git a/app/controllers/api/v2/compliance/scap_contents_controller.rb b/app/controllers/api/v2/compliance/scap_contents_controller.rb
@@ -1,5 +1,3 @@
-require 'foreman_openscap/bulk_upload'
-
 module Api::V2
   module Compliance
     class ScapContentsController < ::Api::V2::BaseController

diff --git a/lib/foreman_openscap/bulk_upload.rb → app/services/foreman_openscap/bulk_upload.rb b/lib/foreman_openscap/bulk_upload.rb → app/services/foreman_openscap/bulk_upload.rb
diff --git a/lib/tasks/foreman_openscap_tasks.rake b/lib/tasks/foreman_openscap_tasks.rake
@@ -1,6 +1,5 @@
 # Tasks
 namespace :foreman_openscap do
-  require 'foreman_openscap/bulk_upload'
   require 'foreman_openscap/message_cleaner'
 
   namespace :bulk_upload do

diff --git a/test/lib/foreman_openscap/bulk_upload_test.rb b/test/lib/foreman_openscap/bulk_upload_test.rb
@@ -2,7 +2,6 @@
 
 class BulkUploadTest < ActiveSupport::TestCase
   setup do
-    require 'foreman_openscap/bulk_upload'
     ForemanOpenscap::ScapContent.all.map(&:destroy)
   end