From cf7b1ecc98b072d7e3ddd4b41bd80cbfc9e053ff Mon Sep 17 00:00:00 2001
From: Sashi Kumar Kumaresan <skumar@gitlab.com>
Date: Thu, 8 Feb 2024 14:36:30 +0000
Subject: [PATCH] Remove unsed code in merge_request model
This change removes unused code from merge_request
model related to scan result policy
---
ee/app/models/ee/merge_request.rb | 9 ---------
ee/spec/models/merge_request_spec.rb | 30 ----------------------------
2 files changed, 39 deletions(-)
diff --git a/ee/app/models/ee/merge_request.rb b/ee/app/models/ee/merge_request.rb
index e4f792c2a8a85..f75314058cee7 100644
--- a/ee/app/models/ee/merge_request.rb
+++ b/ee/app/models/ee/merge_request.rb
@@ -433,15 +433,6 @@ def latest_pipeline_for_target_branch
.find_by(ref: target_branch)
end
- def latest_finished_target_branch_pipeline_for_scan_result_policy
- @latest_finished_pipeline ||= project
- .all_pipelines
- .ci_and_security_orchestration_sources
- .finished
- .order(id: :desc)
- .find_by(ref: target_branch, tag: false)
- end
-
def latest_comparison_pipeline_with_sbom_reports
find_merge_base_pipeline_with_sbom_report || find_base_pipeline_with_sbom_report
end
diff --git a/ee/spec/models/merge_request_spec.rb b/ee/spec/models/merge_request_spec.rb
index 075fae908c1f6..34e6631aaafb0 100644
--- a/ee/spec/models/merge_request_spec.rb
+++ b/ee/spec/models/merge_request_spec.rb
@@ -1730,36 +1730,6 @@ def create_mr(metrics_data = {})
end
end
- describe '#latest_finished_target_branch_pipeline_for_scan_result_policy' do
- context 'without pipeline' do
- it 'return nil' do
- expect(merge_request.latest_finished_target_branch_pipeline_for_scan_result_policy).to be_nil
- end
- end
-
- context 'with existing pipeline' do
- let!(:target_branch_pipeline) do
- create(:ee_ci_pipeline, :success, project: project, ref: merge_request.target_branch)
- end
-
- let!(:target_branch_tag_pipeline) do
- create(:ee_ci_pipeline, :success, project: project, ref: merge_request.target_branch, tag: true)
- end
-
- let!(:target_branch_running_pipeline) do
- create(:ee_ci_pipeline, :running, project: project, ref: merge_request.target_branch)
- end
-
- let!(:target_branch_skipped_pipeline) do
- create(:ee_ci_pipeline, :skipped, project: project, ref: merge_request.target_branch)
- end
-
- it 'returns the pipeline related to the target branch' do
- expect(merge_request.latest_finished_target_branch_pipeline_for_scan_result_policy).to eq(target_branch_pipeline)
- end
- end
- end
-
describe '#validate_reviewer_length' do
let(:reviewer1) { create(:user) }
let(:reviewer2) { create(:user) }
--
GitLab