Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1c430546
Commit
1c430546
authored
Apr 02, 2020
by
Sanad Liaquat
Committed by
Walmyr Lima e Silva Filho
Apr 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Group SAML SSO selectors
Also fix the the sanity test for the selectors in QA::EE::Page::Group::Menu
parent
fcf2ee20
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
9 deletions
+14
-9
ee/app/views/groups/ee/_administration_nav.html.haml
ee/app/views/groups/ee/_administration_nav.html.haml
+3
-3
qa/qa/ee/page/group/menu.rb
qa/qa/ee/page/group/menu.rb
+9
-4
qa/qa/ee/page/group/settings/general.rb
qa/qa/ee/page/group/settings/general.rb
+1
-1
qa/qa/specs/features/ee/browser_ui/1_manage/group/group_saml_non_enforced_sso_spec.rb
...ser_ui/1_manage/group/group_saml_non_enforced_sso_spec.rb
+1
-1
No files found.
ee/app/views/groups/ee/_administration_nav.html.haml
View file @
1c430546
...
...
@@ -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
View file @
1c430546
...
...
@@ -7,10 +7,9 @@ module QA
module
Menu
prepend
QA
::
Page
::
Group
::
SubMenus
::
Common
def
self
.
inclu
ded
(
base
)
def
self
.
prepen
ded
(
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
View file @
1c430546
...
...
@@ -9,7 +9,7 @@ module QA
prepend
::
QA
::
Page
::
Component
::
Select2
prepend
::
QA
::
Page
::
Settings
::
Common
def
self
.
inclu
ded
(
base
)
def
self
.
prepen
ded
(
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
View file @
1c430546
# frozen_string_literal: true
module
QA
context
'Manage'
,
:group_saml
,
:orchestrated
,
:requires_admin
,
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/212378'
,
type: :
investigatin
g
}
do
context
'Manage'
,
:group_saml
,
:orchestrated
,
:requires_admin
,
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/212378'
,
type: :
bu
g
}
do
describe
'Group SAML SSO - Non enforced SSO'
do
include
Support
::
Api
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment