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
274139fb
Commit
274139fb
authored
Jan 27, 2020
by
Aleksandr Soborov
Committed by
Walmyr Lima e Silva Filho
Jan 27, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix E2E test navigation to Group Security Dashboard
parent
56516981
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
ee/app/views/layouts/nav/ee/_security_link.html.haml
ee/app/views/layouts/nav/ee/_security_link.html.haml
+3
-3
qa/qa/ee/page/group/menu.rb
qa/qa/ee/page/group/menu.rb
+6
-2
No files found.
ee/app/views/layouts/nav/ee/_security_link.html.haml
View file @
274139fb
...
@@ -2,15 +2,15 @@
...
@@ -2,15 +2,15 @@
-
main_path
=
@group
.
feature_available?
(
:group_level_compliance_dashboard
)
?
group_security_compliance_dashboard_path
(
@group
)
:
group_security_dashboard_path
(
@group
)
-
main_path
=
@group
.
feature_available?
(
:group_level_compliance_dashboard
)
?
group_security_compliance_dashboard_path
(
@group
)
:
group_security_dashboard_path
(
@group
)
=
nav_link
(
path:
%w[groups/security/compliance_dashboard#show groups/security/dashboard#show]
)
do
=
nav_link
(
path:
%w[groups/security/compliance_dashboard#show groups/security/dashboard#show]
)
do
=
link_to
main_path
,
data:
{
qa_selector:
'security_
dashboard
_link'
}
do
=
link_to
main_path
,
data:
{
qa_selector:
'security_
compliance
_link'
}
do
.nav-icon-container
.nav-icon-container
=
sprite_icon
(
'shield'
)
=
sprite_icon
(
'shield'
)
%span
.nav-item-name
%span
.nav-item-name
=
_
(
'Security & Compliance'
)
=
_
(
'Security & Compliance'
)
%ul
.sidebar-sub-level-items
%ul
.sidebar-sub-level-items
{
data:
{
qa_selector:
'group_secure_submenu'
}
}
-
if
@group
.
feature_available?
(
:security_dashboard
)
-
if
@group
.
feature_available?
(
:security_dashboard
)
=
nav_link
(
path:
'groups/security/dashboard#show'
)
do
=
nav_link
(
path:
'groups/security/dashboard#show'
)
do
=
link_to
group_security_dashboard_path
(
@group
),
title:
_
(
'Security'
)
do
=
link_to
group_security_dashboard_path
(
@group
),
title:
_
(
'Security'
)
,
data:
{
qa_selector:
'security_dashboard_link'
}
do
%span
=
_
(
'Security'
)
%span
=
_
(
'Security'
)
-
if
@group
.
feature_available?
(
:group_level_compliance_dashboard
)
-
if
@group
.
feature_available?
(
:group_level_compliance_dashboard
)
...
...
qa/qa/ee/page/group/menu.rb
View file @
274139fb
...
@@ -19,6 +19,8 @@ module QA
...
@@ -19,6 +19,8 @@ module QA
end
end
view
'ee/app/views/layouts/nav/ee/_security_link.html.haml'
do
view
'ee/app/views/layouts/nav/ee/_security_link.html.haml'
do
element
:security_compliance_link
element
:group_secure_submenu
element
:security_dashboard_link
element
:security_dashboard_link
end
end
...
@@ -95,8 +97,10 @@ module QA
...
@@ -95,8 +97,10 @@ module QA
end
end
def
click_group_security_link
def
click_group_security_link
within_sidebar
do
hover_element
(
:security_compliance_link
)
do
click_element
(
:security_dashboard_link
)
within_submenu
(
:group_secure_submenu
)
do
click_element
(
:security_dashboard_link
)
end
end
end
end
end
end
end
...
...
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