Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

4 files changed, 133 insertions, 6 deletions

diff --git a/spec/services/merge_requests/base_service_spec.rb b/spec/services/merge_requests/base_service_spec.rb
index 6eeba3029ae..bd907ba6015 100644
--- a/spec/services/merge_requests/base_service_spec.rb
+++ b/spec/services/merge_requests/base_service_spec.rb
@@ -2,7 +2,15 @@
 
 require 'spec_helper'
 
-RSpec.describe MergeRequests::BaseService do
+module MergeRequests
+  class ExampleService < MergeRequests::BaseService
+    def execute(merge_request, async: false, allow_duplicate: false)
+      create_pipeline_for(merge_request, current_user, async: async, allow_duplicate: allow_duplicate)
+    end
+  end
+end
+
+RSpec.describe MergeRequests::BaseService, feature_category: :code_review_workflow do
   include ProjectForksHelper
 
   let_it_be(:project) { create(:project, :repository) }
@@ -57,4 +65,62 @@ RSpec.describe MergeRequests::BaseService do
       it_behaves_like 'does not enqueue Jira sync worker'
     end
   end
+
+  describe `#create_pipeline_for` do
+    let_it_be(:merge_request) { create(:merge_request) }
+
+    subject { MergeRequests::ExampleService.new(project: project, current_user: project.first_owner, params: params) }
+
+    context 'async: false' do
+      it 'creates a pipeline directly' do
+        expect(MergeRequests::CreatePipelineService)
+          .to receive(:new)
+          .with(hash_including(project: project, current_user: project.first_owner, params: { allow_duplicate: false }))
+          .and_call_original
+        expect(MergeRequests::CreatePipelineWorker).not_to receive(:perform_async)
+
+        subject.execute(merge_request, async: false)
+      end
+
+      context 'allow_duplicate: true' do
+        it 'passes :allow_duplicate as true' do
+          expect(MergeRequests::CreatePipelineService)
+          .to receive(:new)
+          .with(hash_including(project: project, current_user: project.first_owner, params: { allow_duplicate: true }))
+          .and_call_original
+          expect(MergeRequests::CreatePipelineWorker).not_to receive(:perform_async)
+
+          subject.execute(merge_request, async: false, allow_duplicate: true)
+        end
+      end
+    end
+
+    context 'async: true' do
+      it 'enques a CreatePipelineWorker' do
+        expect(MergeRequests::CreatePipelineService).not_to receive(:new)
+        expect(MergeRequests::CreatePipelineWorker)
+          .to receive(:perform_async)
+          .with(project.id, project.first_owner.id, merge_request.id, { "allow_duplicate" => false })
+          .and_call_original
+
+        Sidekiq::Testing.fake! do
+          expect { subject.execute(merge_request, async: true) }.to change(MergeRequests::CreatePipelineWorker.jobs, :size).by(1)
+        end
+      end
+
+      context 'allow_duplicate: true' do
+        it 'passes :allow_duplicate as true' do
+          expect(MergeRequests::CreatePipelineService).not_to receive(:new)
+          expect(MergeRequests::CreatePipelineWorker)
+            .to receive(:perform_async)
+            .with(project.id, project.first_owner.id, merge_request.id, { "allow_duplicate" => true })
+            .and_call_original
+
+          Sidekiq::Testing.fake! do
+            expect { subject.execute(merge_request, async: true, allow_duplicate: true) }.to change(MergeRequests::CreatePipelineWorker.jobs, :size).by(1)
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/spec/services/merge_requests/rebase_service_spec.rb b/spec/services/merge_requests/rebase_service_spec.rb
index e7aa6e74246..316f20d8276 100644
--- a/spec/services/merge_requests/rebase_service_spec.rb
+++ b/spec/services/merge_requests/rebase_service_spec.rb
@@ -24,6 +24,45 @@ RSpec.describe MergeRequests::RebaseService do
     project.add_maintainer(user)
   end
 
