1 files changed, 28 insertions, 7 deletions
diff --git a/qa/qa/page/menu/main.rb b/qa/qa/page/menu/main.rb
index b94c2c6c23d..f8978b8a5f7 100644
--- a/qa/qa/page/menu/main.rb
+++ b/qa/qa/page/menu/main.rb
@@ -2,19 +2,40 @@ module QA
   module Page
     module Menu
       class Main < Page::Base
+        view 'app/views/layouts/header/_default.html.haml' do
+          element :navbar
+          element :user_avatar
+          element :user_menu, '.dropdown-menu-nav'
+          element :user_sign_out_link, 'link_to "Sign out"'
+        end
+
+        view 'app/views/layouts/nav/_dashboard.html.haml' do
+          element :admin_area_link
+          element :projects_dropdown
+          element :groups_link
+        end
+
+        view 'app/views/layouts/nav/projects_dropdown/_show.html.haml' do
+          element :projects_dropdown_sidebar
+          element :your_projects_link
+        end
+
         def go_to_groups
-          within_top_menu { click_link 'Groups' }
+          within_top_menu { click_element :groups_link }
         end
 
         def go_to_projects
           within_top_menu do
-            click_link 'Projects'
-            click_link 'Your projects'
+            click_element :projects_dropdown
+          end
+
+          page.within('.qa-projects-dropdown-sidebar') do
+            click_element :your_projects_link
           end
         end
 
         def go_to_admin_area
-          within_top_menu { find('.admin-icon').click }
+          within_top_menu { click_element :admin_area_link }
         end
 
         def sign_out
@@ -24,20 +45,20 @@ module QA
         end
 
         def has_personal_area?
-          page.has_selector?('.header-user-dropdown-toggle')
+          page.has_selector?('.qa-user-avatar')
         end
 
         private
 
         def within_top_menu
-          page.within('.navbar') do
+          page.within('.qa-navbar') do
             yield
           end
         end
 
         def within_user_menu
           within_top_menu do
-            find('.header-user-dropdown-toggle').click
+            click_element :user_avatar
 
             page.within('.dropdown-menu-nav') do
               yield