Commit 67d06dcf authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'ml-qa-geo-admin-menu-fix' into 'master'

QA: Update EE admin menu selectors

See merge request gitlab-org/gitlab-ee!7820
parents e11f5a61 80a03ca0
......@@ -134,7 +134,7 @@
%span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(AbuseReport.count(:all))
= 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
= sprite_icon('license')
%span.nav-item-name
......@@ -171,7 +171,7 @@
#{ _('Push Rules') }
= 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
= sprite_icon('location-dot')
%span.nav-item-name
......
# frozen_string_literal: true
module QA
module EE
module Page
......@@ -6,18 +8,18 @@ module QA
def self.prepended(page)
page.module_eval do
view 'app/views/layouts/nav/sidebar/_admin.html.haml' do
element :license, "_('License')"
element :geo_node, "_('Geo')"
element :link_license_menu
element :link_geo_menu
end
end
end
def go_to_geo_nodes
click_link 'Geo'
click_element :link_geo_menu
end
def go_to_license
click_link 'License'
click_element :link_license_menu
end
end
end
......
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