4 files changed, 49 insertions, 44 deletions
diff --git a/qa/qa/page/admin/settings/component/repository_storage.rb b/qa/qa/page/admin/settings/component/repository_storage.rb
new file mode 100644
index 00000000000..2ed0cd73aa3
--- /dev/null
+++ b/qa/qa/page/admin/settings/component/repository_storage.rb
@@ -0,0 +1,26 @@
+# 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
diff --git a/qa/qa/page/admin/settings/main.rb b/qa/qa/page/admin/settings/main.rb
deleted file mode 100644
index 73034ffe0d8..00000000000
--- a/qa/qa/page/admin/settings/main.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module QA
-  module Page
-    module Admin
-      module Settings
-        class Main < Page::Base
-          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
-    end
-  end
-end
diff --git a/qa/qa/page/admin/settings/repository.rb b/qa/qa/page/admin/settings/repository.rb
new file mode 100644
index 00000000000..b7f1deb21bd
--- /dev/null
+++ b/qa/qa/page/admin/settings/repository.rb
@@ -0,0 +1,23 @@
+# 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
+          end
+
+          def expand_repository_storage(&block)
+            expand_section(:repository_storage_settings) do
+              Component::RepositoryStorage.perform(&block)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/admin/settings/repository_storage.rb b/qa/qa/page/admin/settings/repository_storage.rb
deleted file mode 100644
index 68dd23a41e1..00000000000
--- a/qa/qa/page/admin/settings/repository_storage.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-module QA
-  module Page
-    module Admin
-      module Settings
-        class RepositoryStorage < Page::Base
-          view 'app/views/admin/application_settings/_repository_storage.html.haml' do
-            element :submit, "submit 'Save changes'"
-            element :hashed_storage,
-              'Use hashed storage paths for newly created and renamed projects'
-          end
-
-          def enable_hashed_storage
-            check 'Use hashed storage paths for newly created and renamed projects'
-          end
-
-          def save_settings
-            click_button 'Save changes'
-          end
-        end
-      end
-    end
-  end
-end