Update all RSpec tests to allow the flagged features to work

When the backend for this feature flag was implemented,
everything was stubbed out to be false so it would pass.

The frontend work to integrate it has now flipped that, and all
the stubs should be removed.

ee/spec/features/merge_request/batch_comments_spec.rb

@@ -31,11 +31,8 @@ describe 'Merge request > Batch comments', :js do
     end
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   context 'Feature is enabled' do
     before do
-      stub_feature_flags(single_mr_diff_view: false)
       stub_feature_flags(diffs_batch_load: false)
       stub_licensed_features(batch_comments: true)
 

ee/spec/features/merge_request/user_reviews_image_spec.rb

@@ -11,7 +11,6 @@ describe 'Merge request > image review', :js do
   let(:merge_request) { create(:merge_request_with_diffs, :with_image_diffs, source_project: project, author: user) }
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     stub_licensed_features(batch_comments: true)
 
     sign_in(user)
@@ -24,8 +23,6 @@ describe 'Merge request > image review', :js do
     wait_for_requests
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   it 'leaves review' do
     find('.js-add-image-diff-note-button', match: :first).click
 

spec/features/merge_request/maintainer_edits_fork_spec.rb

@@ -32,8 +32,6 @@ describe 'a maintainer edits files on a source-branch of an MR from a fork', :js
     wait_for_requests
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   it 'mentions commits will go to the source branch' do
     expect(page).to have_content('Your changes can be committed to fix because a merge request is open.')
   end

spec/features/merge_request/user_comments_on_diff_spec.rb

@@ -13,15 +13,12 @@ describe 'User comments on a diff', :js do
   let(:user) { create(:user) }
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     project.add_maintainer(user)
     sign_in(user)
 
     visit(diffs_project_merge_request_path(project, merge_request))
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   context 'when viewing comments' do
     context 'when toggling inline comments' do
       context 'in a single file' do

spec/features/merge_request/user_creates_image_diff_notes_spec.rb

@@ -9,7 +9,6 @@ describe 'Merge request > User creates image diff notes', :js do
   let(:user) { project.creator }
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     sign_in(user)
 
     # Stub helper to return any blob file as image from public app folder.
@@ -18,8 +17,6 @@ describe 'Merge request > User creates image diff notes', :js do
     allow_any_instance_of(DiffHelper).to receive(:diff_file_old_blob_raw_url).and_return('/favicon.png')
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   context 'create commit diff notes' do
     commit_id = '2f63565e7aac07bcdadb654e253078b727143ec4'
 

spec/features/merge_request/user_expands_diff_spec.rb

@@ -7,7 +7,6 @@ describe 'User expands diff', :js do
   let(:merge_request) { create(:merge_request, source_branch: 'expand-collapse-files', source_project: project, target_project: project) }
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     stub_feature_flags(diffs_batch_load: false)
 
     allow(Gitlab::Git::Diff).to receive(:size_limit).and_return(100.kilobytes)
@@ -18,8 +17,6 @@ describe 'User expands diff', :js do
     wait_for_requests
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   it 'allows user to expand diff' do
     page.within find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9"]') do
       click_link 'Click to expand it.'

spec/features/merge_request/user_posts_diff_notes_spec.rb

@@ -14,15 +14,12 @@ describe 'Merge request > User posts diff notes', :js do
   let(:test_note_comment) { 'this is a test note!' }
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     set_cookie('sidebar_collapsed', 'true')
 
     project.add_developer(user)
     sign_in(user)
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   context 'when hovering over a parallel view diff file' do
     before do
       visit diffs_project_merge_request_path(project, merge_request, view: 'parallel')

spec/features/merge_request/user_resolves_conflicts_spec.rb

@@ -9,7 +9,6 @@ describe 'Merge request > User resolves conflicts', :js do
   before do
     # In order to have the diffs collapsed, we need to disable the increase feature
     stub_feature_flags(gitlab_git_diff_size_limit_increase: false)
-    stub_feature_flags(single_mr_diff_view: false)
   end
 
   def create_merge_request(source_branch)
@@ -18,8 +17,6 @@ describe 'Merge request > User resolves conflicts', :js do
     end
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   shared_examples 'conflicts are resolved in Interactive mode' do
     it 'conflicts are resolved in Interactive mode' do
       within find('.files-wrapper .diff-file', text: 'files/ruby/popen.rb') do

spec/features/merge_request/user_resolves_diff_notes_and_discussions_resolve_spec.rb

@@ -20,12 +20,9 @@ describe 'Merge request > User resolves diff notes and threads', :js do
   end
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     stub_feature_flags(diffs_batch_load: false)
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   context 'no threads' do
     before do
       project.add_maintainer(user)

spec/features/merge_request/user_sees_avatar_on_diff_notes_spec.rb

