Commit 54bfe707 authored by Alfredo Sumaran's avatar Alfredo Sumaran

Add more tests to check conflicts resolution

parent c4142cf9
...@@ -290,7 +290,7 @@ class MergeConflictDataProvider { ...@@ -290,7 +290,7 @@ class MergeConflictDataProvider {
isReadyToCommit() { isReadyToCommit() {
const vi = this.vueInstance; const vi = this.vueInstance;
const files = this.vueInstance.conflictsData.files; const files = this.vueInstance.conflictsData.files;
const hasCommitMessage = $.trim(this.vueInstance.conflictsData.commitMessage).length; const hasCommitMessage = this.vueInstance.conflictsData.commitMessage.trim();
let unresolved = 0; let unresolved = 0;
for (let i = 0, l = files.length; i < l; i++) { for (let i = 0, l = files.length; i < l; i++) {
......
...@@ -321,7 +321,8 @@ ...@@ -321,7 +321,8 @@
let numberConflicts = 0; let numberConflicts = 0;
let resolvedConflicts = Object.keys(file.resolutionData).length let resolvedConflicts = Object.keys(file.resolutionData).length
// We only check if // We only check for conflicts type 'text'
// since conflicts `text_editor` can´t be resolved in interactive mode
if (file.type === CONFLICT_TYPES.TEXT) { if (file.type === CONFLICT_TYPES.TEXT) {
for (let j = 0, k = file.sections.length; j < k; j++) { for (let j = 0, k = file.sections.length; j < k; j++) {
if (file.sections[j].conflict) { if (file.sections[j].conflict) {
...@@ -334,6 +335,7 @@ ...@@ -334,6 +335,7 @@
} }
} }
} else if (file.resolveMode === EDIT_RESOLVE_MODE) { } else if (file.resolveMode === EDIT_RESOLVE_MODE) {
// Unlikely to happen since switching to Edit mode saves content automatically. // Unlikely to happen since switching to Edit mode saves content automatically.
// Checking anyway in case the save strategy changes in the future // Checking anyway in case the save strategy changes in the future
if (!file.content) { if (!file.content) {
......
...@@ -660,6 +660,7 @@ describe Projects::MergeRequestsController do ...@@ -660,6 +660,7 @@ describe Projects::MergeRequestsController do
expect(merge_request.reload.title).to eq(merge_request.wipless_title) expect(merge_request.reload.title).to eq(merge_request.wipless_title)
end end
end
describe 'GET conflict_for_path' do describe 'GET conflict_for_path' do
let(:json_response) { JSON.parse(response.body) } let(:json_response) { JSON.parse(response.body) }
......
...@@ -12,33 +12,47 @@ feature 'Merge request conflict resolution', js: true, feature: true do ...@@ -12,33 +12,47 @@ feature 'Merge request conflict resolution', js: true, feature: true do
end end
end end
context 'when a merge request can be resolved in the UI' do shared_examples "conflicts are resolved in Interactive mode" do
let(:merge_request) { create_merge_request('conflict-resolvable') } it 'conflicts are resolved in Interactive mode' do
within find('.files-wrapper .diff-file', text: 'files/ruby/popen.rb') do
before do click_button 'Use ours'
project.team << [user, :developer]
login_as(user)
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end end
it 'shows a link to the conflict resolution page' do within find('.files-wrapper .diff-file', text: 'files/ruby/regex.rb') do
expect(page).to have_link('conflicts', href: /\/conflicts\Z/) all('button', text: 'Use ours').each do |button|
button.click
end
end end
context 'visiting the conflicts resolution page' do click_button 'Commit conflict resolution'
before { click_link('conflicts', href: /\/conflicts\Z/) } wait_for_ajax
it 'shows the conflicts' do expect(page).to have_content('All merge conflicts were resolved')
begin merge_request.reload_diff
expect(find('#conflicts')).to have_content('popen.rb')
rescue Capybara::Poltergeist::JavascriptError click_on 'Changes'
retry wait_for_ajax
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 }")
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 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')
context 'when in inline mode' do
it 'resolves files manually' do
within find('.files-wrapper .diff-file', text: 'files/ruby/popen.rb') do within find('.files-wrapper .diff-file', text: 'files/ruby/popen.rb') do
click_button 'Edit inline' click_button 'Edit inline'
wait_for_ajax wait_for_ajax
...@@ -63,23 +77,56 @@ feature 'Merge request conflict resolution', js: true, feature: true do ...@@ -63,23 +77,56 @@ feature 'Merge request conflict resolution', js: true, feature: true do
expect(page).to have_content('Gregor Samsa woke from troubled dreams') expect(page).to have_content('Gregor Samsa woke from troubled dreams')
end end
end end
context 'can be resolved in the UI' do
before do
project.team << [user, :developer]
login_as(user)
end 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 end
context 'when a merge request can be resolved in the UI' do context 'in Inline view mode' do
let(:merge_request) { create_merge_request('conflict-contains-conflict-markers') } 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 before do
project.team << [user, :developer] click_link('conflicts', href: /\/conflicts\Z/)
login_as(user) 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 namespace_project_merge_request_path(project.namespace, project, merge_request) visit namespace_project_merge_request_path(project.namespace, project, merge_request)
click_link('conflicts', href: /\/conflicts\Z/)
end end
context 'a conflict contain markers' do it 'conflicts can not be resolved in Interactive mode' do
before { click_link('conflicts', href: /\/conflicts\Z/) } 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
it 'resolves files manually' do it 'conflicts are resolved in Edit inline mode' do
within find('.files-wrapper .diff-file', text: 'files/markdown/ruby-style-guide.md') do within find('.files-wrapper .diff-file', text: 'files/markdown/ruby-style-guide.md') do
wait_for_ajax wait_for_ajax
execute_script('ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("Gregor Samsa woke from troubled dreams");') execute_script('ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("Gregor Samsa woke from troubled dreams");')
...@@ -94,7 +141,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do ...@@ -94,7 +141,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do
click_on 'Changes' click_on 'Changes'
wait_for_ajax wait_for_ajax
find('.nothing-here-block', visible: true).click find('.click-to-expand').click
wait_for_ajax wait_for_ajax
expect(page).to have_content('Gregor Samsa woke from troubled dreams') expect(page).to have_content('Gregor Samsa woke from troubled dreams')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment