Merge branch 'jsl-update-geo-qa-scenario' into 'master'

Remove hashed storage enabling step from Geo QA scenario

See merge request gitlab-org/gitlab!36327

qa/qa.rb

@@ -109,10 +109,6 @@ module QA
       autoload :WikiPush, 'qa/resource/repository/wiki_push'
     end
 
-    module Settings
-      autoload :HashedStorage, 'qa/resource/settings/hashed_storage'
-    end
-
     module Wiki
       autoload :ProjectPage, 'qa/resource/wiki/project_page'
     end
@@ -419,7 +415,6 @@ module QA
       autoload :NewSession, 'qa/page/admin/new_session'
 
       module Settings
-        autoload :Repository, 'qa/page/admin/settings/repository'
         autoload :General, 'qa/page/admin/settings/general'
         autoload :MetricsAndProfiling, 'qa/page/admin/settings/metrics_and_profiling'
         autoload :Network, 'qa/page/admin/settings/network'
@@ -427,7 +422,6 @@ module QA
         module Component
           autoload :IpLimits, 'qa/page/admin/settings/component/ip_limits'
           autoload :OutboundRequests, 'qa/page/admin/settings/component/outbound_requests'
-          autoload :RepositoryStorage, 'qa/page/admin/settings/component/repository_storage'
           autoload :AccountAndLimit, 'qa/page/admin/settings/component/account_and_limit'
           autoload :PerformanceBar, 'qa/page/admin/settings/component/performance_bar'
         end

qa/qa/ee/scenario/test/geo.rb

@@ -27,7 +27,6 @@ module QA
             unless options[:geo_skip_setup?]
               Geo::Primary.act do
                 add_license
-                enable_hashed_storage
                 set_replication_password
                 set_primary_node
                 add_secondary_node
@@ -64,14 +63,6 @@ module QA
               end
             end
 
-            def enable_hashed_storage
-              puts 'Enabling hashed repository storage setting ...'
-
-              QA::Runtime::Browser.visit(:geo_primary, QA::Page::Main::Login) do
-                QA::Resource::Settings::HashedStorage.fabricate!(:enabled)
-              end
-            end
-
             def add_secondary_node
               puts 'Adding new Geo secondary node ...'
 

qa/qa/page/admin/settings/component/repository_storage.rb

-# frozen_string_literal: true
-
-module QA
-  module Page
-    module Admin
-      module Settings
-        module Component
-          class RepositoryStorage < Page::Base
-            view 'app/views/admin/application_settings/_repository_storage.html.haml' do
-              element :hashed_storage_checkbox
-              element :save_changes_button
-            end
-
-            def enable_hashed_storage
-              check_element :hashed_storage_checkbox
-            end
-
-            def save_settings
-              click_element :save_changes_button
-            end
-          end
-        end
-      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_settings_content
-          end
-
-          def expand_repository_storage(&block)
-            expand_content(:repository_storage_settings_content) do
-              Component::RepositoryStorage.perform(&block)
-            end
-          end
-        end
-      end
-    end
-  end
-end

qa/qa/resource/settings/hashed_storage.rb

-# frozen_string_literal: true
-
-module QA
-  module Resource
-    module Settings
-      class HashedStorage < Base
-        def fabricate!(*traits)
-          raise ArgumentError unless traits.include?(:enabled)
-
-          Page::Main::Login.perform(&:sign_in_using_credentials)
-          Page::Main::Menu.perform(&:go_to_admin_area)
-          Page::Admin::Menu.perform(&:go_to_repository_settings)
-
-          Page::Admin::Settings::Repository.perform do |setting|
-            setting.expand_repository_storage do |page|
-              page.enable_hashed_storage
-              page.save_settings
-            end
-          end
-
-          QA::Page::Main::Menu.perform(&:sign_out)
-        end
-      end
-    end
-  end
-end

qa/spec/page/validator_spec.rb

@@ -32,7 +32,7 @@ describe QA::Page::Validator do
     let(:view) { spy('view') }
 
     before do
-      allow(QA::Page::Admin::Settings::Repository)
+      allow(QA::Page::Admin::Settings::Network)
         .to receive(:views).and_return([view])
     end