@@ -21,7 +21,6 @@ describe 'Merge request > User sees avatars on diff notes', :js do
   let!(:note) { create(:diff_note_on_merge_request, project: project, noteable: merge_request, position: position) }
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     stub_feature_flags(diffs_batch_load: false)
     project.add_maintainer(user)
     sign_in user
@@ -29,8 +28,6 @@ describe 'Merge request > User sees avatars on diff notes', :js do
     set_cookie('sidebar_collapsed', 'true')
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   context 'discussion tab' do
     before do
       visit project_merge_request_path(project, merge_request)

spec/features/merge_request/user_sees_diff_spec.rb

@@ -10,12 +10,9 @@ describe 'Merge request > User sees diff', :js do
   let(:merge_request) { create(:merge_request, source_project: project) }
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     stub_feature_flags(diffs_batch_load: false)
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   context 'when linking to note' do
     describe 'with unresolved note' do
       let(:note) { create :diff_note_on_merge_request, project: project, noteable: merge_request }

spec/features/merge_request/user_sees_mr_with_deleted_source_branch_spec.rb

@@ -11,14 +11,11 @@ describe 'Merge request > User sees MR with deleted source branch', :js do
   let(:user) { project.creator }
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     merge_request.update!(source_branch: 'this-branch-does-not-exist')
     sign_in(user)
     visit project_merge_request_path(project, merge_request)
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   it 'shows a message about missing source branch' do
     expect(page).to have_content('Source branch does not exist.')
   end

spec/features/merge_request/user_sees_versions_spec.rb

@@ -16,7 +16,6 @@ describe 'Merge request > User sees versions', :js do
   let!(:params) { {} }
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     stub_feature_flags(diffs_batch_load: false)
 
     project.add_maintainer(user)
@@ -24,8 +23,6 @@ describe 'Merge request > User sees versions', :js do
     visit diffs_project_merge_request_path(project, merge_request, params)
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   shared_examples 'allows commenting' do |file_id:, line_code:, comment:|
     it do
       diff_file_selector = ".diff-file[id='#{file_id}']"

spec/features/merge_request/user_suggests_changes_on_diff_spec.rb

@@ -25,15 +25,12 @@ describe 'User comments on a diff', :js do
   let(:user) { create(:user) }
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     project.add_maintainer(user)
     sign_in(user)
 
     visit(diffs_project_merge_request_path(project, merge_request))
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   context 'single suggestion note' do
     it 'hides suggestion popover' do
       click_diff_line(find("[id='#{sample_compare.changes[1][:line_code]}']"))

spec/features/merge_request/user_toggles_whitespace_changes_spec.rb

@@ -8,7 +8,6 @@ describe 'Merge request > User toggles whitespace changes', :js do
   let(:user) { project.creator }
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     project.add_maintainer(user)
     sign_in(user)
     visit diffs_project_merge_request_path(project, merge_request)
@@ -16,8 +15,6 @@ describe 'Merge request > User toggles whitespace changes', :js do
     find('.js-show-diff-settings').click
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   it 'has a button to toggle whitespace changes' do
     expect(page).to have_content 'Show whitespace changes'
   end

spec/features/merge_request/user_views_diffs_spec.rb

@@ -9,7 +9,6 @@ describe 'User views diffs', :js do
   let(:project) { create(:project, :public, :repository) }
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     stub_feature_flags(diffs_batch_load: false)
     visit(diffs_project_merge_request_path(project, merge_request))
 
@@ -18,8 +17,6 @@ describe 'User views diffs', :js do
     find('.js-toggle-tree-list').click
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   shared_examples 'unfold diffs' do
     it 'unfolds diffs upwards' do
       first('.js-unfold').click

spec/features/projects/blobs/edit_spec.rb

@@ -12,11 +12,9 @@ describe 'Editing file blob', :js do
   let(:readme_file_path) { 'README.md' }
 
   before do
-    stub_feature_flags(web_ide_default: false, single_mr_diff_view: false)
+    stub_feature_flags(web_ide_default: false)
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   context 'as a developer' do
     let(:user) { create(:user) }
     let(:role) { :developer }

spec/features/projects/view_on_env_spec.rb

@@ -9,14 +9,11 @@ describe 'View on environment', :js do
   let(:user) { project.creator }
 
   before do
-    stub_feature_flags(single_mr_diff_view: false)
     stub_feature_flags(diffs_batch_load: false)
 
     project.add_maintainer(user)
   end
 
-  it_behaves_like 'rendering a single diff version'
-
   context 'when the branch has a route map' do
     let(:route_map) do
       <<-MAP.strip_heredoc

spec/support/shared_examples/merge_requests_rendering_a_single_diff_version.rb

-# 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