Add latest changes from gitlab-org/gitlab@master

3 files changed, 84 insertions, 18 deletions

diff --git a/qa/qa/page/admin/menu.rb b/qa/qa/page/admin/menu.rb
index 5a18ebd7af8..2d1af78046d 100644
--- a/qa/qa/page/admin/menu.rb
+++ b/qa/qa/page/admin/menu.rb
@@ -6,12 +6,16 @@ module QA
       class Menu < Page::Base
         view 'app/views/layouts/nav/sidebar/_admin.html.haml' do
           element :admin_sidebar
-          element :admin_sidebar_submenu
+          element :admin_sidebar_settings_submenu
           element :admin_settings_item
           element :admin_settings_repository_item
           element :admin_settings_general_item
           element :admin_settings_metrics_and_profiling_item
           element :admin_settings_preferences_link
+          element :admin_monitoring_link
+          element :admin_sidebar_monitoring_submenu_content
+          element :admin_sidebar_overview_submenu_content
+          element :users_overview_link
         end
 
         view 'app/views/layouts/nav/sidebar/_admin.html.haml' do
@@ -19,59 +23,65 @@ module QA
         end
 
         def go_to_preferences_settings
-          hover_settings do
-            within_submenu do
+          hover_element(:admin_settings_item) do
+            within_submenu(:admin_sidebar_settings_submenu) do
               click_element :admin_settings_preferences_link
             end
           end
         end
 
         def go_to_repository_settings
-          hover_settings do
-            within_submenu do
+          hover_element(:admin_settings_item) do
+            within_submenu(:admin_sidebar_settings_submenu) do
               click_element :admin_settings_repository_item
             end
           end
         end
 
         def go_to_integration_settings
-          hover_settings do
-            within_submenu do
+          hover_element(:admin_settings_item) do
+            within_submenu(:admin_sidebar_settings_submenu) do
               click_element :integration_settings_link
             end
           end
         end
 
         def go_to_general_settings
-          hover_settings do
-            within_submenu do
+          hover_element(:admin_settings_item) do
+            within_submenu(:admin_sidebar_settings_submenu) do
               click_element :admin_settings_general_item
             end
           end
         end
 
         def go_to_metrics_and_profiling_settings
-          hover_settings do
-            within_submenu do
+          hover_element(:admin_settings_item) do
+            within_submenu(:admin_sidebar_settings_submenu) do
               click_element :admin_settings_metrics_and_profiling_item
             end
           end
         end
 
         def go_to_network_settings
-          hover_settings do
-            within_submenu do
+          hover_element(:admin_settings_item) do
+            within_submenu(:admin_sidebar_settings_submenu) do
               click_element :admin_settings_network_item
             end
           end
         end
 
+        def go_to_users_overview
+          within_submenu(:admin_sidebar_overview_submenu_content) do
+            click_element :users_overview_link
+          end
+        end
+
         private
 
-        def hover_settings
+        def hover_element(element)
           within_sidebar do
-            scroll_to_element(:admin_settings_item)
-            find_element(:admin_settings_item).hover
+            scroll_to_element(element)
+            find_element(element).hover
 
             yield
           end
@@ -83,8 +93,8 @@ module QA
           end
         end
 
-        def within_submenu
-          within_element(:admin_sidebar_submenu) do
+        def within_submenu(element)
+          within_element(element) do
             yield
           end
         end
diff --git a/qa/qa/page/admin/overview/users/index.rb b/qa/qa/page/admin/overview/users/index.rb
new file mode 100644
index 00000000000..e374c1bf281
--- /dev/null
+++ b/qa/qa/page/admin/overview/users/index.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Admin
+      module Overview
+        module Users
+          class Index < QA::Page::Base
+            view 'app/views/admin/users/index.html.haml' do
+              element :user_search_field
+            end
+
+            view 'app/views/admin/users/_user.html.haml' do
+              element :user_row_content
+            end
+
+            view 'app/views/admin/users/_user_detail.html.haml' do
+              element :username_link
+            end
+
+            def search_user(username)
+              find_element(:user_search_field).set(username).send_keys(:return)
+            end
+
+            def click_user(username)
+              within_element(:user_row_content, text: username) do
+                click_element(:username_link)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/admin/overview/users/show.rb b/qa/qa/page/admin/overview/users/show.rb
new file mode 100644
index 00000000000..11ea7bcabc8
--- /dev/null
+++ b/qa/qa/page/admin/overview/users/show.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Admin
+      module Overview
+        module Users
+          class Show < QA::Page::Base
+            view 'app/views/admin/users/_head.html.haml' do
+              element :impersonate_user_link
+            end
+
+            def click_impersonate_user
+              click_element(:impersonate_user_link)
+            end
+          end
+        end
+      end
+    end
+  end
+end