debian-mirror-gitlab/spec/lib/gitlab/gitaly_client/conflicts_service_spec.rb

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

97 lines
3.3 KiB
Ruby
Raw Permalink Normal View History

2019-12-26 22:10:19 +05:30
# frozen_string_literal: true
2018-03-17 18:26:18 +05:30
require 'spec_helper'
2020-07-28 23:09:34 +05:30
RSpec.describe Gitlab::GitalyClient::ConflictsService do
2018-03-17 18:26:18 +05:30
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
2021-10-27 15:23:28 +05:30
let(:allow_tree_conflicts) { false }
2018-03-17 18:26:18 +05:30
let(:request) do
Gitaly::ListConflictFilesRequest.new(
2021-10-27 15:23:28 +05:30
repository: target_gitaly_repository,
our_commit_oid: our_commit_oid,
their_commit_oid: their_commit_oid,
allow_tree_conflicts: allow_tree_conflicts
2018-03-17 18:26:18 +05:30
)
end
2021-10-27 15:23:28 +05:30
shared_examples_for 'listing conflicts' do
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(allow_tree_conflicts: allow_tree_conflicts)
end
end
it_behaves_like 'listing conflicts'
context 'when allow_tree_conflicts is set to true' do
let(:allow_tree_conflicts) { true }
2018-03-17 18:26:18 +05:30
2021-10-27 15:23:28 +05:30
it_behaves_like 'listing conflicts'
2018-03-17 18:26:18 +05:30
end
end
describe '#resolve_conflicts' do
let(:user) { create(:user) }
let(:files) do
[{ old_path: 'some/path', new_path: 'some/path', content: '' }]
end
2020-10-24 23:57:45 +05:30
2018-03-17 18:26:18 +05:30
let(:source_branch) { 'master' }
let(:target_branch) { 'feature' }
2019-09-04 21:01:54 +05:30
let(:commit_message) { 'Solving conflicts\n\nTést' }
2018-03-17 18:26:18 +05:30
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
2019-09-04 21:01:54 +05:30
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
2018-03-17 18:26:18 +05:30
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