Squashed commits

qa/qa.rb

@@ -120,6 +120,7 @@ module QA
     module Main
       autoload :Login, 'qa/page/main/login'
+      autoload :Menu, 'qa/page/main/menu'
       autoload :OAuth, 'qa/page/main/oauth'
       autoload :SignUp, 'qa/page/main/sign_up'
     end
@@ -128,13 +129,6 @@ module QA
       autoload :Common, 'qa/page/settings/common'
     end
-    module Menu
-      autoload :Main, 'qa/page/menu/main'
-      autoload :Side, 'qa/page/menu/side'
-      autoload :Admin, 'qa/page/menu/admin'
-      autoload :Profile, 'qa/page/menu/profile'
-    end
-
     module Dashboard
       autoload :Projects, 'qa/page/dashboard/projects'
       autoload :Groups, 'qa/page/dashboard/groups'
@@ -158,6 +152,7 @@ module QA
       autoload :New, 'qa/page/project/new'
       autoload :Show, 'qa/page/project/show'
       autoload :Activity, 'qa/page/project/activity'
+      autoload :Menu, 'qa/page/project/menu'
       module Import
         autoload :Github, 'qa/page/project/import/github'
@@ -217,6 +212,7 @@ module QA
     end
     module Profile
+      autoload :Menu, 'qa/page/profile/menu'
       autoload :PersonalAccessTokens, 'qa/page/profile/personal_access_tokens'
       autoload :SSHKeys, 'qa/page/profile/ssh_keys'
     end
@@ -235,6 +231,8 @@ module QA
     end
     module Admin
+      autoload :Menu, 'qa/page/admin/menu'
+
       module Settings
         autoload :Repository, 'qa/page/admin/settings/repository'

qa/qa/factory/resource/branch.rb

@@ -43,7 +43,7 @@ module QA
           # to `allow_to_push` variable.
           return branch unless @protected
-          Page::Menu::Side.act do
+          Page::Project::Menu.act do
             click_repository_settings
           end

qa/qa/factory/resource/deploy_key.rb

@@ -24,7 +24,7 @@ module QA
         def fabricate!
           project.visit!
-          Page::Menu::Side.act do
+          Page::Project::Menu.act do
             click_repository_settings
           end

qa/qa/factory/resource/fork.rb

@@ -32,7 +32,7 @@ module QA
             puts "Visited project page"
             Capybara::Screenshot.screenshot_and_save_page
-            return if Page::Menu::Main.act { has_personal_area?(wait: 0) }
+            return if Page::Main::Menu.act { has_personal_area?(wait: 0) }
             puts "Not signed in. Attempting to sign in again."
             Capybara::Screenshot.screenshot_and_save_page

qa/qa/factory/resource/kubernetes_cluster.rb

@@ -16,7 +16,7 @@ module QA
         def fabricate!
           @project.visit!
-          Page::Menu::Side.act { click_operations_kubernetes }
+          Page::Project::Menu.act { click_operations_kubernetes }
           Page::Project::Operations::Kubernetes::Index.perform do |page|
             page.add_kubernetes_cluster

qa/qa/factory/resource/personal_access_token.rb

@@ -12,8 +12,8 @@ module QA
         end
         def fabricate!
-          Page::Menu::Main.act { go_to_profile_settings }
-          Page::Menu::Profile.act { click_access_tokens }
+          Page::Main::Menu.act { go_to_profile_settings }
+          Page::Profile::Menu.act { click_access_tokens }
           Page::Profile::PersonalAccessTokens.perform do |page|
             page.fill_token_name(name || 'api-test-token')

qa/qa/factory/resource/project_milestone.rb

@@ -17,7 +17,7 @@ module QA
         def fabricate!
           project.visit!
-          Page::Menu::Side.act do
+          Page::Project::Menu.act do
             click_issues
             click_milestones
           end

qa/qa/factory/resource/runner.rb

@@ -26,7 +26,7 @@ module QA
         def fabricate!
           project.visit!
-          Page::Menu::Side.act { click_ci_cd_settings }
+          Page::Project::Menu.act { click_ci_cd_settings }
           Service::Runner.new(name).tap do |runner|
             Page::Project::Settings::CICD.perform do |settings|

qa/qa/factory/resource/sandbox.rb

@@ -11,7 +11,7 @@ module QA
         end
         def fabricate!
-          Page::Menu::Main.act { go_to_groups }
+          Page::Main::Menu.act { go_to_groups }
           Page::Dashboard::Groups.perform do |page|
             if page.has_group?(@name)

qa/qa/factory/resource/secret_variable.rb

@@ -12,7 +12,7 @@ module QA
         def fabricate!
           project.visit!
-          Page::Menu::Side.act { click_ci_cd_settings }
+          Page::Project::Menu.act { click_ci_cd_settings }
           Page::Project::Settings::CICD.perform do |setting|
             setting.expand_secret_variables do |page|

qa/qa/factory/resource/ssh_key.rb

@@ -27,8 +27,8 @@ module QA
         end
         def fabricate!
