diff options
Diffstat (limited to 'spec/services/merge_requests/merge_to_ref_service_spec.rb')
-rw-r--r-- | spec/services/merge_requests/merge_to_ref_service_spec.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/services/merge_requests/merge_to_ref_service_spec.rb b/spec/services/merge_requests/merge_to_ref_service_spec.rb index 14ef5b0b772..938165a807c 100644 --- a/spec/services/merge_requests/merge_to_ref_service_spec.rb +++ b/spec/services/merge_requests/merge_to_ref_service_spec.rb @@ -68,6 +68,7 @@ RSpec.describe MergeRequests::MergeToRefService do end let_it_be(:user) { create(:user) } + let(:merge_request) { create(:merge_request, :simple) } let(:project) { merge_request.project } @@ -226,6 +227,7 @@ RSpec.describe MergeRequests::MergeToRefService do describe 'cascading merge refs' do let_it_be(:project) { create(:project, :repository) } + let(:params) { { commit_message: 'Cascading merge', first_parent_ref: first_parent_ref, target_ref: target_ref, sha: merge_request.diff_head_sha } } context 'when first merge happens' do @@ -257,8 +259,9 @@ RSpec.describe MergeRequests::MergeToRefService do let(:params) { { allow_conflicts: true } } it 'calls merge_to_ref with allow_conflicts param' do - expect(project.repository).to receive(:merge_to_ref) - .with(anything, anything, anything, anything, anything, anything, true) + expect(project.repository).to receive(:merge_to_ref) do |user, **kwargs| + expect(kwargs[:allow_conflicts]).to eq(true) + end.and_call_original service.execute(merge_request) end |