Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

3 files changed, 18 insertions, 2 deletions

diff --git a/spec/features/groups/settings/manage_applications_spec.rb b/spec/features/groups/settings/manage_applications_spec.rb
new file mode 100644
index 00000000000..5f84f61678d
--- /dev/null
+++ b/spec/features/groups/settings/manage_applications_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'User manages applications' do
+  let_it_be(:group) { create(:group) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:new_application_path) { group_settings_applications_path(group) }
+
+  before do
+    group.add_owner(user)
+    sign_in(user)
+  end
+
+  include_examples 'manage applications'
+end
diff --git a/spec/features/groups/settings/packages_and_registries_spec.rb b/spec/features/groups/settings/packages_and_registries_spec.rb
index 551a0bc5375..835555480dd 100644
--- a/spec/features/groups/settings/packages_and_registries_spec.rb
+++ b/spec/features/groups/settings/packages_and_registries_spec.rb
@@ -113,7 +113,7 @@ RSpec.describe 'Group Packages & Registries settings' do
   end
 
   def find_settings_menu
-    find('ul[data-testid="group-settings-menu"]')
+    find('.shortcuts-settings ul')
   end
 
   def visit_settings_page
diff --git a/spec/features/groups/settings/user_searches_in_settings_spec.rb b/spec/features/groups/settings/user_searches_in_settings_spec.rb
index c258dd41b03..abf56232aff 100644
--- a/spec/features/groups/settings/user_searches_in_settings_spec.rb
+++ b/spec/features/groups/settings/user_searches_in_settings_spec.rb
@@ -40,7 +40,7 @@ RSpec.describe 'User searches group settings', :js do
       visit group_settings_ci_cd_path(group)
     end
 
-    it_behaves_like 'can search settings', 'Variables', 'Runners'
+    it_behaves_like 'can search settings', 'Variables', 'Auto DevOps'
   end
 
   context 'in Packages & Registries page' do