2016-08-05 07:15:06 -04:00
|
|
|
require 'spec_helper'
|
|
|
|
|
|
|
|
feature 'Merge request conflict resolution', js: true, feature: true do
|
|
|
|
include WaitForAjax
|
|
|
|
|
|
|
|
let(:user) { create(:user) }
|
|
|
|
let(:project) { create(:project) }
|
|
|
|
|
|
|
|
def create_merge_request(source_branch)
|
|
|
|
create(:merge_request, source_branch: source_branch, target_branch: 'conflict-start', source_project: project) do |mr|
|
|
|
|
mr.mark_as_unmergeable
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-10-05 08:57:57 -04:00
|
|
|
shared_examples "conflicts are resolved in Interactive mode" do
|
|
|
|
it 'conflicts are resolved in Interactive mode' do
|
|
|
|
within find('.files-wrapper .diff-file', text: 'files/ruby/popen.rb') do
|
|
|
|
click_button 'Use ours'
|
|
|
|
end
|
2016-08-05 07:15:06 -04:00
|
|
|
|
2016-10-05 08:57:57 -04:00
|
|
|
within find('.files-wrapper .diff-file', text: 'files/ruby/regex.rb') do
|
|
|
|
all('button', text: 'Use ours').each do |button|
|
|
|
|
button.click
|
|
|
|
end
|
|
|
|
end
|
2016-08-05 07:15:06 -04:00
|
|
|
|
2016-10-05 08:57:57 -04:00
|
|
|
click_button 'Commit conflict resolution'
|
|
|
|
wait_for_ajax
|
2016-08-05 07:15:06 -04:00
|
|
|
|
2016-10-05 08:57:57 -04:00
|
|
|
expect(page).to have_content('All merge conflicts were resolved')
|
|
|
|
merge_request.reload_diff
|
2016-08-05 07:15:06 -04:00
|
|
|
|
2016-10-05 08:57:57 -04:00
|
|
|
click_on 'Changes'
|
|
|
|
wait_for_ajax
|
2016-08-05 07:15:06 -04:00
|
|
|
|
2016-10-05 08:57:57 -04:00
|
|
|
within find('.diff-file', text: 'files/ruby/popen.rb') do
|
|
|
|
expect(page).to have_selector('.line_content.new', text: "vars = { 'PWD' => path }")
|
|
|
|
expect(page).to have_selector('.line_content.new', text: "options = { chdir: path }")
|
2016-08-05 07:15:06 -04:00
|
|
|
end
|
2016-09-25 16:45:58 -04:00
|
|
|
|
2016-10-05 08:57:57 -04:00
|
|
|
within find('.diff-file', text: 'files/ruby/regex.rb') do
|
|
|
|
expect(page).to have_selector('.line_content.new', text: "def username_regexp")
|
|
|
|
expect(page).to have_selector('.line_content.new', text: "def project_name_regexp")
|
|
|
|
expect(page).to have_selector('.line_content.new', text: "def path_regexp")
|
|
|
|
expect(page).to have_selector('.line_content.new', text: "def archive_formats_regexp")
|
|
|
|
expect(page).to have_selector('.line_content.new', text: "def git_reference_regexp")
|
|
|
|
expect(page).to have_selector('.line_content.new', text: "def default_regexp")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-09-25 16:45:58 -04:00
|
|
|
|
2016-10-05 08:57:57 -04:00
|
|
|
shared_examples "conflicts are resolved in Edit inline mode" do
|
|
|
|
it 'conflicts are resolved in Edit inline mode' do
|
|
|
|
expect(find('#conflicts')).to have_content('popen.rb')
|
2016-09-25 16:45:58 -04:00
|
|
|
|
2016-10-05 08:57:57 -04:00
|
|
|
within find('.files-wrapper .diff-file', text: 'files/ruby/popen.rb') do
|
|
|
|
click_button 'Edit inline'
|
|
|
|
wait_for_ajax
|
|
|
|
execute_script('ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("One morning");')
|
2016-09-25 16:45:58 -04:00
|
|
|
end
|
2016-10-05 08:57:57 -04:00
|
|
|
|
|
|
|
within find('.files-wrapper .diff-file', text: 'files/ruby/regex.rb') do
|
|
|
|
click_button 'Edit inline'
|
|
|
|
wait_for_ajax
|
|
|
|
execute_script('ace.edit($(".files-wrapper .diff-file pre")[1]).setValue("Gregor Samsa woke from troubled dreams");')
|
|
|
|
end
|
|
|
|
|
|
|
|
click_button 'Commit conflict resolution'
|
|
|
|
wait_for_ajax
|
|
|
|
expect(page).to have_content('All merge conflicts were resolved')
|
|
|
|
merge_request.reload_diff
|
|
|
|
|
|
|
|
click_on 'Changes'
|
|
|
|
wait_for_ajax
|
|
|
|
|
|
|
|
expect(page).to have_content('One morning')
|
|
|
|
expect(page).to have_content('Gregor Samsa woke from troubled dreams')
|
2016-08-05 07:15:06 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-10-05 08:57:57 -04:00
|
|
|
context 'can be resolved in the UI' do
|
2016-09-29 21:26:01 -04:00
|
|
|
before do
|
|
|
|
project.team << [user, :developer]
|
|
|
|
login_as(user)
|
2016-10-05 08:57:57 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'the conflicts are resolvable' do
|
|
|
|
let(:merge_request) { create_merge_request('conflict-resolvable') }
|
|
|
|
|
|
|
|
before { visit namespace_project_merge_request_path(project.namespace, project, merge_request) }
|
|
|
|
|
|
|
|
it 'shows a link to the conflict resolution page' do
|
|
|
|
expect(page).to have_link('conflicts', href: /\/conflicts\Z/)
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'in Inline view mode' do
|
|
|
|
before { click_link('conflicts', href: /\/conflicts\Z/) }
|
|
|
|
|
|
|
|
include_examples "conflicts are resolved in Interactive mode"
|
|
|
|
include_examples "conflicts are resolved in Edit inline mode"
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'in Parallel view mode' do
|
|
|
|
before do
|
|
|
|
click_link('conflicts', href: /\/conflicts\Z/)
|
|
|
|
click_button 'Side-by-side'
|
|
|
|
end
|
2016-09-29 21:26:01 -04:00
|
|
|
|
2016-10-05 08:57:57 -04:00
|
|
|
include_examples "conflicts are resolved in Interactive mode"
|
|
|
|
include_examples "conflicts are resolved in Edit inline mode"
|
|
|
|
end
|
2016-09-29 21:26:01 -04:00
|
|
|
end
|
|
|
|
|
2016-10-05 08:57:57 -04:00
|
|
|
context 'the conflict contain markers' do
|
|
|
|
let(:merge_request) { create_merge_request('conflict-contains-conflict-markers') }
|
|
|
|
|
|
|
|
before do
|
|
|
|
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
|
|
|
|
click_link('conflicts', href: /\/conflicts\Z/)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'conflicts can not be resolved in Interactive mode' do
|
|
|
|
within find('.files-wrapper .diff-file', text: 'files/markdown/ruby-style-guide.md') do
|
|
|
|
expect(page).not_to have_content 'Interactive mode'
|
|
|
|
expect(page).not_to have_content 'Edit inline'
|
|
|
|
end
|
|
|
|
end
|
2016-09-29 21:26:01 -04:00
|
|
|
|
2016-10-05 08:57:57 -04:00
|
|
|
it 'conflicts are resolved in Edit inline mode' do
|
2016-09-30 18:42:36 -04:00
|
|
|
within find('.files-wrapper .diff-file', text: 'files/markdown/ruby-style-guide.md') do
|
2016-09-29 21:26:01 -04:00
|
|
|
wait_for_ajax
|
2016-09-30 18:42:36 -04:00
|
|
|
execute_script('ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("Gregor Samsa woke from troubled dreams");')
|
2016-09-29 21:26:01 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
click_button 'Commit conflict resolution'
|
|
|
|
wait_for_ajax
|
|
|
|
|
|
|
|
expect(page).to have_content('All merge conflicts were resolved')
|
|
|
|
|
|
|
|
merge_request.reload_diff
|
|
|
|
|
|
|
|
click_on 'Changes'
|
|
|
|
wait_for_ajax
|
2016-10-05 08:57:57 -04:00
|
|
|
find('.click-to-expand').click
|
2016-09-29 21:26:01 -04:00
|
|
|
wait_for_ajax
|
|
|
|
|
|
|
|
expect(page).to have_content('Gregor Samsa woke from troubled dreams')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-08-05 07:15:06 -04:00
|
|
|
UNRESOLVABLE_CONFLICTS = {
|
|
|
|
'conflict-too-large' => 'when the conflicts contain a large file',
|
|
|
|
'conflict-binary-file' => 'when the conflicts contain a binary file',
|
2016-08-23 11:37:14 -04:00
|
|
|
'conflict-missing-side' => 'when the conflicts contain a file edited in one branch and deleted in another',
|
|
|
|
'conflict-non-utf8' => 'when the conflicts contain a non-UTF-8 file',
|
2016-08-05 07:15:06 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
UNRESOLVABLE_CONFLICTS.each do |source_branch, description|
|
|
|
|
context description do
|
|
|
|
let(:merge_request) { create_merge_request(source_branch) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
project.team << [user, :developer]
|
|
|
|
login_as(user)
|
|
|
|
|
|
|
|
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not show a link to the conflict resolution page' do
|
|
|
|
expect(page).not_to have_link('conflicts', href: /\/conflicts\Z/)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows an error if the conflicts page is visited directly' do
|
|
|
|
visit current_url + '/conflicts'
|
|
|
|
wait_for_ajax
|
|
|
|
|
2016-08-11 13:54:55 -04:00
|
|
|
expect(find('#conflicts')).to have_content('Please try to resolve them locally.')
|
2016-08-05 07:15:06 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|