Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

31 files changed, 274 insertions, 327 deletions

diff --git a/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb b/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
index 1a368676a5e..11e2d24c36a 100644
--- a/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
+++ b/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb
@@ -34,26 +34,23 @@ RSpec.describe 'Blob button line permalinks (BlobLinePermalinkUpdater)', :js do
       end
 
       it 'changes fragment hash if line number clicked' do
-        ending_fragment = "L5"
-
         visit_blob
 
         find('#L3').click
-        find("##{ending_fragment}").click
+        find("#L5").click
 
-        expect(find('.js-data-file-blob-permalink-url')['href']).to eq(get_absolute_url(project_blob_path(project, tree_join(sha, path), anchor: ending_fragment)))
+        expect(find('.js-data-file-blob-permalink-url')['href']).to eq(get_absolute_url(project_blob_path(project, tree_join(sha, path), anchor: "LC5")))
       end
 
       it 'with initial fragment hash, changes fragment hash if line number clicked' do
         fragment = "L1"
-        ending_fragment = "L5"
 
         visit_blob(fragment)
 
         find('#L3').click
-        find("##{ending_fragment}").click
+        find("#L5").click
 
-        expect(find('.js-data-file-blob-permalink-url')['href']).to eq(get_absolute_url(project_blob_path(project, tree_join(sha, path), anchor: ending_fragment)))
+        expect(find('.js-data-file-blob-permalink-url')['href']).to eq(get_absolute_url(project_blob_path(project, tree_join(sha, path), anchor: "LC5")))
       end
     end
 
@@ -73,26 +70,23 @@ RSpec.describe 'Blob button line permalinks (BlobLinePermalinkUpdater)', :js do
       end
 
       it 'changes fragment hash if line number clicked' do
-        ending_fragment = "L5"
-
         visit_blob
 
         find('#L3').click
-        find("##{ending_fragment}").click
+        find("#L5").click
 
-        expect(find('.js-blob-blame-link')['href']).to eq(get_absolute_url(project_blame_path(project, tree_join('master', path), anchor: ending_fragment)))
+        expect(find('.js-blob-blame-link')['href']).to eq(get_absolute_url(project_blame_path(project, tree_join('master', path), anchor: "LC5")))
       end
 
       it 'with initial fragment hash, changes fragment hash if line number clicked' do
         fragment = "L1"
-        ending_fragment = "L5"
 
         visit_blob(fragment)
 
         find('#L3').click
-        find("##{ending_fragment}").click
+        find("#L5").click
 
-        expect(find('.js-blob-blame-link')['href']).to eq(get_absolute_url(project_blame_path(project, tree_join('master', path), anchor: ending_fragment)))
+        expect(find('.js-blob-blame-link')['href']).to eq(get_absolute_url(project_blame_path(project, tree_join('master', path), anchor: "LC5")))
       end
     end
   end
diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb
index 9d05c985af1..62994d19fc0 100644
--- a/spec/features/projects/blobs/blob_show_spec.rb
+++ b/spec/features/projects/blobs/blob_show_spec.rb
@@ -29,6 +29,10 @@ RSpec.describe 'File blob', :js do
     ).execute
   end
 
+  before do
+    stub_feature_flags(refactor_blob_viewer: false) # This stub will be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/350455
+  end
+
   context 'Ruby file' do
     before do
       visit_blob('files/ruby/popen.rb')
diff --git a/spec/features/projects/branches/user_deletes_branch_spec.rb b/spec/features/projects/branches/user_deletes_branch_spec.rb
index 8fc5c3d2e1b..0d08e7ea10d 100644
--- a/spec/features/projects/branches/user_deletes_branch_spec.rb
+++ b/spec/features/projects/branches/user_deletes_branch_spec.rb
@@ -32,28 +32,4 @@ RSpec.describe "User deletes branch", :js do
 
     expect(page).to have_content('Branch was deleted')
   end
-
-  context 'when the feature flag :delete_branch_confirmation_modals is disabled' do
-    before do
-      stub_feature_flags(bootstrap_confirmation_modals: false)
-      stub_feature_flags(delete_branch_confirmation_modals: false)
-    end
-
-    it "deletes branch" do
-      visit(project_branches_path(project))
-
-      branch_search = find('input[data-testid="branch-search"]')
-
-      branch_search.set('improve/awesome')
-      branch_search.native.send_keys(:enter)
-
-      page.within(".js-branch-improve\\/awesome") do
-        accept_alert { click_link(title: 'Delete branch') }
-      end
-
-      wait_for_requests
-
-      expect(page).to have_css(".js-branch-improve\\/awesome", visible: :hidden)
-    end
-  end
 end
diff --git a/spec/features/projects/branches_spec.rb b/spec/features/projects/branches_spec.rb
index 2725c6a91be..363d08da024 100644
--- a/spec/features/projects/branches_spec.rb
+++ b/spec/features/projects/branches_spec.rb
@@ -117,7 +117,7 @@ RSpec.describe 'Branches' do
       it 'sorts the branches by name', :js do
         visit project_branches_filtered_path(project, state: 'all')
 
-        click_button "Last updated" # Open sorting dropdown
+        click_button "Updated date" # Open sorting dropdown
         within '[data-testid="branches-dropdown"]' do
           find('p', text: 'Name').click
         end
@@ -128,7 +128,7 @@ RSpec.describe 'Branches' do
       it 'sorts the branches by oldest updated', :js do
         visit project_branches_filtered_path(project, state: 'all')
 
-        click_button "Last updated" # Open sorting dropdown
+        click_button "Updated date" # Open sorting dropdown
         within '[data-testid="branches-dropdown"]' do
           find('p', text: 'Oldest updated').click
         end
@@ -175,26 +175,6 @@ RSpec.describe 'Branches' do
         expect(page).not_to have_content('fix')
         expect(all('.all-branches').last).to have_selector('li', count: 0)
       end
