Commit cf9f560d authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix/gb/qa/new-navigation-support' into 'master'

Fix GitLab QA for new navigation enabled by default

See merge request !14134
parents def8e64d 7fa14c6b
...@@ -3,20 +3,19 @@ module QA ...@@ -3,20 +3,19 @@ module QA
module Main module Main
class Menu < Page::Base class Menu < Page::Base
def go_to_groups def go_to_groups
within_global_menu { click_link 'Groups' } within_top_menu { click_link 'Groups' }
end end
def go_to_projects def go_to_projects
within_global_menu { click_link 'Projects' } within_top_menu { click_link 'Projects' }
end end
def go_to_admin_area def go_to_admin_area
within_user_menu { click_link 'Admin area' } within_top_menu { click_link 'Admin area' }
end end
def sign_out def sign_out
within_user_menu do within_user_menu do
find('.header-user-dropdown-toggle').click
click_link('Sign out') click_link('Sign out')
end end
end end
...@@ -27,17 +26,19 @@ module QA ...@@ -27,17 +26,19 @@ module QA
private private
def within_global_menu def within_top_menu
find('.global-dropdown-toggle').click page.within('.navbar') do
page.within('.global-dropdown-menu') do
yield yield
end end
end end
def within_user_menu def within_user_menu
page.within('.navbar-nav') do within_top_menu do
yield find('.header-user-dropdown-toggle').click
page.within('.dropdown-menu-nav') do
yield
end
end end
end 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