Update EE specs related to group members view

Part of a larger initiative to convert the group members view from
HAML to Vue

ee/app/assets/javascripts/vue_shared/components/members/ldap/ldap_override_confirmation_modal.vue

@@ -9,7 +9,7 @@ export default {
   i18n: {
     editPermissions: s__('Members|Edit permissions'),
     modalBody: s__(
-      'Members|%{userName} is currently a LDAP user. Editing their permissions will override the settings from the LDAP group sync.',
+      'Members|%{userName} is currently an LDAP user. Editing their permissions will override the settings from the LDAP group sync.',
     ),
     toastMessage: s__('Members|LDAP override enabled.'),
   },

ee/spec/features/groups/audit_events_spec.rb

@@ -3,13 +3,13 @@
 require 'spec_helper'
 
 RSpec.describe 'Groups > Audit Events', :js do
+  include Spec::Support::Helpers::Features::MembersHelpers
+
   let(:user) { create(:user) }
   let(:alex) { create(:user, name: 'Alex') }
   let(:group) { create(:group) }
 
   before do
-    stub_feature_flags(vue_group_members_list: false)
-
     group.add_owner(user)
     group.add_developer(alex)
     sign_in(user)
@@ -47,11 +47,9 @@ RSpec.describe 'Groups > Audit Events', :js do
 
       wait_for_requests
 
-      group_member = group.members.find_by(user_id: alex)
-
-      page.within "#group_member_#{group_member.id}" do
+      page.within first_row do
         click_button 'Developer'
-        click_link 'Maintainer'
+        click_button 'Maintainer'
       end
 
       find(:link, text: 'Settings').click

ee/spec/features/groups/members/list_members_spec.rb

@@ -2,14 +2,12 @@
 require 'spec_helper'
 
 RSpec.describe 'Groups > Members > List members' do
+  include Spec::Support::Helpers::Features::MembersHelpers
+
   let(:user1) { create(:user, name: 'John Doe') }
   let(:user2) { create(:user, name: 'Mary Jane') }
   let(:group) { create(:group) }
 
-  before do
-    stub_feature_flags(vue_group_members_list: false)
-  end
-
   context 'with Group SAML identity linked for a user' do
     let(:saml_provider) { create(:saml_provider) }
     let(:group) { saml_provider.group }
@@ -23,12 +21,10 @@ RSpec.describe 'Groups > Members > List members' do
                                extern_uid: 'user2@example.com')
     end
 
-    it 'shows user with SSO status badge' do
+    it 'shows user with SSO status badge', :js do
       visit group_group_members_path(group)
 
-      member = GroupMember.find_by(user: user2, group: group)
-
-      expect(find("#group_member_#{member.id}").find('.badge-info')).to have_content('SAML')
+      expect(second_row).to have_content('SAML')
     end
   end
 
@@ -40,12 +36,10 @@ RSpec.describe 'Groups > Members > List members' do
       managed_group.add_guest(managed_user)
     end
 
-    it 'shows user with "Managed Account" badge' do
+    it 'shows user with "Managed Account" badge', :js do
       visit group_group_members_path(managed_group)
 
-      member = GroupMember.find_by(user: managed_user, group: managed_group)
-
-      expect(page).to have_selector("#group_member_#{member.id} .badge-info", text: 'Managed Account')
+      expect(first_row).to have_content('Managed Account')
     end
   end
 

ee/spec/features/groups/members/override_ldap_memberships_spec.rb

@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe 'Groups > Members > Maintainer/Owner can override LDAP access levels' do
   include WaitForRequests
+  include Spec::Support::Helpers::Features::MembersHelpers
 
   let(:johndoe)  { create(:user, name: 'John Doe') }
   let(:maryjane) { create(:user, name: 'Mary Jane') }
@@ -16,8 +17,6 @@ RSpec.describe 'Groups > Members > Maintainer/Owner can override LDAP access lev
   let!(:regular_member) { create(:group_member, :guest, group: group, user: maryjane, ldap: false) }
 
   before do
