Commit ea1f3882 authored by Phil Hughes's avatar Phil Hughes

Re-enables merge conflicts resolution spec

https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
parent 17ca2032
...@@ -44,9 +44,7 @@ describe 'Merge request > User resolves conflicts', :js do ...@@ -44,9 +44,7 @@ describe 'Merge request > User resolves conflicts', :js do
within find('.diff-file', text: 'files/ruby/regex.rb') do 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 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).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 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 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 git_reference_regexp")
...@@ -110,12 +108,8 @@ describe 'Merge request > User resolves conflicts', :js do ...@@ -110,12 +108,8 @@ describe 'Merge request > User resolves conflicts', :js do
click_link('conflicts', href: %r{/conflicts\Z}) click_link('conflicts', href: %r{/conflicts\Z})
end 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 Interactive mode" include_examples "conflicts are resolved in Edit inline mode"
# include_examples "conflicts are resolved in Edit inline mode"
it 'prevents RSpec/EmptyExampleGroup' do
end
end end
context 'in Parallel view mode' do context 'in Parallel view mode' do
...@@ -124,12 +118,8 @@ describe 'Merge request > User resolves conflicts', :js do ...@@ -124,12 +118,8 @@ describe 'Merge request > User resolves conflicts', :js do
click_button 'Side-by-side' click_button 'Side-by-side'
end 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 Interactive mode" include_examples "conflicts are resolved in Edit inline mode"
# include_examples "conflicts are resolved in Edit inline mode"
it 'prevents RSpec/EmptyExampleGroup' do
end
end end
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