-
-      context 'when the delete_branch_confirmation_modals feature flag is disabled' do
-        it 'removes branch after confirmation', :js do
-          stub_feature_flags(delete_branch_confirmation_modals: false)
-          stub_feature_flags(bootstrap_confirmation_modals: false)
-
-          visit project_branches_filtered_path(project, state: 'all')
-
-          search_for_branch('fix')
-
-          expect(page).to have_content('fix')
-          expect(find('.all-branches')).to have_selector('li', count: 1)
-          accept_confirm do
-            within('.js-branch-item', match: :first) { click_link(title: 'Delete branch') }
-          end
-
-          expect(page).not_to have_content('fix')
-          expect(find('.all-branches')).to have_selector('li', count: 0)
-        end
-      end
     end
 
     context 'on project with 0 branch' do
diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb
index 6e88cbf52b5..0c9db24f1d8 100644
--- a/spec/features/projects/clusters/gcp_spec.rb
+++ b/spec/features/projects/clusters/gcp_spec.rb
@@ -219,7 +219,7 @@ RSpec.describe 'Gcp Cluster', :js do
     it 'user does not see the offer' do
       page.within('.as-third-party-offers') do
         click_button 'Expand'
-        check 'Do not display offers from third parties'
+        check 'Do not display content for customer experience improvement and offers from third parties'
         click_button 'Save changes'
       end
 
diff --git a/spec/features/projects/environments/environment_spec.rb b/spec/features/projects/environments/environment_spec.rb
index bcbf2f46f79..d88ff5c1aa5 100644
--- a/spec/features/projects/environments/environment_spec.rb
+++ b/spec/features/projects/environments/environment_spec.rb
@@ -342,24 +342,6 @@ RSpec.describe 'Environment' do
       expect(page).not_to have_button('Stop')
     end
 
-    context 'when the feature flag :delete_branch_confirmation_modals is disabled' do
-      before do
-        stub_feature_flags(delete_branch_confirmation_modals: false)
-      end
-
-      it 'user deletes the branch with running environment' do
-        visit project_branches_filtered_path(project, state: 'all', search: 'feature')
-
-        remove_branch_with_hooks(project, user, 'feature') do
-          within('.js-branch-feature') { click_link(title: 'Delete branch') }
-        end
-
-        visit_environment(environment)
-
-        expect(page).not_to have_button('Stop')
-      end
-    end
-
     ##
     # This is a workaround for problem described in #24543
     #
diff --git a/spec/features/projects/features_visibility_spec.rb b/spec/features/projects/features_visibility_spec.rb
index a7e773dda2d..23fcc1fe444 100644
--- a/spec/features/projects/features_visibility_spec.rb
+++ b/spec/features/projects/features_visibility_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe 'Edit Project Settings' do
           # disable by clicking toggle
           toggle_feature_off("project[project_feature_attributes][#{tool_name}_access_level]")
           page.within('.sharing-permissions') do
-            find('input[value="Save changes"]').click
+            find('[data-testid="project-features-save-button"]').click
           end
           wait_for_requests
           expect(page).not_to have_selector(".shortcuts-#{shortcut_name}")
@@ -32,7 +32,7 @@ RSpec.describe 'Edit Project Settings' do
           # re-enable by clicking toggle again
           toggle_feature_on("project[project_feature_attributes][#{tool_name}_access_level]")
           page.within('.sharing-permissions') do
-            find('input[value="Save changes"]').click
+            find('[data-testid="project-features-save-button"]').click
           end
           wait_for_requests
           expect(page).to have_selector(".shortcuts-#{shortcut_name}")
diff --git a/spec/features/projects/files/user_browses_files_spec.rb b/spec/features/projects/files/user_browses_files_spec.rb
index 4e9e129042c..508dec70db6 100644
--- a/spec/features/projects/files/user_browses_files_spec.rb
+++ b/spec/features/projects/files/user_browses_files_spec.rb
@@ -340,6 +340,7 @@ RSpec.describe "User browses files" do
     let(:newrev) { project.repository.commit('master').sha }
 
     before do
+      stub_feature_flags(refactor_blob_viewer: false) # This stub will be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/350456
       create_file_in_repo(project, 'master', 'master', filename, 'Test file')
       path = File.join('master', filename)
 
@@ -355,6 +356,7 @@ RSpec.describe "User browses files" do
 
   context "when browsing a raw file" do
     before do
+      stub_feature_flags(refactor_blob_viewer: false) # This stub will be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/350456
       path = File.join(RepoHelpers.sample_commit.id, RepoHelpers.sample_blob.path)
 
       visit(project_blob_path(project, path))
diff --git a/spec/features/projects/files/user_browses_lfs_files_spec.rb b/spec/features/projects/files/user_browses_lfs_files_spec.rb
index 3be5ab64834..17699847704 100644
--- a/spec/features/projects/files/user_browses_lfs_files_spec.rb
+++ b/spec/features/projects/files/user_browses_lfs_files_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe 'Projects > Files > User browses LFS files' do
       expect(page).to have_content 'version https://git-lfs.github.com/spec/v1'
       expect(page).to have_content 'oid sha256:91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897'
       expect(page).to have_content 'size 1575078'
-      expect(page).not_to have_content 'Download (1.5 MB)'
+      expect(page).not_to have_content 'Download (1.50 MiB)'
     end
   end
 
@@ -56,7 +56,7 @@ RSpec.describe 'Projects > Files > User browses LFS files' do
       click_link('lfs')
       click_link('lfs_object.iso')
 
-      expect(page).to have_content('Download (1.5 MB)')
+      expect(page).to have_content('Download (1.50 MiB)')
       expect(page).not_to have_content('version https://git-lfs.github.com/spec/v1')
       expect(page).not_to have_content('oid sha256:91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897')
       expect(page).not_to have_content('size 1575078')
@@ -88,7 +88,7 @@ RSpec.describe 'Projects > Files > User browses LFS files' do
       it 'does not show single file edit link' do
         page.within('.content') do
           expect(page).to have_selector(:link_or_button, 'Web IDE')
-          expect(page).not_to have_selector(:link_or_button, 'Edit')
+          expect(page).not_to have_css('button[data-testid="edit"')
         end
       end
     end
diff --git a/spec/features/projects/files/user_deletes_files_spec.rb b/spec/features/projects/files/user_deletes_files_spec.rb
index b6e300e9e59..c508b2ddba9 100644
--- a/spec/features/projects/files/user_deletes_files_spec.rb
+++ b/spec/features/projects/files/user_deletes_files_spec.rb
@@ -15,6 +15,7 @@ RSpec.describe 'Projects > Files > User deletes files', :js do
   let(:user) { create(:user) }
 
   before do
+    stub_feature_flags(refactor_blob_viewer: false) # This stub will be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/349953
     sign_in(user)
   end
 
diff --git a/spec/features/projects/files/user_edits_files_spec.rb b/spec/features/projects/files/user_edits_files_spec.rb
index 453cc14c267..2b4ac3dc1d8 100644
--- a/spec/features/projects/files/user_edits_files_spec.rb
+++ b/spec/features/projects/files/user_edits_files_spec.rb
@@ -150,7 +150,7 @@ RSpec.describe 'Projects > Files > User edits files', :js do
 
       expect_fork_prompt
 
-      click_link_or_button('Fork project')
+      click_link_or_button('Fork')
 
       expect_fork_status
 
@@ -169,7 +169,7 @@ RSpec.describe 'Projects > Files > User edits files', :js do
 
       expect_fork_prompt
 
-      click_link_or_button('Fork project')
+      click_link_or_button('Fork')
 
       expect_fork_status
 
@@ -183,7 +183,7 @@ RSpec.describe 'Projects > Files > User edits files', :js do
       click_link_or_button('Edit')
 
       expect_fork_prompt
-      click_link_or_button('Fork project')
+      click_link_or_button('Fork')
 
       find('.file-editor', match: :first)
 
@@ -214,7 +214,7 @@ RSpec.describe 'Projects > Files > User edits files', :js do
         click_link('.gitignore')
         click_link_or_button('Edit')
 
-        expect(page).not_to have_link('Fork project')
+        expect(page).not_to have_link('Fork')
 
         find('#editor')
         set_editor_value('*.rbca')
diff --git a/spec/features/projects/files/user_replaces_files_spec.rb b/spec/features/projects/files/user_replaces_files_spec.rb
index c9b472260bd..fe9520fffc8 100644
--- a/spec/features/projects/files/user_replaces_files_spec.rb
+++ b/spec/features/projects/files/user_replaces_files_spec.rb
@@ -17,6 +17,7 @@ RSpec.describe 'Projects > Files > User replaces files', :js do
   let(:user) { create(:user) }
 
   before do
+    stub_feature_flags(refactor_blob_viewer: false) # This stub will be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/349953
     sign_in(user)
   end
 
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb
index 3afd1937652..2fbec4e22f4 100644
--- a/spec/features/projects/import_export/import_file_spec.rb
+++ b/spec/features/projects/import_export/import_file_spec.rb
@@ -10,12 +10,11 @@ RSpec.describe 'Import/Export - project import integration test', :js do
   let(:export_path) { "#{Dir.tmpdir}/import_file_spec" }
 
   before do
-    stub_feature_flags(paginatable_namespace_drop_down_for_project_creation: false)
     stub_uploads_object_storage(FileUploader)
     allow_next_instance_of(Gitlab::ImportExport) do |instance|
       allow(instance).to receive(:storage_path).and_return(export_path)
     end
-    gitlab_sign_in(user)
+    sign_in(user)
   end
 
   after do
diff --git a/spec/features/projects/integrations/user_activates_jira_spec.rb b/spec/features/projects/integrations/user_activates_jira_spec.rb
index 7a035248440..50010950f0e 100644
--- a/spec/features/projects/integrations/user_activates_jira_spec.rb
+++ b/spec/features/projects/integrations/user_activates_jira_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe 'User activates Jira', :js do
 
       it 'activates the Jira service' do
         expect(page).to have_content('Jira settings saved and active.')
-        expect(current_path).to eq(edit_project_service_path(project, :jira))
+        expect(current_path).to eq(edit_project_integration_path(project, :jira))
       end
 
       unless Gitlab.ee?
@@ -41,7 +41,7 @@ RSpec.describe 'User activates Jira', :js do
         fill_in 'service_password', with: 'password'
         click_test_integration
 
-        page.within('.service-settings') do
+        page.within('[data-testid="integration-settings-form"]') do
           expect(page).to have_content('This field is required.')
         end
       end
@@ -55,7 +55,7 @@ RSpec.describe 'User activates Jira', :js do
         click_test_then_save_integration
 
         expect(page).to have_content('Jira settings saved and active.')
-        expect(current_path).to eq(edit_project_service_path(project, :jira))
+        expect(current_path).to eq(edit_project_integration_path(project, :jira))
       end
     end
   end
@@ -72,7 +72,7 @@ RSpec.describe 'User activates Jira', :js do
 
     it 'saves but does not activate the Jira service' do
       expect(page).to have_content('Jira settings saved, but not active.')
-      expect(current_path).to eq(edit_project_service_path(project, :jira))
+      expect(current_path).to eq(edit_project_integration_path(project, :jira))
     end
 
     it 'does not show the Jira link in the menu' do
diff --git a/spec/features/projects/labels/sort_labels_spec.rb b/spec/features/projects/labels/sort_labels_spec.rb
index 83559b816d2..26b3d08253c 100644
--- a/spec/features/projects/labels/sort_labels_spec.rb
+++ b/spec/features/projects/labels/sort_labels_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe 'Sort labels', :js do
     expect(sort_options[1]).to eq('Name, descending')
     expect(sort_options[2]).to eq('Last created')
     expect(sort_options[3]).to eq('Oldest created')
-    expect(sort_options[4]).to eq('Last updated')
+    expect(sort_options[4]).to eq('Updated date')
     expect(sort_options[5]).to eq('Oldest updated')
 
     click_link 'Name, descending'
diff --git a/spec/features/projects/labels/user_edits_labels_spec.rb b/spec/features/projects/labels/user_edits_labels_spec.rb
index 8300a1a8542..999c238c7b3 100644
--- a/spec/features/projects/labels/user_edits_labels_spec.rb
+++ b/spec/features/projects/labels/user_edits_labels_spec.rb
@@ -3,6 +3,8 @@
 require "spec_helper"
 
 RSpec.describe "User edits labels" do
