6 files changed, 13 insertions, 8 deletions
diff --git a/qa/qa.rb b/qa/qa.rb
index c29d6ce5498..830a6aa17de 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $: << File.expand_path(File.dirname(__FILE__))
 
 Encoding.default_external = 'UTF-8'
@@ -213,10 +215,6 @@ module QA
       end
     end
 
-    module Shared
-      autoload :ClonePanel, 'qa/page/shared/clone_panel'
-    end
-
     module Profile
       autoload :PersonalAccessTokens, 'qa/page/profile/personal_access_tokens'
     end
@@ -250,6 +248,7 @@ module QA
     # Classes describing components that are used by several pages.
     #
     module Component
+      autoload :ClonePanel, 'qa/page/component/clone_panel'
       autoload :Dropzone, 'qa/page/component/dropzone'
       autoload :Select2, 'qa/page/component/select2'
     end
diff --git a/qa/qa/page/shared/clone_panel.rb b/qa/qa/page/component/clone_panel.rb
index 73e3dff956d..8e8ff4e3bb0 100644
--- a/qa/qa/page/shared/clone_panel.rb
+++ b/qa/qa/page/component/clone_panel.rb
@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module QA
   module Page
-    module Shared
+    module Component
       module ClonePanel
         def self.included(base)
           base.view 'app/views/shared/_clone_panel.html.haml' do
diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb
index 5bc0598a524..587a02163b9 100644
--- a/qa/qa/page/project/issue/show.rb
+++ b/qa/qa/page/project/issue/show.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module QA
   module Page
     module Project
diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb
index c751b472535..07b4d0b745d 100644
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
@@ -2,7 +2,7 @@ module QA
   module Page
     module Project
       class Show < Page::Base
-        include Page::Shared::ClonePanel
+        include Page::Component::ClonePanel
 
         view 'app/views/projects/_last_push.html.haml' do
           element :create_merge_request
diff --git a/qa/qa/page/project/wiki/show.rb b/qa/qa/page/project/wiki/show.rb
index 044e514bab3..c47a715687f 100644
--- a/qa/qa/page/project/wiki/show.rb
+++ b/qa/qa/page/project/wiki/show.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module QA
   module Page
     module Project
       module Wiki
         class Show < Page::Base
-          include Page::Shared::ClonePanel
+          include Page::Component::ClonePanel
 
           view 'app/views/projects/wikis/pages.html.haml' do
             element :clone_repository_link, 'Clone repository'
diff --git a/qa/qa/scenario/test/integration/object_storage.rb b/qa/qa/scenario/test/integration/object_storage.rb
index 874789db20d..2e028bbb5c6 100644
--- a/qa/qa/scenario/test/integration/object_storage.rb
+++ b/qa/qa/scenario/test/integration/object_storage.rb
@@ -4,7 +4,7 @@ module QA
   module Scenario
     module Test
       module Integration
-        class ObjectStorage < Test::Instance
+        class ObjectStorage < Test::Instance::All
           tags :object_storage
         end
       end