Add latest changes from gitlab-org/gitlab@12-7-stable-ee

1 files changed, 0 insertions, 21 deletions

diff --git a/spec/support/shared_examples/merge_requests_rendering_a_single_diff_version.rb b/spec/support/shared_examples/merge_requests_rendering_a_single_diff_version.rb
deleted file mode 100644
index 18d025a4b07..00000000000
--- a/spec/support/shared_examples/merge_requests_rendering_a_single_diff_version.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-# This pending test can be removed when `single_mr_diff_view` is enabled by default
-# disabling the feature flag above is then not needed anymore.
-RSpec.shared_examples 'rendering a single diff version' do |attribute|
-  before do
-    stub_feature_flags(diffs_batch_load: false)
-  end
-
-  pending 'allows editing diff settings single_mr_diff_view is enabled' do
-    project = create(:project, :repository)
-    user = project.creator
-    merge_request = create(:merge_request, source_project: project)
-    stub_feature_flags(single_mr_diff_view: true)
-    sign_in(user)
-
-    visit(diffs_project_merge_request_path(project, merge_request))
-
-    expect(page).to have_selector('.js-show-diff-settings')
-  end
-end