gitlab-org--gitlab-foss/spec/features/merge_request/user_resolves_conflicts_spec.rb

197 lines
6.8 KiB
Ruby
Raw Normal View History

require 'rails_helper'
2016-08-05 07:15:06 -04:00
describe 'Merge request > User resolves conflicts', :js do
let(:project) { create(:project, :repository) }
let(:user) { project.creator }
2016-08-05 07:15:06 -04:00
before do
# In order to have the diffs collapsed, we need to disable the increase feature
stub_feature_flags(gitlab_git_diff_size_limit_increase: false)
end
2016-08-05 07:15:06 -04:00
def create_merge_request(source_branch)
create(:merge_request, source_branch: source_branch, target_branch: 'conflict-start', source_project: project, merge_status: :unchecked) do |mr|
2016-08-05 07:15:06 -04:00
mr.mark_as_unmergeable
end
end
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
within find('.files-wrapper .diff-file', text: 'files/ruby/regex.rb') do
all('button', text: 'Use ours').each do |button|
button.send_keys(:return)
end
end
2016-08-05 07:15:06 -04:00
find_button('Commit to source branch').send_keys(:return)
2016-08-05 07:15:06 -04:00
expect(page).to have_content('All merge conflicts were resolved')
merge_request.reload_diff
2016-08-05 07:15:06 -04:00
wait_for_requests
click_on 'Changes'
wait_for_requests
2016-08-05 07:15:06 -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
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
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')
within find('.files-wrapper .diff-file', text: 'files/ruby/popen.rb') do
click_button 'Edit inline'
wait_for_requests
find('.files-wrapper .diff-file pre')
execute_script('ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("One morning");')
end
within find('.files-wrapper .diff-file', text: 'files/ruby/regex.rb') do
click_button 'Edit inline'
wait_for_requests
find('.files-wrapper .diff-file pre')
execute_script('ace.edit($(".files-wrapper .diff-file pre")[1]).setValue("Gregor Samsa woke from troubled dreams");')
end
find_button('Commit to source branch').send_keys(:return)
expect(page).to have_content('All merge conflicts were resolved')
merge_request.reload_diff
wait_for_requests
click_on 'Changes'
wait_for_requests
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
context 'can be resolved in the UI' do
before do
project.add_developer(user)
sign_in(user)
end
context 'the conflicts are resolvable' do
let(:merge_request) { create_merge_request('conflict-resolvable') }
before do
visit project_merge_request_path(project, merge_request)
end
it 'shows a link to the conflict resolution page' do
2018-01-27 00:35:53 -05:00
expect(page).to have_link('conflicts', href: %r{/conflicts\Z})
end
context 'in Inline view mode' do
before do
2018-01-27 00:35:53 -05:00
click_link('conflicts', href: %r{/conflicts\Z})
end
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
2018-01-27 00:35:53 -05:00
click_link('conflicts', href: %r{/conflicts\Z})
click_button 'Side-by-side'
end
include_examples "conflicts are resolved in Interactive mode"
include_examples "conflicts are resolved in Edit inline mode"
end
end
context 'the conflict contain markers' do
let(:merge_request) { create_merge_request('conflict-contains-conflict-markers') }
before do
visit project_merge_request_path(project, merge_request)
2018-01-27 00:35:53 -05:00
click_link('conflicts', href: %r{/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
2018-06-21 08:22:40 -04:00
# TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
xit 'conflicts are resolved in Edit inline mode' do
within find('.files-wrapper .diff-file', text: 'files/markdown/ruby-style-guide.md') do
wait_for_requests
find('.files-wrapper .diff-file pre')
execute_script('ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("Gregor Samsa woke from troubled dreams");')
end
click_button 'Commit to source branch'
expect(page).to have_content('All merge conflicts were resolved')
merge_request.reload_diff
wait_for_requests
click_on 'Changes'
wait_for_requests
2017-01-24 13:50:22 -05:00
click_link 'Expand all'
wait_for_requests
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',
'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'
2017-02-21 18:32:18 -05:00
}.freeze
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.add_developer(user)
sign_in(user)
visit project_merge_request_path(project, merge_request)
2016-08-05 07:15:06 -04:00
end
it 'does not show a link to the conflict resolution page' do
2018-01-27 00:35:53 -05:00
expect(page).not_to have_link('conflicts', href: %r{/conflicts\Z})
2016-08-05 07:15:06 -04:00
end
it 'shows an error if the conflicts page is visited directly' do
visit current_url + '/conflicts'
wait_for_requests
2016-08-05 07:15:06 -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