require 'spec_helper' describe Gitlab::GitalyClient::ConflictsService do let(:project) { create(:project, :repository) } let(:target_project) { create(:project, :repository) } let(:source_repository) { project.repository.raw } let(:target_repository) { target_project.repository.raw } let(:target_gitaly_repository) { target_repository.gitaly_repository } let(:our_commit_oid) { 'f00' } let(:their_commit_oid) { 'f44' } let(:client) do described_class.new(target_repository, our_commit_oid, their_commit_oid) end describe '#list_conflict_files' do let(:request) do Gitaly::ListConflictFilesRequest.new( repository: target_gitaly_repository, our_commit_oid: our_commit_oid, their_commit_oid: their_commit_oid ) end it 'sends an RPC request' do expect_any_instance_of(Gitaly::ConflictsService::Stub).to receive(:list_conflict_files) .with(request, kind_of(Hash)).and_return([].to_enum) client.list_conflict_files end end describe '#resolve_conflicts' do let(:user) { create(:user) } let(:files) do [{ old_path: 'some/path', new_path: 'some/path', content: '' }] end let(:source_branch) { 'master' } let(:target_branch) { 'feature' } let(:commit_message) { 'Solving conflicts\n\nTést' } let(:resolution) do Gitlab::Git::Conflict::Resolution.new(user, files, commit_message) end subject do client.resolve_conflicts(source_repository, resolution, source_branch, target_branch) end it 'sends an RPC request' do expect_any_instance_of(Gitaly::ConflictsService::Stub).to receive(:resolve_conflicts) .with(kind_of(Enumerator), kind_of(Hash)).and_return(double(resolution_error: "")) subject end context 'with branches with UTF-8 characters' do let(:source_branch) { 'testòbranch' } let(:target_branch) { 'ábranch' } it 'handles commit messages with UTF-8 characters' do allow(::Gitlab::GitalyClient).to receive(:call).and_call_original expect(::Gitlab::GitalyClient).to receive(:call).with(anything, :conflicts_service, :resolve_conflicts, any_args) do |*args| # Force the generation of request messages by iterating through the enumerator message = args[3].to_a.first params = [message.header.commit_message, message.header.source_branch, message.header.target_branch] expect(params.map(&:encoding).uniq).to eq([Encoding::ASCII_8BIT]) double(resolution_error: nil) end subject end end it 'raises a relevant exception if resolution_error is present' do expect_any_instance_of(Gitaly::ConflictsService::Stub).to receive(:resolve_conflicts) .with(kind_of(Enumerator), kind_of(Hash)).and_return(double(resolution_error: "something happened")) expect { subject }.to raise_error(Gitlab::Git::Conflict::Resolver::ResolutionError) end end end