diff options
Diffstat (limited to 'qa/qa/page/main/menu.rb')
| -rw-r--r-- | qa/qa/page/main/menu.rb | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb index 934aa182b12..7e0337035e3 100644 --- a/qa/qa/page/main/menu.rb +++ b/qa/qa/page/main/menu.rb @@ -17,11 +17,11 @@ module QA # 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 element :navbar, required: true # TODO: rename to sidebar once it's default implementation - element :user_menu, required: !Runtime::Env.phone_layout? - element :user_avatar_content, required: !Runtime::Env.phone_layout? end view 'app/assets/javascripts/super_sidebar/components/user_menu.vue' do + element :user_menu, required: !Runtime::Env.phone_layout? + element :user_avatar_content, required: !Runtime::Env.phone_layout? element :sign_out_link element :edit_profile_link end @@ -32,6 +32,7 @@ module QA view 'app/assets/javascripts/super_sidebar/components/user_bar.vue' do element :global_search_button + element :stop_impersonation_link end view 'app/assets/javascripts/super_sidebar/components/global_search/components/global_search.vue' do @@ -252,16 +253,11 @@ module QA end def has_admin_area_link?(wait: Capybara.default_max_wait_time) - within_top_menu do - click_element(:navbar_dropdown, title: 'Menu') - has_element?(:admin_area_link, wait: wait) - end - end + return super if Runtime::Env.super_sidebar_enabled? - def has_no_admin_area_link?(wait: Capybara.default_max_wait_time) within_top_menu do click_element(:navbar_dropdown, title: 'Menu') - has_no_element?(:admin_area_link, wait: wait) + has_element?(:admin_area_link, wait: wait) end end |