Merge branch '299114-non-blocking-refactoring' into 'master'

Handle renaming of license_mangement to _scanning

See merge request gitlab-org/gitlab!62835

app/finders/security/jobs_finder.rb

@@ -15,7 +15,7 @@ module Security
     attr_reader :pipeline
 
     def self.allowed_job_types
-      # Example return: [:sast, :dast, :dependency_scanning, :container_scanning, :license_management, :coverage_fuzzing]
+      # Example return: [:sast, :dast, :dependency_scanning, :container_scanning, :license_scanning, :coverage_fuzzing]
       raise NotImplementedError, 'allowed_job_types must be overwritten to return an array of job types'
     end
 

ee/app/services/security/sync_reports_to_approval_rules_service.rb

@@ -9,7 +9,7 @@ module Security
     end
 
     def execute
-      sync_license_management_rules
+      sync_license_scanning_rules
       sync_vulnerability_rules
       success
     rescue StandardError => error
@@ -27,7 +27,7 @@ module Security
 
     attr_reader :pipeline
 
-    def sync_license_management_rules
+    def sync_license_scanning_rules
       project = pipeline.project
       report = pipeline.license_scanning_report
       return if report.empty? && !pipeline.complete?

ee/spec/graphql/types/project_type_spec.rb

@@ -52,7 +52,6 @@ RSpec.describe GitlabSchema.types['Project'] do
       create(:ci_build, :success, :sast, pipeline: pipeline)
       create(:ci_build, :success, :dast, pipeline: pipeline)
       create(:ci_build, :success, :license_scanning, pipeline: pipeline)
-      create(:ci_build, :success, :license_management, pipeline: pipeline)
       create(:ci_build, :pending, :secret_detection, pipeline: pipeline)
     end
 

spec/finders/security/security_jobs_finder_spec.rb

@@ -28,19 +28,19 @@ RSpec.describe Security::SecurityJobsFinder do
       end
     end
 
-    context 'with combination of security jobs and license management jobs' do
+    context 'with combination of security jobs and license scanning jobs' do
       let!(:sast_build) { create(:ci_build, :sast, pipeline: pipeline) }
       let!(:container_scanning_build) { create(:ci_build, :container_scanning, pipeline: pipeline) }
       let!(:dast_build) { create(:ci_build, :dast, pipeline: pipeline) }
       let!(:secret_detection_build) { create(:ci_build, :secret_detection, pipeline: pipeline) }
-      let!(:license_management_build) { create(:ci_build, :license_management, pipeline: pipeline) }
+      let!(:license_scanning_build) { create(:ci_build, :license_scanning, pipeline: pipeline) }
 
       it 'returns only the security jobs' do
         is_expected.to include(sast_build)
         is_expected.to include(container_scanning_build)
         is_expected.to include(dast_build)
         is_expected.to include(secret_detection_build)
-        is_expected.not_to include(license_management_build)
+        is_expected.not_to include(license_scanning_build)
       end
     end
   end