+  include Spec::Support::Helpers::ModalHelpers
+
   let_it_be(:project) { create(:project_empty_repo, :public) }
   let_it_be(:label) { create(:label, project: project) }
   let_it_be(:user) { create(:user) }
@@ -24,4 +26,16 @@ RSpec.describe "User edits labels" do
       expect(page).to have_content(new_title).and have_no_content(label.title)
     end
   end
+
+  it 'allows user to delete label', :js do
+    click_button 'Delete'
+
+    within_modal do
+      expect(page).to have_content("#{label.title} will be permanently deleted from #{project.name}. This cannot be undone.")
+
+      click_link 'Delete label'
+    end
+
+    expect(page).to have_content('Label was removed')
+  end
 end
diff --git a/spec/features/projects/new_project_spec.rb b/spec/features/projects/new_project_spec.rb
index 4dedd5689de..f1786c1be40 100644
--- a/spec/features/projects/new_project_spec.rb
+++ b/spec/features/projects/new_project_spec.rb
@@ -6,10 +6,6 @@ RSpec.describe 'New project', :js do
   include Select2Helper
   include Spec::Support::Helpers::Features::TopNavSpecHelpers
 
-  before do
-    stub_feature_flags(paginatable_namespace_drop_down_for_project_creation: false)
-  end
-
   context 'as a user' do
     let(:user) { create(:user) }
 
@@ -179,7 +175,7 @@ RSpec.describe 'New project', :js do
       it 'does not show the initialize with Readme checkbox on "Import project" tab' do
         visit new_project_path
         click_link 'Import project'
-        first('.js-import-git-toggle-button').click
+        click_button 'Repo by URL'
 
         page.within '#import-project-pane' do
           expect(page).not_to have_css('input#project_initialize_with_readme')
@@ -196,9 +192,7 @@ RSpec.describe 'New project', :js do
         end
 
         it 'selects the user namespace' do
-          page.within('#blank-project-pane') do
-            expect(page).to have_select('project[namespace_id]', visible: false, selected: user.username)
-          end
+          expect(page).to have_button user.username
         end
       end
 
@@ -212,9 +206,7 @@ RSpec.describe 'New project', :js do
         end
 
         it 'selects the group namespace' do
-          page.within('#blank-project-pane') do
-            expect(page).to have_select('project[namespace_id]', visible: false, selected: group.name)
-          end
+          expect(page).to have_button group.name
         end
       end
 
@@ -229,9 +221,7 @@ RSpec.describe 'New project', :js do
         end
 
         it 'selects the group namespace' do
-          page.within('#blank-project-pane') do
-            expect(page).to have_select('project[namespace_id]', visible: false, selected: subgroup.full_path)
-          end
+          expect(page).to have_button subgroup.full_path
         end
       end
 
@@ -249,22 +239,30 @@ RSpec.describe 'New project', :js do
         end
 
         it 'enables the correct visibility options' do
-          select2(user.namespace_id, from: '#project_namespace_id')
+          click_button public_group.full_path
+          click_button user.username
+
           expect(find("#project_visibility_level_#{Gitlab::VisibilityLevel::PRIVATE}")).not_to be_disabled
           expect(find("#project_visibility_level_#{Gitlab::VisibilityLevel::INTERNAL}")).not_to be_disabled
           expect(find("#project_visibility_level_#{Gitlab::VisibilityLevel::PUBLIC}")).not_to be_disabled
 
-          select2(public_group.id, from: '#project_namespace_id')
+          click_button user.username
+          click_button public_group.full_path
+
           expect(find("#project_visibility_level_#{Gitlab::VisibilityLevel::PRIVATE}")).not_to be_disabled
           expect(find("#project_visibility_level_#{Gitlab::VisibilityLevel::INTERNAL}")).not_to be_disabled
           expect(find("#project_visibility_level_#{Gitlab::VisibilityLevel::PUBLIC}")).not_to be_disabled
 
-          select2(internal_group.id, from: '#project_namespace_id')
+          click_button public_group.full_path
+          click_button internal_group.full_path
+
           expect(find("#project_visibility_level_#{Gitlab::VisibilityLevel::PRIVATE}")).not_to be_disabled
           expect(find("#project_visibility_level_#{Gitlab::VisibilityLevel::INTERNAL}")).not_to be_disabled
           expect(find("#project_visibility_level_#{Gitlab::VisibilityLevel::PUBLIC}")).to be_disabled
 
-          select2(private_group.id, from: '#project_namespace_id')
+          click_button internal_group.full_path
+          click_button private_group.full_path
+
           expect(find("#project_visibility_level_#{Gitlab::VisibilityLevel::PRIVATE}")).not_to be_disabled
           expect(find("#project_visibility_level_#{Gitlab::VisibilityLevel::INTERNAL}")).to be_disabled
           expect(find("#project_visibility_level_#{Gitlab::VisibilityLevel::PUBLIC}")).to be_disabled
@@ -355,9 +353,7 @@ RSpec.describe 'New project', :js do
         end
 
         it 'selects the group namespace' do
-          page.within('#blank-project-pane') do
-            expect(page).to have_select('project[namespace_id]', visible: false, selected: group.full_path)
-          end
+          expect(page).to have_button group.full_path
         end
       end
     end
diff --git a/spec/features/projects/packages_spec.rb b/spec/features/projects/packages_spec.rb
index 7fcc8200b1c..8180f6b9aff 100644
--- a/spec/features/projects/packages_spec.rb
+++ b/spec/features/projects/packages_spec.rb
@@ -35,6 +35,9 @@ RSpec.describe 'Packages' do
       let_it_be(:maven_package) { create(:maven_package, project: project, name: 'aaa', created_at: 2.days.ago, version: '2.0.0') }
       let_it_be(:packages) { [npm_package, maven_package] }
 
+      let(:package) { packages.first }
+      let(:package_details_path) { project_package_path(project, package) }
+
       it_behaves_like 'packages list'
 
       it_behaves_like 'package details link'
diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index 6ddc8e43762..5176a7ec5a1 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -1020,6 +1020,103 @@ RSpec.describe 'Pipeline', :js do
     end
   end
 
+  describe 'GET /:project/-/pipelines/:id/builds with jobs_tab_vue feature flag turned on' do
+    include_context 'pipeline builds'
+
+    let_it_be(:project) { create(:project, :repository) }
+
+    let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: project.commit.id) }
+
+    before do
+      visit builds_project_pipeline_path(project, pipeline)
+    end
+
+    it 'shows a list of jobs' do
+      expect(page).to have_content('Test')
+      expect(page).to have_content(build_passed.id)
+      expect(page).to have_content('Deploy')
+      expect(page).to have_content(build_failed.id)
+      expect(page).to have_content(build_running.id)
+      expect(page).to have_content(build_external.id)
+      expect(page).to have_content('Retry')
+      expect(page).to have_content('Cancel running')
+      expect(page).to have_button('Play')
+    end
+
+    it 'shows jobs tab pane as active' do
+      expect(page).to have_css('#js-tab-builds.active')
+    end
+
+    context 'page tabs' do
+      it 'shows Pipeline, Jobs and DAG tabs with link' do
+        expect(page).to have_link('Pipeline')
+        expect(page).to have_link('Jobs')
+        expect(page).to have_link('Needs')
+      end
+
+      it 'shows counter in Jobs tab' do
+        expect(page.find('.js-builds-counter').text).to eq(pipeline.total_size.to_s)
+      end
+
+      it 'shows Jobs tab as active' do
+        expect(page).to have_css('li.js-builds-tab-link .active')
+      end
+    end
+
+    context 'retrying jobs' do
+      it { expect(page).not_to have_content('retried') }
+
+      context 'when retrying' do
+        before do
+          find('[data-testid="retry"]', match: :first).click
+        end
+
+        it 'does not show a "Retry" button', :sidekiq_might_not_need_inline do
+          expect(page).not_to have_content('Retry')
+        end
+      end
+    end
+
+    context 'canceling jobs' do
+      it { expect(page).not_to have_selector('.ci-canceled') }
+
+      context 'when canceling' do
+        before do
+          click_on 'Cancel running'
+        end
+
+        it 'does not show a "Cancel running" button', :sidekiq_might_not_need_inline do
+          expect(page).not_to have_content('Cancel running')
+        end
+      end
+    end
+
+    context 'playing manual job' do
+      before do
+        within '[data-testid="jobs-tab-table"]' do
+          click_button('Play')
+
+          wait_for_requests
+        end
+      end
+
+      it { expect(build_manual.reload).to be_pending }
+    end
+
+    context 'when user unschedules a delayed job' do
+      before do
+        within '[data-testid="jobs-tab-table"]' do
+          click_button('Unschedule')
+        end
+      end
+
+      it 'unschedules the delayed job and shows play button as a manual job' do
+        expect(page).to have_button('Play')
+        expect(page).not_to have_button('Unschedule')
+      end
+    end
+  end
+
   describe 'GET /:project/-/pipelines/:id/failures' do
     let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: '1234') }
     let(:pipeline_failures_page) { failures_project_pipeline_path(project, pipeline) }
diff --git a/spec/features/projects/services/user_activates_issue_tracker_spec.rb b/spec/features/projects/services/user_activates_issue_tracker_spec.rb
index 019d50a497b..27c23e7beb5 100644
--- a/spec/features/projects/services/user_activates_issue_tracker_spec.rb
+++ b/spec/features/projects/services/user_activates_issue_tracker_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe 'User activates issue tracker', :js do
 
         it 'activates the service' do
           expect(page).to have_content("#{tracker} settings saved and active.")
-          expect(current_path).to eq(edit_project_service_path(project, tracker.parameterize(separator: '_')))
+          expect(current_path).to eq(edit_project_integration_path(project, tracker.parameterize(separator: '_')))
         end
 
         it 'shows the link in the menu' do
@@ -58,7 +58,7 @@ RSpec.describe 'User activates issue tracker', :js do
           end
 
           expect(page).to have_content("#{tracker} settings saved and active.")
-          expect(current_path).to eq(edit_project_service_path(project, tracker.parameterize(separator: '_')))
+          expect(current_path).to eq(edit_project_integration_path(project, tracker.parameterize(separator: '_')))
         end
       end
     end
@@ -73,7 +73,7 @@ RSpec.describe 'User activates issue tracker', :js do
 
       it 'saves but does not activate the service' do
         expect(page).to have_content("#{tracker} settings saved, but not active.")
-        expect(current_path).to eq(edit_project_service_path(project, tracker.parameterize(separator: '_')))
+        expect(current_path).to eq(edit_project_integration_path(project, tracker.parameterize(separator: '_')))
       end
 
       it 'does not show the external tracker link in the menu' do
diff --git a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
index b2ca0424b6d..74919a99f04 100644
--- a/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
+++ b/spec/features/projects/services/user_activates_mattermost_slash_command_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Set up Mattermost slash commands', :js do
       let(:mattermost_enabled) { true }
 
       describe 'activation' do
-        let(:edit_path) { edit_project_service_path(project, :mattermost_slash_commands) }
+        let(:edit_path) { edit_project_integration_path(project, :mattermost_slash_commands) }
 
         include_examples 'user activates the Mattermost Slash Command integration'
       end
diff --git a/spec/features/projects/services/user_activates_slack_notifications_spec.rb b/spec/features/projects/services/user_activates_slack_notifications_spec.rb
index d5fe8b083ba..38b6ad84c77 100644
--- a/spec/features/projects/services/user_activates_slack_notifications_spec.rb
+++ b/spec/features/projects/services/user_activates_slack_notifications_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe 'User activates Slack notifications', :js do
         pipeline_channel: 6,
         wiki_page_channel: 7)
 
-      visit(edit_project_service_path(project, integration))
+      visit(edit_project_integration_path(project, integration))
     end
 
     it 'filters events by channel' do
