kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Re-enables merge conflicts resolution spec

See merge request gitlab-org/gitlab-ce!21654
This commit is contained in:
Tim Zallmann 2018-09-19 11:42:30 +00:00
commit c6660e61b2
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
spec/features/merge_request/user_resolves_conflicts_spec.rb
View file

@ -44,9 +44,7 @@ describe 'Merge request > User resolves conflicts', :js 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).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 @@ describe 'Merge request > User resolves conflicts', :js do
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 @@ describe 'Merge request > User resolves conflicts', :js do
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