3fcab51ebb
This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553
24 lines
738 B
Ruby
24 lines
738 B
Ruby
require 'spec_helper'
|
|
|
|
describe Gitlab::Conflict::FileCollection do
|
|
let(:merge_request) { create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start') }
|
|
let(:file_collection) { described_class.new(merge_request) }
|
|
|
|
describe '#files' do
|
|
it 'returns an array of Conflict::Files' do
|
|
expect(file_collection.files).to all(be_an_instance_of(Gitlab::Conflict::File))
|
|
end
|
|
end
|
|
|
|
describe '#default_commit_message' do
|
|
it 'matches the format of the git CLI commit message' do
|
|
expect(file_collection.default_commit_message).to eq(<<EOM.chomp)
|
|
Merge branch 'conflict-start' into 'conflict-resolvable'
|
|
|
|
# Conflicts:
|
|
# files/ruby/popen.rb
|
|
# files/ruby/regex.rb
|
|
EOM
|
|
end
|
|
end
|
|
end
|