diff --git a/spec/features/projects/services/user_activates_slack_slash_command_spec.rb b/spec/features/projects/services/user_activates_slack_slash_command_spec.rb
index bc84ccaa432..d46d1f739b7 100644
--- a/spec/features/projects/services/user_activates_slack_slash_command_spec.rb
+++ b/spec/features/projects/services/user_activates_slack_slash_command_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe 'Slack slash commands', :js do
     click_active_checkbox
     click_on 'Save'
 
-    expect(current_path).to eq(edit_project_service_path(project, :slack_slash_commands))
+    expect(current_path).to eq(edit_project_integration_path(project, :slack_slash_commands))
     expect(page).to have_content('Slack slash commands settings saved, but not active.')
   end
 
@@ -32,7 +32,7 @@ RSpec.describe 'Slack slash commands', :js do
     fill_in 'Token', with: 'token'
     click_on 'Save'
 
-    expect(current_path).to eq(edit_project_service_path(project, :slack_slash_commands))
+    expect(current_path).to eq(edit_project_integration_path(project, :slack_slash_commands))
     expect(page).to have_content('Slack slash commands settings saved and active.')
   end
 
diff --git a/spec/features/projects/settings/access_tokens_spec.rb b/spec/features/projects/settings/access_tokens_spec.rb
index d8de9e0449e..122bf267021 100644
--- a/spec/features/projects/settings/access_tokens_spec.rb
+++ b/spec/features/projects/settings/access_tokens_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe 'Project > Settings > Access Tokens', :js do
   let_it_be(:bot_user) { create(:user, :project_bot) }
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project, group: group) }
+  let_it_be(:resource_settings_access_tokens_path) { project_settings_access_tokens_path(project) }
 
   before_all do
     project.add_maintainer(user)
@@ -17,78 +18,25 @@ RSpec.describe 'Project > Settings > Access Tokens', :js do
     sign_in(user)
   end
 
-  def create_project_access_token
+  def create_resource_access_token
     project.add_maintainer(bot_user)
 
     create(:personal_access_token, user: bot_user)
   end
 
-  def active_project_access_tokens
-    find('.table.active-tokens')
-  end
-
-  def no_project_access_tokens_message
-    find('.settings-message')
-  end
-
-  def created_project_access_token
-    find('#created-personal-access-token').value
-  end
-
   context 'when user is not a project maintainer' do
     before do
       project.add_developer(user)
     end
 
-    it 'does not show project access token page' do
-      visit project_settings_access_tokens_path(project)
-
-      expect(page).to have_content("Page Not Found")
-    end
+    it_behaves_like 'resource access tokens missing access rights'
   end
 
   describe 'token creation' do
-    it 'allows creation of a project access token' do
-      name = 'My project access token'
-
-      visit project_settings_access_tokens_path(project)
-      fill_in 'Token name', with: name
-
-      # Set date to 1st of next month
-      find_field('Expiration date').click
-      find('.pika-next').click
-      click_on '1'
-
-      # Scopes
-      check 'api'
-      check 'read_api'
-
-      click_on 'Create project access token'
-
-      expect(active_project_access_tokens).to have_text(name)
-      expect(active_project_access_tokens).to have_text('in')
-      expect(active_project_access_tokens).to have_text('api')
-      expect(active_project_access_tokens).to have_text('read_api')
-      expect(active_project_access_tokens).to have_text('Maintainer')
-      expect(created_project_access_token).not_to be_empty
-    end
+    it_behaves_like 'resource access tokens creation', 'project'
 
     context 'when token creation is not allowed' do
-      before do
-        group.namespace_settings.update_column(:resource_access_token_creation_allowed, false)
-      end
-
-      it 'does not show project access token creation form' do
-        visit project_settings_access_tokens_path(project)
-
-        expect(page).not_to have_selector('#new_project_access_token')
-      end
-
-      it 'shows project access token creation disabled text' do
-        visit project_settings_access_tokens_path(project)
-
-        expect(page).to have_text('Project access token creation is disabled in this group. You can still use and manage existing tokens.')
-      end
+      it_behaves_like 'resource access tokens creation disallowed', 'Project access token creation is disabled in this group. You can still use and manage existing tokens.'
 
       context 'with a project in a personal namespace' do
         let(:personal_project) { create(:project) }
@@ -97,113 +45,25 @@ RSpec.describe 'Project > Settings > Access Tokens', :js do
           personal_project.add_maintainer(user)
         end
 
-        it 'shows project access token creation form and text' do
+        it 'shows access token creation form and text' do
           visit project_settings_access_tokens_path(personal_project)
 
-          expect(page).to have_selector('#new_project_access_token')
+          expect(page).to have_selector('#new_resource_access_token')
           expect(page).to have_text('Generate project access tokens scoped to this project for your applications that need access to the GitLab API.')
         end
       end
-
-      context 'group settings link' do
-        context 'when user is not a group owner' do
-          before do
-            group.add_developer(user)
-          end
-
-          it 'does not show group settings link' do
-            visit project_settings_access_tokens_path(project)
-
-            expect(page).not_to have_link('group settings', href: edit_group_path(group))
-          end
-        end
-
-        context 'with nested groups' do
-          let(:subgroup) { create(:group, parent: group) }
-
-          context 'when user is not a top level group owner' do
-            before do
-              subgroup.add_owner(user)
-            end
-
-            it 'does not show group settings link' do
-              visit project_settings_access_tokens_path(project)
-
-              expect(page).not_to have_link('group settings', href: edit_group_path(group))
-            end
-          end
-        end
-
-        context 'when user is a group owner' do
-          before do
-            group.add_owner(user)
-          end
-
-          it 'shows group settings link' do
-            visit project_settings_access_tokens_path(project)
-
-            expect(page).to have_link('group settings', href: edit_group_path(group))
-          end
-        end
-      end
     end
   end
 
   describe 'active tokens' do
-    let!(:project_access_token) { create_project_access_token }
+    let!(:resource_access_token) { create_resource_access_token }
 