-          Page::Menu::Main.act { go_to_profile_settings }
-          Page::Menu::Profile.act { click_ssh_keys }
+          Page::Main::Menu.act { go_to_profile_settings }
+          Page::Profile::Menu.act { click_ssh_keys }
           Page::Profile::SSHKeys.perform do |page|
             page.add_key(public_key, title)

qa/qa/factory/resource/user.rb

@@ -38,8 +38,8 @@ module QA
         def fabricate!
           # Don't try to log-out if we're not logged-in
-          if Page::Menu::Main.act { has_personal_area?(wait: 0) }
-            Page::Menu::Main.perform { |main| main.sign_out }
+          if Page::Main::Menu.act { has_personal_area?(wait: 0) }
+            Page::Main::Menu.perform { |main| main.sign_out }
           end
           if credentials_given?

qa/qa/factory/resource/wiki.rb

@@ -10,7 +10,7 @@ module QA
         end
         def fabricate!
-          Page::Menu::Side.act { click_wiki }
+          Page::Project::Menu.act { click_wiki }
           Page::Project::Wiki::New.perform do |page|
             page.go_to_create_first_page
             page.set_title(@title)

qa/qa/factory/settings/hashed_storage.rb

@@ -6,8 +6,8 @@ module QA
           raise ArgumentError unless traits.include?(:enabled)
           Page::Main::Login.act { sign_in_using_credentials }
-          Page::Menu::Main.act { go_to_admin_area }
-          Page::Menu::Admin.act { go_to_settings }
+          Page::Main::Menu.act { go_to_admin_area }
+          Page::Admin::Menu.act { go_to_repository_settings }
           Page::Admin::Settings::Main.perform do |setting|
             setting.expand_repository_storage do |page|
@@ -16,7 +16,7 @@ module QA
             end
           end
-          QA::Page::Menu::Main.act { sign_out }
+          QA::Page::Main::Menu.act { sign_out }
         end
       end
     end

qa/qa/page/menu/admin.rb → qa/qa/page/admin/menu.rb

+# frozen_string_literal: true
+
 module QA
   module Page
-    module Menu
-      class Admin < Page::Base
+    module Admin
+      class Menu < Page::Base
         view 'app/views/layouts/nav/sidebar/_admin.html.haml' do
           element :admin_sidebar
           element :admin_sidebar_submenu

qa/qa/page/main/login.rb

@@ -37,13 +37,13 @@ module QA
           # we are already logged-in so we check both cases here.
           wait(max: 500) do
             has_css?('.login-page') ||
-              Page::Menu::Main.act { has_personal_area?(wait: 0) }
+              Page::Main::Menu.act { has_personal_area?(wait: 0) }
           end
         end
         def sign_in_using_credentials(user = nil)
           # Don't try to log-in if we're already logged-in
-          return if Page::Menu::Main.act { has_personal_area?(wait: 0) }
+          return if Page::Main::Menu.act { has_personal_area?(wait: 0) }
           using_wait_time 0 do
             set_initial_password_if_present
@@ -57,7 +57,7 @@ module QA
             end
           end
-          Page::Menu::Main.act { has_personal_area? }
+          Page::Main::Menu.act { has_personal_area? }
         end
         def sign_in_using_admin_credentials
@@ -72,7 +72,7 @@ module QA
             sign_in_using_gitlab_credentials(admin)
           end
-          Page::Menu::Main.act { has_personal_area? }
+          Page::Main::Menu.act { has_personal_area? }
         end
         def self.path

qa/qa/page/menu/main.rb → qa/qa/page/main/menu.rb

+# frozen_string_literal: true
+
 module QA
   module Page
-    module Menu
-      class Main < Page::Base
+    module Main
+      class Menu < Page::Base
         view 'app/views/layouts/header/_current_user_dropdown.html.haml' do
           element :user_sign_out_link, 'link_to _("Sign out")'
           element :settings_link, 'link_to s_("CurrentUser|Settings")'

qa/qa/page/main/sign_up.rb

@@ -19,7 +19,7 @@ module QA
           fill_in :new_user_password, with: user.password
           click_button 'Register'
-          Page::Menu::Main.act { assert_has_personal_area }
+          Page::Main::Menu.act { assert_has_personal_area }
         end
       end
     end

qa/qa/page/menu/profile.rb → qa/qa/page/profile/menu.rb

+# frozen_string_literal: true
+
 module QA
   module Page
-    module Menu
-      class Profile < Page::Base
+    module Profile
+      class Menu < Page::Base
         view 'app/views/layouts/nav/sidebar/_profile.html.haml' do
           element :access_token_link, 'link_to profile_personal_access_tokens_path'
           element :access_token_title, 'Access Tokens'

qa/qa/page/menu/side.rb → qa/qa/page/project/menu.rb

+# frozen_string_literal: true
+
 module QA
   module Page
-    module Menu
-      class Side < Page::Base
+    module Project
+      class Menu < Page::Base
         view 'app/views/layouts/nav/sidebar/_project.html.haml' do
           element :settings_item
           element :settings_link, 'link_to edit_project_path'