summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-01-10 13:30:32 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-01-10 13:30:32 +0100
commitf4a694efd8f0dd9c84ab9bbbad1ead4238e0c99f (patch)
tree381405d652135d4423c4541eb3eb6f79bb4954b9
parenta9ace7bf0553457a10c606a5061524e9fb708325 (diff)
downloadgitlab-ce-qa/gb/validate-qa-selectors.tar.gz
Fix using wrong `Your projects` link in QA testsqa/gb/validate-qa-selectors
-rw-r--r--app/views/dashboard/_projects_head.html.haml2
-rw-r--r--app/views/layouts/nav/projects_dropdown/_show.html.haml4
-rw-r--r--qa/qa/page/menu/main.rb6
3 files changed, 8 insertions, 4 deletions
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index cc636d622a1..9038c4fbebd 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -6,7 +6,7 @@
.fade-right= icon('angle-right')
%ul.nav-links.scrolling-tabs
= nav_link(page: [dashboard_projects_path, root_path]) do
- = link_to dashboard_projects_path, class: 'shortcuts-activity qa-your-projects-link', data: {placement: 'right'} do
+ = link_to dashboard_projects_path, class: 'shortcuts-activity', data: {placement: 'right'} do
Your projects
= nav_link(page: starred_dashboard_projects_path) do
= link_to starred_dashboard_projects_path, data: {placement: 'right'} do
diff --git a/app/views/layouts/nav/projects_dropdown/_show.html.haml b/app/views/layouts/nav/projects_dropdown/_show.html.haml
index 32a24c101fc..59becb043d3 100644
--- a/app/views/layouts/nav/projects_dropdown/_show.html.haml
+++ b/app/views/layouts/nav/projects_dropdown/_show.html.haml
@@ -1,9 +1,9 @@
- project_meta = { id: @project.id, name: @project.name, namespace: @project.name_with_namespace, web_url: project_path(@project), avatar_url: @project.avatar_url } if @project&.persisted?
.projects-dropdown-container
- .project-dropdown-sidebar
+ .project-dropdown-sidebar.qa-projects-dropdown-sidebar
%ul
= nav_link(path: 'dashboard/projects#index') do
- = link_to dashboard_projects_path do
+ = link_to dashboard_projects_path, class: 'qa-your-projects-link' do
= _('Your projects')
= nav_link(path: 'projects#starred') do
= link_to starred_dashboard_projects_path do
diff --git a/qa/qa/page/menu/main.rb b/qa/qa/page/menu/main.rb
index 36172151969..f8978b8a5f7 100644
--- a/qa/qa/page/menu/main.rb
+++ b/qa/qa/page/menu/main.rb
@@ -15,7 +15,8 @@ module QA
element :groups_link
end
- view 'app/views/dashboard/_projects_head.html.haml' do
+ view 'app/views/layouts/nav/projects_dropdown/_show.html.haml' do
+ element :projects_dropdown_sidebar
element :your_projects_link
end
@@ -26,6 +27,9 @@ module QA
def go_to_projects
within_top_menu do
click_element :projects_dropdown
+ end
+
+ page.within('.qa-projects-dropdown-sidebar') do
click_element :your_projects_link
end
end