Add latest changes from gitlab-org/gitlab@master

2 files changed, 140 insertions, 31 deletions

diff --git a/spec/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines_spec.rb
index 27a5abf988c..25e81f6d538 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/cancel_pending_pipelines_spec.rb
@@ -55,31 +55,88 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::CancelPendingPipelines do
       context 'when the previous pipeline has a child pipeline' do
         let(:child_pipeline) { create(:ci_pipeline, child_of: prev_pipeline) }
 
-        context 'when the child pipeline has an interruptible job' do
+        context 'when the child pipeline has interruptible running jobs' do
           before do
             create(:ci_build, :interruptible, :running, pipeline: child_pipeline)
+            create(:ci_build, :interruptible, :running, pipeline: child_pipeline)
           end
 
-          it 'cancels interruptible builds of child pipeline' do
-            expect(build_statuses(child_pipeline)).to contain_exactly('running')
+          it 'cancels all child pipeline builds' do
+            expect(build_statuses(child_pipeline)).to contain_exactly('running', 'running')
 
             perform
 
-            expect(build_statuses(child_pipeline)).to contain_exactly('canceled')
+            expect(build_statuses(child_pipeline)).to contain_exactly('canceled', 'canceled')
+          end
+
+          context 'when the child pipeline includes completed interruptible jobs' do
+            before do
+              create(:ci_build, :interruptible, :failed, pipeline: child_pipeline)
+              create(:ci_build, :interruptible, :success, pipeline: child_pipeline)
+            end
+
+            it 'cancels all child pipeline builds with a cancelable_status' do
+              expect(build_statuses(child_pipeline)).to contain_exactly('running', 'running', 'failed', 'success')
+
+              perform
+
+              expect(build_statuses(child_pipeline)).to contain_exactly('canceled', 'canceled', 'failed', 'success')
+            end
           end
         end
 
-        context 'when the child pipeline has not an interruptible job' do
+        context 'when the child pipeline has started non-interruptible job' do
           before do
-            create(:ci_build, :running, pipeline: child_pipeline)
+            create(:ci_build, :interruptible, :running, pipeline: child_pipeline)
+            # non-interruptible started
+            create(:ci_build, :success, pipeline: child_pipeline)
           end
 
-          it 'does not cancel the build of child pipeline' do
-            expect(build_statuses(child_pipeline)).to contain_exactly('running')
+          it 'does not cancel any child pipeline builds' do
+            expect(build_statuses(child_pipeline)).to contain_exactly('running', 'success')
 
             perform
 
-            expect(build_statuses(child_pipeline)).to contain_exactly('running')
+            expect(build_statuses(child_pipeline)).to contain_exactly('running', 'success')
+          end
+        end
+
+        context 'when the child pipeline has non-interruptible non-started job' do
+          before do
+            create(:ci_build, :interruptible, :running, pipeline: child_pipeline)
+          end
+
+          not_started_statuses = Ci::HasStatus::AVAILABLE_STATUSES - Ci::HasStatus::BUILD_STARTED_RUNNING_STATUSES
+          context 'when the jobs are cancelable' do
+            cancelable_not_started_statuses = Set.new(not_started_statuses).intersection(Ci::HasStatus::CANCELABLE_STATUSES)
+            cancelable_not_started_statuses.each do |status|
+              it "cancels all child pipeline builds when build status #{status} included" do
+                # non-interruptible but non-started
+                create(:ci_build, status.to_sym, pipeline: child_pipeline)
+
+                expect(build_statuses(child_pipeline)).to contain_exactly('running', status)
+
+                perform
+
+                expect(build_statuses(child_pipeline)).to contain_exactly('canceled', 'canceled')
+              end
+            end
+          end
+
+          context 'when the jobs are not cancelable' do
+            not_cancelable_not_started_statuses = not_started_statuses - Ci::HasStatus::CANCELABLE_STATUSES
+            not_cancelable_not_started_statuses.each do |status|
+              it "does not cancel child pipeline builds when build status #{status} included" do
+                # non-interruptible but non-started
+                create(:ci_build, status.to_sym, pipeline: child_pipeline)
+
+                expect(build_statuses(child_pipeline)).to contain_exactly('running', status)
+
+                perform
+
+                expect(build_statuses(child_pipeline)).to contain_exactly('canceled', status)
+              end
+            end
           end
         end
       end
diff --git a/spec/lib/gitlab/gitaly_client/operation_service_spec.rb b/spec/lib/gitlab/gitaly_client/operation_service_spec.rb
index f0115aa6b2b..fe08f615ca7 100644
--- a/spec/lib/gitlab/gitaly_client/operation_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/operation_service_spec.rb
@@ -437,41 +437,93 @@ RSpec.describe Gitlab::GitalyClient::OperationService do
       end
     end
 
-    describe '#user_commit_files' do
-      subject do
-        client.user_commit_files(
-          gitaly_user, 'my-branch', 'Commit files message', [], 'janedoe@example.com', 'Jane Doe',
-          'master', repository)
+    shared_examples '#user_squash with an error' do
+      it 'raises a GitError exception' do
+        expect_any_instance_of(Gitaly::OperationService::Stub)
+          .to receive(:user_squash).with(request, kind_of(Hash))
+          .and_raise(raised_error)
+
+        expect { subject }.to raise_error(expected_error)
       end
+    end
 
-      before do
-        expect_any_instance_of(Gitaly::OperationService::Stub)
-          .to receive(:user_commit_files).with(kind_of(Enumerator), kind_of(Hash))
-          .and_return(response)
+    context 'when ResolveRevisionError is raised' do
+      let(:raised_error) do
+        new_detailed_error(
+          GRPC::Core::StatusCodes::INVALID_ARGUMENT,
+          'something failed',
+          Gitaly::UserSquashError.new(
+            resolve_revision: Gitaly::ResolveRevisionError.new(
+              revision: start_sha
+            )))
       end
 
-      context 'when a pre_receive_error is present' do
-        let(:response) { Gitaly::UserCommitFilesResponse.new(pre_receive_error: "GitLab: something failed") }
+      let(:expected_error) { Gitlab::Git::Repository::GitError }
 
-        it 'raises a PreReceiveError' do
-          expect { subject }.to raise_error(Gitlab::Git::PreReceiveError, "something failed")
-        end
+      it_behaves_like '#user_squash with an error'
+    end
+
+    context 'when RebaseConflictError is raised' do
+      let(:raised_error) do
+        new_detailed_error(
+          GRPC::Core::StatusCodes::INTERNAL,
+          'something failed',
+          Gitaly::UserSquashError.new(
+            rebase_conflict: Gitaly::MergeConflictError.new(
+              conflicting_files: ['conflicting-file']
+            )))
       end
 
-      context 'when an index_error is present' do
-        let(:response) { Gitaly::UserCommitFilesResponse.new(index_error: "something failed") }
+      let(:expected_error) { Gitlab::Git::Repository::GitError }
 
-        it 'raises a PreReceiveError' do
-          expect { subject }.to raise_error(Gitlab::Git::Index::IndexError, "something failed")
-        end
+      it_behaves_like '#user_squash with an error'
+    end
+
+    context 'when non-detailed gRPC error is raised' do
+      let(:raised_error) do
+        GRPC::Internal.new('non-detailed error')
       end
 
-      context 'when branch_update is nil' do
-        let(:response) { Gitaly::UserCommitFilesResponse.new }
+      let(:expected_error) { GRPC::Internal }
 
-        it { expect(subject).to be_nil }
+      it_behaves_like '#user_squash with an error'
+    end
+  end
+
+  describe '#user_commit_files' do
+    subject do
+      client.user_commit_files(
+        gitaly_user, 'my-branch', 'Commit files message', [], 'janedoe@example.com', 'Jane Doe',
+        'master', repository)
+    end
+
+    before do
+      expect_any_instance_of(Gitaly::OperationService::Stub)
+        .to receive(:user_commit_files).with(kind_of(Enumerator), kind_of(Hash))
+        .and_return(response)
+    end
+
+    context 'when a pre_receive_error is present' do
+      let(:response) { Gitaly::UserCommitFilesResponse.new(pre_receive_error: "GitLab: something failed") }
+
+      it 'raises a PreReceiveError' do
+        expect { subject }.to raise_error(Gitlab::Git::PreReceiveError, "something failed")
       end
     end
+
+    context 'when an index_error is present' do
+      let(:response) { Gitaly::UserCommitFilesResponse.new(index_error: "something failed") }
+
+      it 'raises a PreReceiveError' do
+        expect { subject }.to raise_error(Gitlab::Git::Index::IndexError, "something failed")
+      end
+    end
+
+    context 'when branch_update is nil' do
+      let(:response) { Gitaly::UserCommitFilesResponse.new }
+
+      it { expect(subject).to be_nil }
+    end
   end
 
   describe '#user_commit_patches' do