Merge branch 'qa-shl-fix-group-saml-sso-specs' into 'master'

Fix group_saml_enforced_sso_new_account_spec:35 end-to-end test

See merge request gitlab-org/gitlab!61975

app/assets/javascripts/admin/users/components/users_table.vue

@@ -112,7 +112,7 @@ export default {
       :empty-text="s__('AdminUsers|No users found')"
       show-empty
       stacked="md"
-      data-qa-selector="user_row_content"
+      :tbody-tr-attr="{ 'data-qa-selector': 'user_row_content' }"
     >
       <template #cell(name)="{ item: user }">
         <user-avatar :user="user" :admin-user-path="paths.adminUser" />

qa/qa/flow/user.rb

@@ -9,13 +9,13 @@ module QA
         Capybara.current_session
       end
 
-      def confirm_user(username)
+      def confirm_user(user)
         Flow::Login.while_signed_in_as_admin do
           Page::Main::Menu.perform(&:go_to_admin_area)
           Page::Admin::Menu.perform(&:go_to_users_overview)
           Page::Admin::Overview::Users::Index.perform do |index|
-            index.search_user(username)
-            index.click_user(username)
+            index.search_user(user.email)
+            index.click_user(user.name)
           end
 
           Page::Admin::Overview::Users::Show.perform(&:confirm_user)

qa/qa/page/admin/overview/users/index.rb

@@ -11,7 +11,7 @@ module QA
               element :pending_approval_tab
             end
 
-            view 'app/views/admin/users/_user.html.haml' do
+            view 'app/assets/javascripts/admin/users/components/users_table.vue' do
               element :user_row_content
             end
 

qa/qa/specs/features/ee/browser_ui/1_manage/group/group_saml_enforced_sso_new_account_spec.rb

@@ -19,6 +19,7 @@ module QA
         QA::Resource::User.new.tap do |user|
           user.username = 'user_3'
           user.email = 'user_3@example.com'
+          user.name = 'User Three'
         end
       end
 
@@ -43,7 +44,7 @@ module QA
 
         expect(page).to have_text("You have to confirm your email address before continuing")
 
-        QA::Flow::User.confirm_user(user.email)
+        QA::Flow::User.confirm_user(user)
 
         visit_group_sso_url
 
@@ -85,14 +86,14 @@ module QA
       end
 
       after do
+        Flow::Saml.remove_saml_idp_service(saml_idp_service)
+
         Runtime::Feature.remove(:group_administration_nav_item)
 
         user.remove_via_api!
 
         group.remove_via_api!
 
-        Flow::Saml.remove_saml_idp_service(saml_idp_service)
-
         page.visit Runtime::Scenario.gitlab_address
         Page::Main::Menu.perform(&:sign_out_if_signed_in)
       end