Merge branch 'qa-shl-fix-saml-sso-selectors' into 'master'

Update Group SAML SSO selectors

Closes #213183

See merge request gitlab-org/gitlab!28636

ee/app/views/groups/ee/_administration_nav.html.haml

@@ -4,9 +4,9 @@
   = link_to administration_nav_path(@group) do
     .nav-icon-container
       = sprite_icon('admin')
-    %span.nav-item-name
+    %span.nav-item-name{ data: { qa_selector: 'group_administration_link' } }
       = _('Administration')
-  %ul.sidebar-sub-level-items
+  %ul.sidebar-sub-level-items{ data: { qa_selector: 'group_sidebar_submenu_content' } }
     = nav_link(path: group_administration_nav_link_paths, html_options: { class: "fly-out-top-item" } ) do
       = link_to administration_nav_path(@group) do
         %strong.fly-out-top-item-name
@@ -14,7 +14,7 @@
     %li.divider.fly-out-top-item
     - if show_saml_in_sidebar?(@group)
       = nav_link(path: 'saml_providers#show') do
-        = link_to group_saml_providers_path(@group), title: _('SAML SSO') do
+        = link_to group_saml_providers_path(@group), title: _('SAML SSO'), data: { qa_selector: 'group_saml_sso_link' } do
           %span
             = _('SAML SSO')
 

qa/qa/ee/page/group/menu.rb

@@ -7,10 +7,9 @@ module QA
         module Menu
           prepend QA::Page::Group::SubMenus::Common
 
-          def self.included(base)
+          def self.prepended(base)
             base.class_eval do
               view 'ee/app/views/groups/ee/_settings_nav.html.haml' do
-                element :group_saml_sso_link
                 element :ldap_synchronization_link
                 element :audit_events_settings_link
               end
@@ -35,6 +34,12 @@ module QA
                 element :group_sidebar_submenu
                 element :group_settings_item
               end
+
+              view 'ee/app/views/groups/ee/_administration_nav.html.haml' do
+                element :group_administration_link
+                element :group_sidebar_submenu_content
+                element :group_saml_sso_link
+              end
             end
           end
 
@@ -55,8 +60,8 @@ module QA
           end
 
           def go_to_saml_sso_group_settings
-            hover_element(:group_settings_item) do
-              within_submenu(:group_sidebar_submenu) do
+            hover_element(:group_administration_link) do
+              within_submenu(:group_sidebar_submenu_content) do
                 click_element(:group_saml_sso_link)
               end
             end

qa/qa/ee/page/group/settings/general.rb

@@ -9,7 +9,7 @@ module QA
             prepend ::QA::Page::Component::Select2
             prepend ::QA::Page::Settings::Common
 
-            def self.included(base)
+            def self.prepended(base)
               base.class_eval do
                 view 'ee/app/views/groups/_custom_project_templates_setting.html.haml' do
                   element :custom_project_template_select

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

 # frozen_string_literal: true
 
 module QA
-  context 'Manage', :group_saml, :orchestrated, :requires_admin, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/212378', type: :investigating } do
+  context 'Manage', :group_saml, :orchestrated, :requires_admin, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/212378', type: :bug } do
     describe 'Group SAML SSO - Non enforced SSO' do
       include Support::Api