Add latest changes from gitlab-org/gitlab@master

1 files changed, 85 insertions, 0 deletions

diff --git a/spec/services/commits/cherry_pick_service_spec.rb b/spec/services/commits/cherry_pick_service_spec.rb
new file mode 100644
index 00000000000..ead1932c2d1
--- /dev/null
+++ b/spec/services/commits/cherry_pick_service_spec.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Commits::CherryPickService do
+  let(:project) { create(:project, :repository) }
+  # *   ddd0f15ae83993f5cb66a927a28673882e99100b (HEAD -> master, origin/master, origin/HEAD) Merge branch 'po-fix-test-en
+  # |\
+  # | * 2d1db523e11e777e49377cfb22d368deec3f0793 Correct test_env.rb path for adding branch
+  # |/
+  # *   1e292f8fedd741b75372e19097c76d327140c312 Merge branch 'cherry-pick-ce369011' into 'master'
+
+  let_it_be(:merge_commit_sha) { 'ddd0f15ae83993f5cb66a927a28673882e99100b' }
+  let_it_be(:merge_base_sha)   { '1e292f8fedd741b75372e19097c76d327140c312' }
+  let_it_be(:branch_name)      { 'stable' }
+
+  let(:repository) { project.repository }
+  let(:commit) { project.commit }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_maintainer(user)
+
+    repository.add_branch(user, branch_name, merge_base_sha)
+  end
+
+  def cherry_pick(sha, branch_name)
+    commit = project.commit(sha)
+
+    described_class.new(
+      project,
+      user,
+      commit: commit,
+      start_branch: branch_name,
+      branch_name: branch_name
+    ).execute
+  end
+
+  describe '#execute' do
+    shared_examples 'successful cherry-pick' do
+      it 'picks the commit into the branch' do
+        result = cherry_pick(merge_commit_sha, branch_name)
+        expect(result[:status]).to eq(:success), result[:message]
+
+        head = repository.find_branch(branch_name).target
+        expect(head).not_to eq(merge_base_sha)
+      end
+    end
+
+    it_behaves_like 'successful cherry-pick'
+
+    context 'when picking a merge-request' do
+      let!(:merge_request) { create(:merge_request, :simple, :merged, author: user, source_project: project, merge_commit_sha: merge_commit_sha) }
+
+      it_behaves_like 'successful cherry-pick'
+
+      it 'adds a system note' do
+        result = cherry_pick(merge_commit_sha, branch_name)
+
+        mr_notes = find_cherry_pick_notes(merge_request)
+        expect(mr_notes.length).to eq(1)
+        expect(mr_notes[0].commit_id).to eq(result[:result])
+      end
+
+      context 'when :track_mr_picking feature flag is disabled' do
+        before do
+          stub_feature_flags(track_mr_picking: false)
+        end
+
+        it 'does not add system notes' do
+          expect do
+            cherry_pick(merge_commit_sha, branch_name)
+          end.not_to change { Note.count }
+        end
+      end
+    end
+
+    def find_cherry_pick_notes(noteable)
+      noteable
+        .notes
+        .joins(:system_note_metadata)
+        .where(system_note_metadata: { action: 'cherry_pick' })
+    end
+  end
+end