Commit 1c430546 authored by Sanad Liaquat's avatar Sanad Liaquat Committed by Walmyr Lima e Silva Filho

Update Group SAML SSO selectors

Also fix the the sanity test for the selectors in
QA::EE::Page::Group::Menu
parent fcf2ee20
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
= link_to administration_nav_path(@group) do = link_to administration_nav_path(@group) do
.nav-icon-container .nav-icon-container
= sprite_icon('admin') = sprite_icon('admin')
%span.nav-item-name %span.nav-item-name{ data: { qa_selector: 'group_administration_link' } }
= _('Administration') = _('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 = nav_link(path: group_administration_nav_link_paths, html_options: { class: "fly-out-top-item" } ) do
= link_to administration_nav_path(@group) do = link_to administration_nav_path(@group) do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
%li.divider.fly-out-top-item %li.divider.fly-out-top-item
- if show_saml_in_sidebar?(@group) - if show_saml_in_sidebar?(@group)
= nav_link(path: 'saml_providers#show') do = 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 %span
= _('SAML SSO') = _('SAML SSO')
......
...@@ -7,10 +7,9 @@ module QA ...@@ -7,10 +7,9 @@ module QA
module Menu module Menu
prepend QA::Page::Group::SubMenus::Common prepend QA::Page::Group::SubMenus::Common
def self.included(base) def self.prepended(base)
base.class_eval do base.class_eval do
view 'ee/app/views/groups/ee/_settings_nav.html.haml' do view 'ee/app/views/groups/ee/_settings_nav.html.haml' do
element :group_saml_sso_link
element :ldap_synchronization_link element :ldap_synchronization_link
element :audit_events_settings_link element :audit_events_settings_link
end end
...@@ -35,6 +34,12 @@ module QA ...@@ -35,6 +34,12 @@ module QA
element :group_sidebar_submenu element :group_sidebar_submenu
element :group_settings_item element :group_settings_item
end 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
end end
...@@ -55,8 +60,8 @@ module QA ...@@ -55,8 +60,8 @@ module QA
end end
def go_to_saml_sso_group_settings def go_to_saml_sso_group_settings
hover_element(:group_settings_item) do hover_element(:group_administration_link) do
within_submenu(:group_sidebar_submenu) do within_submenu(:group_sidebar_submenu_content) do
click_element(:group_saml_sso_link) click_element(:group_saml_sso_link)
end end
end end
......
...@@ -9,7 +9,7 @@ module QA ...@@ -9,7 +9,7 @@ module QA
prepend ::QA::Page::Component::Select2 prepend ::QA::Page::Component::Select2
prepend ::QA::Page::Settings::Common prepend ::QA::Page::Settings::Common
def self.included(base) def self.prepended(base)
base.class_eval do base.class_eval do
view 'ee/app/views/groups/_custom_project_templates_setting.html.haml' do view 'ee/app/views/groups/_custom_project_templates_setting.html.haml' do
element :custom_project_template_select element :custom_project_template_select
......
# frozen_string_literal: true # frozen_string_literal: true
module QA 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 describe 'Group SAML SSO - Non enforced SSO' do
include Support::Api include Support::Api
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment