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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
98fc3f23
Commit
98fc3f23
authored
Jun 06, 2019
by
ddavison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Main::Menu locators
Fix the locators to not use a regex Add requirement
parent
390e0d89
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
qa/qa/page/main/menu.rb
qa/qa/page/main/menu.rb
+3
-3
No files found.
app/views/layouts/header/_default.html.haml
View file @
98fc3f23
...
...
@@ -64,7 +64,7 @@
.dropdown-menu.dropdown-menu-right
=
render
'layouts/header/help_dropdown'
-
if
header_link?
(
:user_dropdown
)
%li
.nav-item.header-user.dropdown
{
data:
{
track_label:
"profile_dropdown"
,
track_event:
"click_dropdown"
}
}
%li
.nav-item.header-user.dropdown
{
data:
{
track_label:
"profile_dropdown"
,
track_event:
"click_dropdown"
,
qa_selector:
'user_menu'
}
}
=
link_to
current_user
,
class:
user_dropdown_class
,
data:
{
toggle:
"dropdown"
}
do
=
image_tag
avatar_icon_for_user
(
current_user
,
23
),
width:
23
,
height:
23
,
class:
"header-user-avatar qa-user-avatar"
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
...
...
qa/qa/page/main/menu.rb
View file @
98fc3f23
...
...
@@ -12,7 +12,7 @@ module QA
view
'app/views/layouts/header/_default.html.haml'
do
element
:navbar
,
required:
true
element
:user_avatar
,
required:
true
element
:user_menu
,
'.dropdown-menu'
# rubocop:disable QA/ElementWithPattern
element
:user_menu
,
required:
true
end
view
'app/views/layouts/nav/_dashboard.html.haml'
do
...
...
@@ -82,7 +82,7 @@ module QA
private
def
within_top_menu
page
.
within
(
'.qa-navbar'
)
do
within_element
(
:navbar
)
do
yield
end
end
...
...
@@ -91,7 +91,7 @@ module QA
within_top_menu
do
click_element
:user_avatar
page
.
within
(
'.dropdown-menu'
)
do
within_element
(
:user_menu
)
do
yield
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