diff options
Diffstat (limited to 'qa/qa/page/main/menu.rb')
| -rw-r--r-- | qa/qa/page/main/menu.rb | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb index 0b258c9ee34..bc99aa14b0d 100644 --- a/qa/qa/page/main/menu.rb +++ b/qa/qa/page/main/menu.rb @@ -6,12 +6,6 @@ module QA class Menu < Page::Base prepend Mobile::Page::Main::Menu if Runtime::Env.mobile_layout? - view 'app/views/layouts/header/_current_user_dropdown.html.haml' do - element :sign_out_link - element :edit_profile_link - element :user_profile_link - end - if QA::Runtime::Env.super_sidebar_enabled? # Define alternative navbar (super sidebar) which does not yet implement all the same elements view 'app/assets/javascripts/super_sidebar/components/super_sidebar.vue' do @@ -19,6 +13,11 @@ module QA element :user_menu, required: !QA::Runtime::Env.mobile_layout? element :user_avatar_content, required: !QA::Runtime::Env.mobile_layout? end + + view 'app/assets/javascripts/super_sidebar/components/user_menu.vue' do + element :sign_out_link + element :edit_profile_link + end else view 'app/views/layouts/header/_default.html.haml' do element :navbar, required: true @@ -30,6 +29,12 @@ module QA element :merge_requests_shortcut_button, required: !QA::Runtime::Env.mobile_layout? element :todos_shortcut_button, required: !QA::Runtime::Env.mobile_layout? end + + view 'app/views/layouts/header/_current_user_dropdown.html.haml' do + element :sign_out_link + element :edit_profile_link + element :user_profile_link + end end view 'app/assets/javascripts/nav/components/top_nav_app.vue' do @@ -100,6 +105,8 @@ module QA end def go_to_menu_dropdown_option(option_name) + return click_element(option_name) if QA::Runtime::Env.super_sidebar_enabled? + within_top_menu do click_element(:navbar_dropdown, title: 'Menu') click_element(option_name) |