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
80a03ca0
Commit
80a03ca0
authored
Oct 05, 2018
by
Mark Lapierre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update EE admin menu QA selectors
Replace text-based selectors with specific QA classes
parent
ecb6c46c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
app/views/layouts/nav/sidebar/_admin.html.haml
app/views/layouts/nav/sidebar/_admin.html.haml
+2
-2
qa/qa/ee/page/menu/admin.rb
qa/qa/ee/page/menu/admin.rb
+6
-4
No files found.
app/views/layouts/nav/sidebar/_admin.html.haml
View file @
80a03ca0
...
@@ -134,7 +134,7 @@
...
@@ -134,7 +134,7 @@
%span
.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge
=
number_with_delimiter
(
AbuseReport
.
count
(
:all
))
%span
.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge
=
number_with_delimiter
(
AbuseReport
.
count
(
:all
))
=
nav_link
(
controller: :licenses
)
do
=
nav_link
(
controller: :licenses
)
do
=
link_to
admin_license_path
do
=
link_to
admin_license_path
,
class:
"qa-link-license-menu"
do
.nav-icon-container
.nav-icon-container
=
sprite_icon
(
'license'
)
=
sprite_icon
(
'license'
)
%span
.nav-item-name
%span
.nav-item-name
...
@@ -171,7 +171,7 @@
...
@@ -171,7 +171,7 @@
#{
_
(
'Push Rules'
)
}
#{
_
(
'Push Rules'
)
}
=
nav_link
(
controller:
%w(admin/geo/nodes admin/geo/projects)
)
do
=
nav_link
(
controller:
%w(admin/geo/nodes admin/geo/projects)
)
do
=
link_to
admin_geo_nodes_path
do
=
link_to
admin_geo_nodes_path
,
class:
"qa-link-geo-menu"
do
.nav-icon-container
.nav-icon-container
=
sprite_icon
(
'location-dot'
)
=
sprite_icon
(
'location-dot'
)
%span
.nav-item-name
%span
.nav-item-name
...
...
qa/qa/ee/page/menu/admin.rb
View file @
80a03ca0
# frozen_string_literal: true
module
QA
module
QA
module
EE
module
EE
module
Page
module
Page
...
@@ -6,18 +8,18 @@ module QA
...
@@ -6,18 +8,18 @@ module QA
def
self
.
prepended
(
page
)
def
self
.
prepended
(
page
)
page
.
module_eval
do
page
.
module_eval
do
view
'app/views/layouts/nav/sidebar/_admin.html.haml'
do
view
'app/views/layouts/nav/sidebar/_admin.html.haml'
do
element
:li
cense
,
"_('License')"
element
:li
nk_license_menu
element
:
geo_node
,
"_('Geo')"
element
:
link_geo_menu
end
end
end
end
end
end
def
go_to_geo_nodes
def
go_to_geo_nodes
click_
link
'Geo'
click_
element
:link_geo_menu
end
end
def
go_to_license
def
go_to_license
click_
link
'License'
click_
element
:link_license_menu
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