diff options
| author | Phil Hughes <me@iamphill.com> | 2018-09-10 20:40:38 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-09-11 08:47:51 +0100 |
| commit | ea1f388289ded7b89518076c211f95a3bf1e1d8a (patch) | |
| tree | 727830a2bb444cfcfeace8983a920f70d7d6ec2e /spec | |
| parent | 17ca203290c52ff366b0ecc4de3f4da8eebd4380 (diff) | |
| download | gitlab-ce-ea1f388289ded7b89518076c211f95a3bf1e1d8a.tar.gz | |
Re-enables merge conflicts resolution spec
https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/merge_request/user_resolves_conflicts_spec.rb | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb index 629052442b4..50c723776a3 100644 --- a/spec/features/merge_request/user_resolves_conflicts_spec.rb +++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb @@ -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 |