Refactored components page objectepics-e2e-tests

5 files changed, 39 insertions, 48 deletions

diff --git a/qa/qa.rb b/qa/qa.rb
index e623a16f85e..636eade4fa7 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -254,8 +254,9 @@ module QA
       autoload :Dropzone, 'qa/page/component/dropzone'
       autoload :GroupsFilter, 'qa/page/component/groups_filter'
       autoload :Select2, 'qa/page/component/select2'
-      autoload :ShowCommon, 'qa/page/component/show_common'
-      autoload :CommentForm, 'qa/page/component/comment_form'
+      module Issuable
+        autoload :Common, 'qa/page/component/issuable/common'
+      end
     end
   end
 
diff --git a/qa/qa/page/component/comment_form.rb b/qa/qa/page/component/comment_form.rb
deleted file mode 100644
index b383dd630ce..00000000000
--- a/qa/qa/page/component/comment_form.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  module Page
-    module Component
-      module CommentForm
-        def self.included(base)
-          base.view 'app/assets/javascripts/notes/components/comment_form.vue' do
-            element :comment_button
-            element :comment_input
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/qa/qa/page/component/issuable/common.rb b/qa/qa/page/component/issuable/common.rb
new file mode 100644
index 00000000000..cfd8ac1e7c8
--- /dev/null
+++ b/qa/qa/page/component/issuable/common.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Component
+      module Issuable
+        module Common
+          def self.included(base)
+            base.view 'app/assets/javascripts/issue_show/components/title.vue' do
+              element :edit_button
+            end
+
+            base.view 'app/assets/javascripts/issue_show/components/fields/title.vue' do
+              element :title_input
+            end
+
+            base.view 'app/assets/javascripts/issue_show/components/fields/description.vue' do
+              element :description_textarea
+            end
+
+            base.view 'app/assets/javascripts/issue_show/components/edit_actions.vue' do
+              element :save_button
+              element :delete_button
+            end
+
+            base.view 'app/assets/javascripts/issue_show/components/edit_actions.vue' do
+              element :save_button
+              element :delete_button
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/component/show_common.rb b/qa/qa/page/component/show_common.rb
deleted file mode 100644
index 9d34ff2f293..00000000000
--- a/qa/qa/page/component/show_common.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module QA
-  module Page
-    module Component
-      module ShowCommon
-        def self.included(base)
-          base.view 'app/assets/javascripts/issue_show/components/title.vue' do
-            element :edit_button
-          end
-
-          base.view 'app/assets/javascripts/issue_show/components/fields/title.vue' do
-            element :title_input
-          end
-
-          base.view 'app/assets/javascripts/issue_show/components/fields/description.vue' do
-            element :description_textarea
-          end
-
-          base.view 'app/assets/javascripts/issue_show/components/edit_actions.vue' do
-            element :save_button
-            element :delete_button
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/qa/qa/page/project/issue/show.rb b/qa/qa/page/project/issue/show.rb
index ea3d1e511d2..9a738f56202 100644
--- a/qa/qa/page/project/issue/show.rb
+++ b/qa/qa/page/project/issue/show.rb
@@ -5,8 +5,7 @@ module QA
     module Project
       module Issue
         class Show < Page::Base
-          include Page::Component::ShowCommon
-          include Page::Component::CommentForm
+          include Page::Component::Issuable::Common
 
           view 'app/views/projects/issues/show.html.haml' do
             element :issue_details, '.issue-details'