summaryrefslogtreecommitdiff
path: root/spec/features/merge_request/user_resolves_conflicts_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/features/merge_request/user_resolves_conflicts_spec.rb')
-rw-r--r--spec/features/merge_request/user_resolves_conflicts_spec.rb17
1 files changed, 0 insertions, 17 deletions
diff --git a/spec/features/merge_request/user_resolves_conflicts_spec.rb b/spec/features/merge_request/user_resolves_conflicts_spec.rb
index 982e75760d7..a04ca4e789c 100644
--- a/spec/features/merge_request/user_resolves_conflicts_spec.rb
+++ b/spec/features/merge_request/user_resolves_conflicts_spec.rb
@@ -178,23 +178,6 @@ RSpec.describe 'Merge request > User resolves conflicts', :js do
end
end
- context 'sidebar' do
- let(:merge_request) { create_merge_request('conflict-resolvable') }
-
- before do
- project.add_developer(user)
- sign_in(user)
-
- visit conflicts_project_merge_request_path(project, merge_request)
- end
-
- it 'displays reviewers' do
- page.within '.issuable-sidebar' do
- expect(page).to have_selector('[data-testid="reviewer"]', count: 1)
- end
- end
- end
-
unresolvable_conflicts = {
'conflict-too-large' => 'when the conflicts contain a large file',
'conflict-binary-file' => 'when the conflicts contain a binary file',