1 files changed, 17 insertions, 3 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 4b46c98117f..a77ca1e9a51 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -2255,7 +2255,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
 
   describe '#find_codequality_mr_diff_reports' do
     let(:project) { create(:project, :repository) }
-    let(:merge_request) { create(:merge_request, :with_codequality_mr_diff_reports, source_project: project) }
+    let(:merge_request) { create(:merge_request, :with_codequality_mr_diff_reports, source_project: project, id: 123456789) }
     let(:pipeline) { merge_request.head_pipeline }
 
     subject(:mr_diff_report) { merge_request.find_codequality_mr_diff_reports }
@@ -2628,7 +2628,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
     context 'when the MR has been merged' do
       before do
         MergeRequests::MergeService
-          .new(subject.target_project, subject.author, { sha: subject.diff_head_sha })
+          .new(project: subject.target_project, current_user: subject.author, params: { sha: subject.diff_head_sha })
           .execute(subject)
       end
 
@@ -3876,6 +3876,20 @@ RSpec.describe MergeRequest, factory_default: :keep do
 
     subject { merge_request.use_merge_base_pipeline_for_comparison?(service_class) }
 
+    context 'when service class is Ci::CompareMetricsReportsService' do
+      let(:service_class) { 'Ci::CompareMetricsReportsService' }
+
+      it { is_expected.to be_truthy }
+
+      context 'with the metrics report flag disabled' do
+        before do
+          stub_feature_flags(merge_base_pipeline_for_metrics_comparison: false)
+        end
+
+        it { is_expected.to be_falsey }
+      end
+    end
+
     context 'when service class is Ci::CompareCodequalityReportsService' do
       let(:service_class) { 'Ci::CompareCodequalityReportsService' }
 
@@ -4806,7 +4820,7 @@ RSpec.describe MergeRequest, factory_default: :keep do
     context 'when merge_ref_sha is not present' do
       let!(:result) do
         MergeRequests::MergeToRefService
-          .new(merge_request.project, merge_request.author)
+          .new(project: merge_request.project, current_user: merge_request.author)
           .execute(merge_request)
       end