Merge branch 'ash.mckenzie/fix-geo-hash-storage-qa-spec' into 'master'

Geo: Fix Hashed Storage QA spec

Closes #7791

See merge request gitlab-org/gitlab-ee!7531

app/views/admin/application_settings/repository.html.haml

@@ -13,7 +13,7 @@
   .settings-content
     = render partial: 'repository_mirrors_form'
 
-%section.settings.as-repository-storage.no-animate#js-repository-storage-settings{ class: ('expanded' if expanded_by_default?) }
+%section.qa-repository-storage.settings.as-repository-storage.no-animate#js-repository-storage-settings{ class: ('expanded' if expanded_by_default?) }
   .settings-header
     %h4
       = _('Repository storage')

qa/qa.rb

@@ -238,6 +238,7 @@ module QA
       module Settings
         autoload :RepositoryStorage, 'qa/page/admin/settings/repository_storage'
         autoload :Main, 'qa/page/admin/settings/main'
+        autoload :Repository, 'qa/page/admin/settings/repository'
       end
     end
 

qa/qa/factory/settings/hashed_storage.rb

@@ -8,8 +8,9 @@ module QA
           Page::Main::Login.act { sign_in_using_credentials }
           Page::Menu::Main.act { go_to_admin_area }
           Page::Menu::Admin.act { go_to_settings }
+          Page::Menu::Side.act { click_repository }
 
-          Page::Admin::Settings::Main.perform do |setting|
+          Page::Admin::Settings::Repository.perform do |setting|
             setting.expand_repository_storage do |page|
               page.enable_hashed_storage
               page.save_settings

qa/qa/page/admin/settings/main.rb

@@ -6,13 +6,6 @@ module QA
           include QA::Page::Settings::Common
 
           view 'app/views/admin/application_settings/show.html.haml' do
-            element :terms_settings
-          end
-
-          def expand_repository_storage(&block)
-            expand_section(:terms_settings) do
-              RepositoryStorage.perform(&block)
-            end
           end
         end
       end

qa/qa/page/admin/settings/repository.rb

+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Admin
+      module Settings
+        class Repository < Page::Base
+          include QA::Page::Settings::Common
+
+          view 'app/views/admin/application_settings/repository.html.haml' do
+            element :repository_storage
+          end
+
+          def expand_repository_storage(&block)
+            expand_section(:repository_storage) do
+              RepositoryStorage.perform(&block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

qa/qa/page/menu/side.rb

@@ -84,6 +84,12 @@ module QA
           end
         end
 
+        def click_repository
+          within_sidebar do
+            click_link('Repository')
+          end
+        end
+
         private
 
         def hover_settings