-    it 'shows active project access tokens' do
-      visit project_settings_access_tokens_path(project)
-
-      expect(active_project_access_tokens).to have_text(project_access_token.name)
-    end
-
-    context 'when User#time_display_relative is false' do
-      before do
-        user.update!(time_display_relative: false)
-      end
-
-      it 'shows absolute times for expires_at' do
-        visit project_settings_access_tokens_path(project)
-
-        expect(active_project_access_tokens).to have_text(PersonalAccessToken.last.expires_at.strftime('%b %-d'))
-      end
-    end
+    it_behaves_like 'active resource access tokens'
   end
 
   describe 'inactive tokens' do
-    let!(:project_access_token) { create_project_access_token }
-
-    no_active_tokens_text = 'This project has no active access tokens.'
+    let!(:resource_access_token) { create_resource_access_token }
 
-    it 'allows revocation of an active token' do
-      visit project_settings_access_tokens_path(project)
-      accept_confirm { click_on 'Revoke' }
-
-      expect(page).to have_selector('.settings-message')
-      expect(no_project_access_tokens_message).to have_text(no_active_tokens_text)
-    end
-
-    it 'removes expired tokens from active section' do
-      project_access_token.update!(expires_at: 5.days.ago)
-      visit project_settings_access_tokens_path(project)
-
-      expect(page).to have_selector('.settings-message')
-      expect(no_project_access_tokens_message).to have_text(no_active_tokens_text)
-    end
-
-    context 'when resource access token creation is not allowed' do
-      before do
-        group.namespace_settings.update_column(:resource_access_token_creation_allowed, false)
-      end
-
-      it 'allows revocation of an active token' do
-        visit project_settings_access_tokens_path(project)
-        accept_confirm { click_on 'Revoke' }
-
-        expect(page).to have_selector('.settings-message')
-        expect(no_project_access_tokens_message).to have_text(no_active_tokens_text)
-      end
-    end
+    it_behaves_like 'inactive resource access tokens', 'This project has no active access tokens.'
   end
 end
diff --git a/spec/features/projects/settings/project_settings_spec.rb b/spec/features/projects/settings/project_settings_spec.rb
index 71b319d192c..b67caa5a5f9 100644
--- a/spec/features/projects/settings/project_settings_spec.rb
+++ b/spec/features/projects/settings/project_settings_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe 'Projects settings' do
       # disable by clicking toggle
       forking_enabled_button.click
       page.within('.sharing-permissions') do
-        find('input[value="Save changes"]').click
+        find('[data-testid="project-features-save-button"]').click
       end
       wait_for_requests
 
@@ -77,7 +77,7 @@ RSpec.describe 'Projects settings' do
       expect(default_award_emojis_input.value).to eq('false')
 
       page.within('.sharing-permissions') do
-        find('input[value="Save changes"]').click
+        find('[data-testid="project-features-save-button"]').click
       end
       wait_for_requests
 
diff --git a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
index 862bae45fc6..77be351f3d8 100644
--- a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
+++ b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
@@ -54,7 +54,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do
 
         within('.sharing-permissions-form') do
           find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .gl-toggle').click
-          find('input[value="Save changes"]').send_keys(:return)
+          find('[data-testid="project-features-save-button"]').send_keys(:return)
         end
 
         expect(page).not_to have_content 'Pipelines must succeed'
@@ -74,7 +74,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do
 
         within('.sharing-permissions-form') do
           find('.project-feature-controls[data-for="project[project_feature_attributes][builds_access_level]"] .gl-toggle').click
-          find('input[value="Save changes"]').send_keys(:return)
+          find('[data-testid="project-features-save-button"]').send_keys(:return)
         end
 
         expect(page).to have_content 'Pipelines must succeed'
@@ -95,7 +95,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do
 
       within('.sharing-permissions-form') do
         find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .gl-toggle').click
-        find('input[value="Save changes"]').send_keys(:return)
+        find('[data-testid="project-features-save-button"]').send_keys(:return)
       end
 
       expect(page).to have_content 'Pipelines must succeed'
diff --git a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
index dc551158895..89f6b4237a4 100644
--- a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
+++ b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
@@ -316,7 +316,7 @@ RSpec.describe 'Projects > Show > User sees setup shortcut buttons' do
           visit project_path(project)
 
           page.within('.project-buttons') do
-            expect(page).to have_link('Add Kubernetes cluster', href: new_project_cluster_path(project))
+            expect(page).to have_link('Add Kubernetes cluster', href: project_clusters_path(project))
           end
         end
 
diff --git a/spec/features/projects/user_changes_project_visibility_spec.rb b/spec/features/projects/user_changes_project_visibility_spec.rb
index 345d16982fd..68fed9b8a74 100644
--- a/spec/features/projects/user_changes_project_visibility_spec.rb
+++ b/spec/features/projects/user_changes_project_visibility_spec.rb
@@ -5,14 +5,6 @@ require 'spec_helper'
 RSpec.describe 'User changes public project visibility', :js do
   include ProjectForksHelper
 
-  before do
-    fork_project(project, project.owner)
-
-    sign_in(project.owner)
-
-    visit edit_project_path(project)
-  end
-
   shared_examples 'changing visibility to private' do
     it 'requires confirmation' do
       visibility_select = first('.project-feature-controls .select-control')
@@ -22,7 +14,7 @@ RSpec.describe 'User changes public project visibility', :js do
         click_button 'Save changes'
       end
 
-      find('.js-legacy-confirm-danger-input').send_keys(project.path_with_namespace)
+      fill_in 'confirm_name_input', with: project.path_with_namespace
 
       page.within '.modal' do
         click_button 'Reduce project visibility'
@@ -34,15 +26,85 @@ RSpec.describe 'User changes public project visibility', :js do
     end
   end
 
