From a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Jun 2021 18:25:58 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-0-stable-ee --- spec/services/commits/cherry_pick_service_spec.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'spec/services/commits/cherry_pick_service_spec.rb') diff --git a/spec/services/commits/cherry_pick_service_spec.rb b/spec/services/commits/cherry_pick_service_spec.rb index 8fad5164b77..2565e17ac90 100644 --- a/spec/services/commits/cherry_pick_service_spec.rb +++ b/spec/services/commits/cherry_pick_service_spec.rb @@ -24,7 +24,7 @@ RSpec.describe Commits::CherryPickService do repository.add_branch(user, branch_name, merge_base_sha) end - def cherry_pick(sha, branch_name) + def cherry_pick(sha, branch_name, message: nil) commit = project.commit(sha) described_class.new( @@ -32,7 +32,8 @@ RSpec.describe Commits::CherryPickService do user, commit: commit, start_branch: branch_name, - branch_name: branch_name + branch_name: branch_name, + message: message ).execute end @@ -45,6 +46,14 @@ RSpec.describe Commits::CherryPickService do head = repository.find_branch(branch_name).target expect(head).not_to eq(merge_base_sha) end + + it 'supports a custom commit message' do + result = cherry_pick(merge_commit_sha, branch_name, message: 'foo') + branch = repository.find_branch(branch_name) + + expect(result[:status]).to eq(:success) + expect(branch.dereferenced_target.message).to eq('foo') + end end it_behaves_like 'successful cherry-pick' -- cgit v1.2.3