diff options
Diffstat (limited to 'spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb b/spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb index 8ebe0a4a31e..b9641de7eda 100644 --- a/spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb +++ b/spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb @@ -65,9 +65,12 @@ describe Gitlab::GitalyClient::ConflictsService do let(:source_branch) { 'master' } let(:target_branch) { 'feature' } let(:commit_message) { 'Solving conflicts' } + let(:resolution) do + Gitlab::Git::Conflict::Resolution.new(user, files, commit_message) + end subject do - client.resolve_conflicts(source_repository, user, files, source_branch, target_branch, commit_message) + client.resolve_conflicts(source_repository, resolution, source_branch, target_branch) end it 'sends an RPC request' do |