5 files changed, 92 insertions, 11 deletions

diff --git a/spec/features/groups/container_registry_spec.rb b/spec/features/groups/container_registry_spec.rb
index cacabdda22d..65374263f45 100644
--- a/spec/features/groups/container_registry_spec.rb
+++ b/spec/features/groups/container_registry_spec.rb
@@ -67,7 +67,13 @@ RSpec.describe 'Container Registry', :js do
       end
 
       it 'shows the image title' do
-        expect(page).to have_content 'my/image tags'
+        expect(page).to have_content 'my/image'
+      end
+
+      it 'shows the image tags' do
+        expect(page).to have_content 'Image tags'
+        first_tag = first('[data-testid="name"]')
+        expect(first_tag).to have_content 'latest'
       end
 
       it 'user removes a specific tag from container repository' do
diff --git a/spec/features/groups/members/list_members_spec.rb b/spec/features/groups/members/list_members_spec.rb
index b0a896ec8cb..b81949da85d 100644
--- a/spec/features/groups/members/list_members_spec.rb
+++ b/spec/features/groups/members/list_members_spec.rb
@@ -47,4 +47,46 @@ RSpec.describe 'Groups > Members > List members', :js do
       expect(first_row).to have_selector('gl-emoji[data-name="smirk"]')
     end
   end
+
+  describe 'when user has 2FA enabled' do
+    let_it_be(:admin) { create(:admin) }
+    let_it_be(:user_with_2fa) { create(:user, :two_factor_via_otp) }
+
+    before do
+      group.add_guest(user_with_2fa)
+    end
+
+    it 'shows 2FA badge to user with "Owner" access level' do
+      group.add_owner(user1)
+
+      visit group_group_members_path(group)
+
+      expect(find_member_row(user_with_2fa)).to have_content('2FA')
+    end
+
+    it 'shows 2FA badge to admins' do
+      sign_in(admin)
+      gitlab_enable_admin_mode_sign_in(admin)
+
+      visit group_group_members_path(group)
+
+      expect(find_member_row(user_with_2fa)).to have_content('2FA')
+    end
+
+    it 'does not show 2FA badge to users with access level below "Owner"' do
+      group.add_maintainer(user1)
+
+      visit group_group_members_path(group)
+
+      expect(find_member_row(user_with_2fa)).not_to have_content('2FA')
+    end
+
+    it 'shows 2FA badge to themselves' do
+      sign_in(user_with_2fa)
+
+      visit group_group_members_path(group)
+
+      expect(find_member_row(user_with_2fa)).to have_content('2FA')
+    end
+  end
 end
diff --git a/spec/features/groups/members/manage_members_spec.rb b/spec/features/groups/members/manage_members_spec.rb
index c27d0afba6f..3b637a10abe 100644
--- a/spec/features/groups/members/manage_members_spec.rb
+++ b/spec/features/groups/members/manage_members_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Groups > Members > Manage members' do
     sign_in(user1)
   end
 
-  shared_examples 'includes the correct Invite Members link' do |should_include, should_not_include|
+  shared_examples 'includes the correct Invite link' do |should_include, should_not_include|
     it 'includes either the form or the modal trigger' do
       group.add_owner(user1)
 
@@ -31,15 +31,13 @@ RSpec.describe 'Groups > Members > Manage members' do
       stub_feature_flags(invite_members_group_modal: true)
     end
 
-    it_behaves_like 'includes the correct Invite Members link', '.js-invite-members-trigger', '.invite-users-form'
+    it_behaves_like 'includes the correct Invite link', '.js-invite-members-trigger', '.invite-users-form'
+    it_behaves_like 'includes the correct Invite link', '.js-invite-group-trigger', '.invite-group-form'
   end
 
   context 'when Invite Members modal is disabled' do
-    before do
-      stub_feature_flags(invite_members_group_modal: false)
-    end
-
-    it_behaves_like 'includes the correct Invite Members link', '.invite-users-form', '.js-invite-members-trigger'
+    it_behaves_like 'includes the correct Invite link', '.invite-users-form', '.js-invite-members-trigger'
+    it_behaves_like 'includes the correct Invite link', '.invite-group-form', '.js-invite-group-trigger'
   end
 
   it 'update user to owner level', :js do
diff --git a/spec/features/groups/settings/user_searches_in_settings_spec.rb b/spec/features/groups/settings/user_searches_in_settings_spec.rb
new file mode 100644
index 00000000000..819d0c4faba
--- /dev/null
+++ b/spec/features/groups/settings/user_searches_in_settings_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'User searches group settings', :js do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:project, :repository, namespace: group) }
+
+  before do
+    group.add_owner(user)
+    sign_in(user)
+  end
+
+  context 'in general settings page' do
+    let(:visit_path) { edit_group_path(group) }
+
+    it_behaves_like 'can search settings with feature flag check', 'Naming', 'Permissions'
+  end
+
+  context 'in Repository page' do
+    before do
+      visit group_settings_repository_path(group)
+    end
+
+    it_behaves_like 'can search settings', 'Deploy tokens', 'Default initial branch name'
+  end
+
+  context 'in CI/CD page' do
+    before do
+      visit group_settings_ci_cd_path(group)
+    end
+
+    it_behaves_like 'can search settings', 'Variables', 'Runners'
+  end
+end
diff --git a/spec/features/groups/show_spec.rb b/spec/features/groups/show_spec.rb
index 5067f11be67..4bcba4c21ed 100644
--- a/spec/features/groups/show_spec.rb
+++ b/spec/features/groups/show_spec.rb
@@ -163,7 +163,6 @@ RSpec.describe 'Group show page' do
     let!(:project)   { create(:project, namespace: group) }
 
     before do
-      stub_feature_flags(vue_notification_dropdown: false)
       group.add_maintainer(maintainer)
       sign_in(maintainer)
     end
@@ -171,14 +170,14 @@ RSpec.describe 'Group show page' do
     it 'is enabled by default' do
       visit path
 
-      expect(page).to have_selector('.notifications-btn:not(.disabled)', visible: true)
+      expect(page).to have_selector('[data-testid="notification-dropdown"] button:not(.disabled)')
     end
 
     it 'is disabled if emails are disabled' do
       group.update_attribute(:emails_disabled, true)
       visit path
 
-      expect(page).to have_selector('.notifications-btn.disabled', visible: true)
+      expect(page).to have_selector('[data-testid="notification-dropdown"] .disabled')
     end
   end