+  describe '#validate' do
+    subject { service.validate(merge_request) }
+
+    it { is_expected.to be_success }
+
+    context 'when source branch does not exist' do
+      before do
+        merge_request.update!(source_branch: 'does_not_exist')
+      end
+
+      it 'returns an error' do
+        is_expected.to be_error
+        expect(subject.message).to eq('Source branch does not exist')
+      end
+    end
+
+    context 'when user has no permissions to rebase' do
+      before do
+        project.add_guest(user)
+      end
+
+      it 'returns an error' do
+        is_expected.to be_error
+        expect(subject.message).to eq('Cannot push to source branch')
+      end
+    end
+
+    context 'when branch is protected' do
+      before do
+        create(:protected_branch, project: project, name: merge_request.source_branch, allow_force_push: false)
+      end
+
+      it 'returns an error' do
+        is_expected.to be_error
+        expect(subject.message).to eq('Source branch is protected from force push')
+      end
+    end
+  end
+
   describe '#execute' do
     shared_examples 'sequence of failure and success' do
       it 'properly clears the error message' do
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb
index 5174ceaaa82..0814942b6b7 100644
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe MergeRequests::RefreshService do
+RSpec.describe MergeRequests::RefreshService, feature_category: :code_review_workflow do
   include ProjectForksHelper
   include UserHelpers
 
@@ -138,7 +138,7 @@ RSpec.describe MergeRequests::RefreshService do
         refresh_service.execute(@oldrev, @newrev, 'refs/heads/master')
 
         expect { refresh_service.execute(@oldrev, @newrev, 'refs/heads/master') }.to change {
-          refresh_service.instance_variable_get("@source_merge_requests").first.merge_request_diff
+          refresh_service.instance_variable_get(:@source_merge_requests).first.merge_request_diff
         }
       end
 
@@ -799,7 +799,7 @@ RSpec.describe MergeRequests::RefreshService do
       it 'does not mark as draft based on commits that do not belong to an MR' do
         allow(refresh_service).to receive(:find_new_commits)
 
-        refresh_service.instance_variable_set("@commits",
+        refresh_service.instance_variable_set(:@commits,
           [
             double(
               id: 'aaaaaaa',
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index da78f86c7c8..344d93fc5ca 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe MergeRequests::UpdateService, :mailer do
+RSpec.describe MergeRequests::UpdateService, :mailer, feature_category: :code_review_workflow do
   include ProjectForksHelper
 
   let(:group) { create(:group, :public) }
@@ -479,6 +479,16 @@ RSpec.describe MergeRequests::UpdateService, :mailer do
       end
     end
 
+    shared_examples_for "creates a new pipeline" do
+      it "creates a new pipeline" do
+        expect(MergeRequests::CreatePipelineWorker)
+          .to receive(:perform_async)
+          .with(project.id, user.id, merge_request.id, { "allow_duplicate" => true })
+
+        update_merge_request(target_branch: new_target_branch)
+      end
+    end
+
     shared_examples_for 'correct merge behavior' do
       let(:opts) do
         {
@@ -784,7 +794,7 @@ RSpec.describe MergeRequests::UpdateService, :mailer do
         end
       end
 
-      context 'when the target branch change' do
+      context 'when the target branch changes' do
         it 'calls MergeRequests::ResolveTodosService#async_execute' do
           expect_next_instance_of(MergeRequests::ResolveTodosService, merge_request, user) do |service|
             expect(service).to receive(:async_execute)
@@ -799,6 +809,10 @@ RSpec.describe MergeRequests::UpdateService, :mailer do
 
           update_merge_request({ target_branch: "target" })
         end
+
+        it_behaves_like "creates a new pipeline" do
+          let(:new_target_branch) { "target" }
+        end
       end
 
       context 'when auto merge is enabled and target branch changed' do
@@ -813,6 +827,10 @@ RSpec.describe MergeRequests::UpdateService, :mailer do
 
           update_merge_request({ target_branch: 'target' })
         end
+
+        it_behaves_like "creates a new pipeline" do
+          let(:new_target_branch) { "target" }
+        end
       end
     end
 
@@ -1237,6 +1255,10 @@ RSpec.describe MergeRequests::UpdateService, :mailer do
         expect { update_merge_request(target_branch: 'master', target_branch_was_deleted: true) }
           .to change { merge_request.reload.target_branch }.from('mr-a').to('master')
       end
+
+      it_behaves_like "creates a new pipeline" do
+        let(:new_target_branch) { "target" }
+      end
     end
 
     it_behaves_like 'issuable record that supports quick actions' do