diff options
author | Sean McGivern <sean@gitlab.com> | 2016-08-05 12:15:06 +0100 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:48 +0300 |
commit | ce7eb4e49279ab56cac992b6743fe77cac578b48 (patch) | |
tree | 80f620351a9e2238ef50df8eeccbf1b5acc76c7e /spec/lib/gitlab/conflict | |
parent | f322c3027442b8f8c4800c19056bcd967be4018b (diff) | |
download | gitlab-ce-ce7eb4e49279ab56cac992b6743fe77cac578b48.tar.gz |
Add more tests for conflicts
Diffstat (limited to 'spec/lib/gitlab/conflict')
-rw-r--r-- | spec/lib/gitlab/conflict/file_collection_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/conflict/file_spec.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/lib/gitlab/conflict/file_collection_spec.rb b/spec/lib/gitlab/conflict/file_collection_spec.rb index 2a09adb2321..39d892c18c0 100644 --- a/spec/lib/gitlab/conflict/file_collection_spec.rb +++ b/spec/lib/gitlab/conflict/file_collection_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Gitlab::Conflict::FileCollection, lib: true do - let(:merge_request) { create(:merge_request, source_branch: 'conflict-a', target_branch: 'conflict-b') } + let(:merge_request) { create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start') } let(:file_collection) { Gitlab::Conflict::FileCollection.new(merge_request) } describe '#files' do @@ -13,7 +13,7 @@ describe Gitlab::Conflict::FileCollection, lib: true do 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-a' into 'conflict-b' +Merge branch 'conflict-start' into 'conflict-resolvable' # Conflicts: # files/ruby/popen.rb diff --git a/spec/lib/gitlab/conflict/file_spec.rb b/spec/lib/gitlab/conflict/file_spec.rb index 405b97686f5..643c5b31791 100644 --- a/spec/lib/gitlab/conflict/file_spec.rb +++ b/spec/lib/gitlab/conflict/file_spec.rb @@ -4,9 +4,9 @@ describe Gitlab::Conflict::File, lib: true do let(:project) { create(:project) } let(:repository) { project.repository } let(:rugged) { repository.rugged } - let(:their_commit) { rugged.branches['conflict-a'].target } - let(:our_commit) { rugged.branches['conflict-b'].target } - let(:merge_request) { create(:merge_request, source_branch: 'conflict-b', target_branch: 'conflict-a', source_project: project) } + let(:their_commit) { rugged.branches['conflict-start'].target } + let(:our_commit) { rugged.branches['conflict-resolvable'].target } + let(:merge_request) { create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start', source_project: project) } let(:index) { rugged.merge_commits(our_commit, their_commit) } let(:conflict) { index.conflicts.last } let(:merge_file_result) { index.merge_file('files/ruby/regex.rb') } |