-  context 'when a project is public' do
+  shared_examples 'does not require confirmation' do
+    it 'saves without confirmation' do
+      visibility_select = first('.project-feature-controls .select-control')
+      visibility_select.select('Private')
+
+      page.within('#js-shared-permissions') do
+        click_button 'Save changes'
+      end
+
+      wait_for_requests
+
+      expect(project.reload).to be_private
+    end
+  end
+
+  context 'when the project has forks' do
+    before do
+      fork_project(project, project.owner)
+
+      sign_in(project.owner)
+
+      visit edit_project_path(project)
+    end
+
+    context 'when a project is public' do
+      let(:project) { create(:project, :empty_repo, :public) }
+
+      it_behaves_like 'changing visibility to private'
+    end
+
+    context 'when the project is internal' do
+      let(:project) { create(:project, :empty_repo, :internal) }
+
+      it_behaves_like 'changing visibility to private'
+    end
+
+    context 'when the visibility level is untouched' do
+      let(:project) { create(:project, :empty_repo, :public) }
+
+      it 'saves without confirmation' do
+        expect(page).to have_selector('.js-emails-disabled', visible: true)
+        find('.js-emails-disabled input[type="checkbox"]').click
+
+        page.within('#js-shared-permissions') do
+          click_button 'Save changes'
+        end
+
+        wait_for_requests
+
+        expect(project.reload).to be_public
+      end
+    end
+  end
+
+  context 'when the project is not forked' do
     let(:project) { create(:project, :empty_repo, :public) }
 
-    it_behaves_like 'changing visibility to private'
+    before do
+      sign_in(project.owner)
+
+      visit edit_project_path(project)
+    end
+
+    it_behaves_like 'does not require confirmation'
   end
 
-  context 'when the project is internal' do
-    let(:project) { create(:project, :empty_repo, :internal) }
+  context 'with unlink_fork_network_upon_visibility_decrease = false' do
+    let(:project) { create(:project, :empty_repo, :public) }
+
+    before do
+      stub_feature_flags(unlink_fork_network_upon_visibility_decrease: false)
+
+      fork_project(project, project.owner)
+
+      sign_in(project.owner)
+
+      visit edit_project_path(project)
+    end
 
-    it_behaves_like 'changing visibility to private'
+    it_behaves_like 'does not require confirmation'
   end
 end
diff --git a/spec/features/projects/user_creates_project_spec.rb b/spec/features/projects/user_creates_project_spec.rb
index 17c65e645f4..c4e2e3353a4 100644
--- a/spec/features/projects/user_creates_project_spec.rb
+++ b/spec/features/projects/user_creates_project_spec.rb
@@ -6,7 +6,6 @@ RSpec.describe 'User creates a project', :js do
   let(:user) { create(:user) }
 
   before do
-    stub_feature_flags(paginatable_namespace_drop_down_for_project_creation: false)
     sign_in(user)
     create(:personal_key, user: user)
   end
@@ -44,9 +43,7 @@ RSpec.describe 'User creates a project', :js do
     expect(page).to have_checked_field 'Initialize repository with a README'
     expect(page).to have_checked_field 'Enable Static Application Security Testing (SAST)'
 
-    page.within('#content-body') do
-      click_button('Create project')
-    end
+    click_button('Create project')
 
     project = Project.last
 
@@ -96,12 +93,10 @@ RSpec.describe 'User creates a project', :js do
       fill_in :project_name, with: 'A Subgroup Project'
       fill_in :project_path, with: 'a-subgroup-project'
 
-      page.find('.js-select-namespace').click
-      page.find("div[role='option']", text: subgroup.full_path).click
+      click_button user.username
+      click_button subgroup.full_path
 
-      page.within('#content-body') do
-        click_button('Create project')
-      end
+      click_button('Create project')
 
       expect(page).to have_content("Project 'A Subgroup Project' was successfully created")
 
@@ -125,8 +120,8 @@ RSpec.describe 'User creates a project', :js do
       fill_in :project_name, with: 'a-new-project'
       fill_in :project_path, with: 'a-new-project'
 
-      page.find('.js-select-namespace').click
-      page.find("div[role='option']", text: group.full_path).click
+      click_button user.username
+      click_button group.full_path
 
       page.within('#content-body') do
         click_button('Create project')
diff --git a/spec/features/projects/user_sorts_projects_spec.rb b/spec/features/projects/user_sorts_projects_spec.rb
index 6a5ed49f1a6..71e43467a39 100644
--- a/spec/features/projects/user_sorts_projects_spec.rb
+++ b/spec/features/projects/user_sorts_projects_spec.rb
@@ -41,10 +41,10 @@ RSpec.describe 'User sorts projects and order persists' do
       sign_in(user)
       visit(explore_projects_path)
       find('#sort-projects-dropdown').click
-      first(:link, 'Last updated').click
+      first(:link, 'Updated date').click
     end
 
-    it_behaves_like "sort order persists across all views", "Last updated", "Last updated"
+    it_behaves_like "sort order persists across all views", 'Updated date', 'Updated date'
   end
 
   context 'from dashboard projects' do
diff --git a/spec/features/projects/view_on_env_spec.rb b/spec/features/projects/view_on_env_spec.rb
index d220db01c24..94085b075aa 100644
--- a/spec/features/projects/view_on_env_spec.rb
+++ b/spec/features/projects/view_on_env_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe 'View on environment', :js do
   let(:user) { project.creator }
 
   before do
+    stub_feature_flags(refactor_blob_viewer: false) # This stub will be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/350457
     project.add_maintainer(user)
   end
 
@@ -48,26 +49,6 @@ RSpec.describe 'View on environment', :js do
       let(:environment) { create(:environment, project: project, name: 'review/feature', external_url: 'http://feature.review.example.com') }
       let!(:deployment) { create(:deployment, :success, environment: environment, ref: branch_name, sha: sha) }
 
-      context 'when visiting the diff of a merge request for the branch' do
-        let(:merge_request) { create(:merge_request, :simple, source_project: project, source_branch: branch_name) }
-
-        before do
-          sign_in(user)
-
-          visit diffs_project_merge_request_path(project, merge_request)
-
-          wait_for_requests
-        end
-
-        it 'has a "View on env" button' do
-          within '.diffs' do
-            text = 'View on feature.review.example.com'
-            url = 'http://feature.review.example.com/ruby/feature'
-            expect(page).to have_selector("a[title='#{text}'][href='#{url}']")
-          end
-        end
-      end
-
       context 'when visiting a comparison for the branch' do
         before do
           sign_in(user)