-    stub_feature_flags(vue_group_members_list: false)
-
     # We need to actually activate the LDAP config otherwise `Group#ldap_synced?` will always be false!
     allow(Gitlab.config.ldap).to receive_messages(enabled: true)
 
@@ -35,7 +34,7 @@ RSpec.describe 'Groups > Members > Maintainer/Owner can override LDAP access lev
 
     visit group_group_members_path(group)
 
-    within "#group_member_#{ldap_member.id}" do
+    within first_row do
       expect(page).not_to have_content 'LDAP'
       expect(page).not_to have_button 'Guest'
       expect(page).not_to have_button 'Edit permissions'
@@ -47,7 +46,7 @@ RSpec.describe 'Groups > Members > Maintainer/Owner can override LDAP access lev
 
     visit group_group_members_path(group)
 
-    within "#group_member_#{ldap_member.id}" do
+    within first_row do
       expect(page).to have_content 'LDAP'
       expect(page).to have_button 'Guest', disabled: true
       expect(page).to have_button 'Edit permissions'
@@ -55,29 +54,26 @@ RSpec.describe 'Groups > Members > Maintainer/Owner can override LDAP access lev
       click_button 'Edit permissions'
     end
 
+    page.within('[role="dialog"]') do
       expect(page).to have_content ldap_override_message
-
-    click_button 'Change permissions'
+      click_button 'Edit permissions'
+    end
 
     expect(page).not_to have_content ldap_override_message
-    expect(page).not_to have_button 'Change permissions'
 
-    within "#group_member_#{ldap_member.id}" do
+    within first_row do
       expect(page).not_to have_button 'Edit permissions'
       expect(page).to have_button 'Guest', disabled: false
     end
 
     refresh # controls should still be enabled after a refresh
 
-    within "#group_member_#{ldap_member.id}" do
+    within first_row do
       expect(page).not_to have_button 'Edit permissions'
       expect(page).to have_button 'Guest', disabled: false
 
       click_button 'Guest'
-
-      within '.dropdown-menu' do
-        click_link 'Revert to LDAP group sync settings'
-      end
+      click_button 'Revert to LDAP group sync settings'
 
       wait_for_requests
 
@@ -85,16 +81,14 @@ RSpec.describe 'Groups > Members > Maintainer/Owner can override LDAP access lev
       expect(page).to have_button 'Edit permissions'
     end
 
-    within "#group_member_#{regular_member.id}" do
+    within third_row do
       expect(page).not_to have_content 'LDAP'
       expect(page).not_to have_button 'Edit permissions'
       expect(page).to have_button 'Guest', disabled: false
 
       click_button 'Guest'
 
-      within '.dropdown-menu' do
       expect(page).not_to have_content 'Revert to LDAP group sync settings'
     end
   end
-  end
 end

ee/spec/frontend/vue_shared/components/members/ldap/ldap_override_confirmation_modal_spec.js

@@ -81,7 +81,7 @@ describe('LdapOverrideConfirmationModal', () => {
     it('displays modal body', () => {
       expect(
         getByText(
-          `${member.user.name} is currently a LDAP user. Editing their permissions will override the settings from the LDAP group sync.`,
+          `${member.user.name} is currently an LDAP user. Editing their permissions will override the settings from the LDAP group sync.`,
         ).exists(),
       ).toBe(true);
     });

locale/gitlab.pot

@@ -16488,7 +16488,7 @@ msgstr ""
 msgid "Members|%{time} by %{user}"
 msgstr ""
 
-msgid "Members|%{userName} is currently a LDAP user. Editing their permissions will override the settings from the LDAP group sync."
+msgid "Members|%{userName} is currently an LDAP user. Editing their permissions will override the settings from the LDAP group sync."
 msgstr ""
 
 msgid "Members|An error occurred while trying to enable LDAP override, please try again."

spec/support/helpers/features/members_table_helpers.rb

@@ -23,6 +23,10 @@ module Spec
             all_rows[1]
           end
 
+          def third_row
+            all_rows[2]
+          end
+
           def invite_users_form
             page.find('[data-testid="invite-users-form"]')
           end