BigW Consortium Gitlab

file_collection_spec.rb 755 Bytes
Newer Older
1 2 3
require 'spec_helper'

describe Gitlab::Conflict::FileCollection, lib: true do
4
  let(:merge_request) { create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start') }
5
  let(:file_collection) { described_class.read_only(merge_request) }
6 7 8 9 10 11 12 13 14 15

  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)
16
Merge branch 'conflict-start' into 'conflict-resolvable'
17 18 19 20 21 22 23 24

# Conflicts:
#   files/ruby/popen.rb
#   files/ruby/regex.rb
EOM
    end
  end
end