Commit c6660e61 authored by Tim Zallmann's avatar Tim Zallmann

Merge branch 'mr-conflict-specs-enable' into 'master'

Re-enables merge conflicts resolution spec

See merge request gitlab-org/gitlab-ce!21654
parents 617a723b ea1f3882
......@@ -44,9 +44,7 @@ def create_merge_request(source_branch)
within find('.diff-file', text: 'files/ruby/regex.rb') do
expect(page).to have_selector('.line_content.new', text: "def username_regexp")
expect(page).not_to have_selector('.line_content.new', text: "def username_regex")
expect(page).to have_selector('.line_content.new', text: "def project_name_regexp")
expect(page).not_to have_selector('.line_content.new', text: "def project_name_regex")
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")
......@@ -110,12 +108,8 @@ def create_merge_request(source_branch)
click_link('conflicts', href: %r{/conflicts\Z})
end
# TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
# include_examples "conflicts are resolved in Interactive mode"
# include_examples "conflicts are resolved in Edit inline mode"
it 'prevents RSpec/EmptyExampleGroup' do
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
......@@ -124,12 +118,8 @@ def create_merge_request(source_branch)
click_button 'Side-by-side'
end
# TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
# include_examples "conflicts are resolved in Interactive mode"
# include_examples "conflicts are resolved in Edit inline mode"
it 'prevents RSpec/EmptyExampleGroup' do
end
include_examples "conflicts are resolved in Interactive mode"
include_examples "conflicts are resolved in Edit inline mode"
end
end
......
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