Move Design Mgmt. qa tests to FOSS

As part of effort to move Design Management to
FOSS, this commit fixes and moves
all relevant QA tests for Design Mgmt. to CE

app/views/projects/issues/_design_management.html.haml

 - if @project.design_management_enabled?
-  #js-design-management{ data: { project_path: @project.full_path, issue_iid: @issue.iid, issue_path: project_issue_path(@project, @issue) } }
+  .js-design-management{ data: { project_path: @project.full_path, issue_iid: @issue.iid, issue_path: project_issue_path(@project, @issue) } }
 - else
   .mt-4
     .row.empty-state

app/views/projects/issues/_tabs.html.haml

 %ul.nav-tabs.nav.nav-links{ role: 'tablist' }
   %li
-    = link_to '#discussion-tab', class: 'active js-issue-tabs', id: 'discussion', role: 'tab', 'aria-controls': 'js-discussion', 'aria-selected': 'true', data: { toggle: 'tab', target: '#discussion-tab' } do
+    = link_to '#discussion-tab', class: 'active js-issue-tabs', id: 'discussion', role: 'tab', 'aria-controls': 'js-discussion', 'aria-selected': 'true', data: { toggle: 'tab', target: '#discussion-tab', qa_selector: 'discussion_tab_link' } do
       = _('Discussion')
       %span.badge.badge-pill.js-discussions-count
   %li
@@ -8,7 +8,7 @@
       = _('Designs')
       %span.badge.badge-pill.js-designs-count
 .tab-content
-  #discussion-tab.tab-pane.show.active{ role: 'tabpanel', 'aria-labelledby': 'discussion' }
+  #discussion-tab.tab-pane.show.active{ role: 'tabpanel', 'aria-labelledby': 'discussion', data: { qa_selector: 'discussion_tab_content' } }
     = render 'projects/issues/discussion'
-  #designs-tab.tab-pane{ role: 'tabpanel', 'aria-labelledby': 'designs', data: { qa_selector: 'designs_tab_content'} }
+  #designs-tab.tab-pane{ role: 'tabpanel', 'aria-labelledby': 'designs', data: { qa_selector: 'designs_tab_content' } }
     = render 'projects/issues/design_management'

ee/app/views/projects/issues/_discussion.html.haml

-%ul.nav-tabs.nav.nav-links{ role: 'tablist' }
-  %li
-    = link_to '#discussion-tab', class: 'active js-issue-tabs', id: 'discussion', role: 'tab', 'aria-controls': 'js-discussion', 'aria-selected': 'true', data: { toggle: 'tab', target: '#discussion-tab' } do
-      = _('Discussion')
-      %span.badge.badge-pill.js-discussions-count
-  %li
-    = link_to '#designs-tab', class: 'js-issue-tabs', id: 'designs', role: 'tab', 'aria-controls': 'js-designs', 'aria-selected': 'false', data: { toggle: 'tab', target: '#designs-tab', qa_selector: 'designs_tab_link' } do
-      = _('Designs')
-      %span.badge.badge-pill.js-designs-count
-.tab-content
-  #discussion-tab.tab-pane.show.active{ role: 'tabpanel', 'aria-labelledby': 'discussion' }
-    = render_ce 'projects/issues/discussion'
-  #designs-tab.tab-pane{ role: 'tabpanel', 'aria-labelledby': 'designs', data: { qa_selector: 'designs_tab_content'} }
-    - if @project.design_management_enabled?
-      .js-design-management{ data: { project_path: @project.full_path, issue_iid: @issue.iid, issue_path: project_issue_path(@project, @issue) } }
-    - else
-      .mt-4
-        .row.empty-state
-          .col-12
-            .text-content
-              %h4.center
-                = _('The one place for your designs')
-              %p.center
-                - requirements_link_url = help_page_path('user/project/issues/design_management', anchor: 'requirements')
-                - requirements_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: requirements_link_url }
-                - support_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: EE::CUSTOMER_SUPPORT_URL }
-                - link_end = '</a>'.html_safe
-                = s_("DesignManagement|To enable design management, you'll need to  %{requirements_link_start}meet the requirements%{requirements_link_end}. If you need help, reach out to our %{support_link_start}support team%{support_link_end} for assistance.").html_safe % { requirements_link_start: requirements_link_start, requirements_link_end: link_end, support_link_start: support_link_start, support_link_end: link_end }

qa/qa.rb

@@ -418,6 +418,7 @@ module QA
       autoload :Note, 'qa/page/component/note'
       autoload :ConfirmModal, 'qa/page/component/confirm_modal'
       autoload :CustomMetric, 'qa/page/component/custom_metric'
+      autoload :DesignManagement, 'qa/page/component/design_management'
 
       module Issuable
         autoload :Common, 'qa/page/component/issuable/common'

qa/qa/ee.rb

@@ -13,7 +13,6 @@ module QA
 
     module Page
       module Component
-        autoload :DesignManagement, 'qa/ee/page/component/design_management'
         autoload :LicenseManagement, 'qa/ee/page/component/license_management'
         autoload :SecureReport, 'qa/ee/page/component/secure_report'
 

qa/qa/ee/page/component/design_management.rb

-# frozen_string_literal: true
-
-module QA
-  module EE
-    module Page
-      module Component
-        module DesignManagement
-          def self.prepended(page)
-            page.module_eval do
-              view 'ee/app/assets/javascripts/design_management/components/design_notes/design_discussion.vue' do
-                element :design_discussion_content
-              end
-
-              view 'ee/app/assets/javascripts/design_management/components/design_notes/design_note.vue' do
-                element :note_content
-              end
-
-              view 'ee/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue' do
-                element :note_textarea
-                element :save_comment_button
-              end
-
-              view 'ee/app/assets/javascripts/design_management/components/design_overlay.vue' do
-                element :design_image_button
-              end
-
-              view 'ee/app/assets/javascripts/design_management/components/list/item.vue' do
-                element :design_file_name
-                element :design_image
-              end
-            end
-          end
-
-          def add_annotation(note)
-            click_element(:design_image_button)
-            fill_element(:note_textarea, note)
-            click_element(:save_comment_button)
-
-            # It takes a moment for the annotation to be saved.
-            # We'll check for the annotation in a test, but here we'll at least
-            # wait for the "Save comment" button to disappear
-            saved = has_no_element?(:save_comment_button)
-
-            raise ExpectationNotMet, %q(There was a problem while adding the annotation) unless saved
-          end
-
-          def add_design(design_file_path)
-            # `attach_file` doesn't seem able to find element via data attributes.
-            # It accepts a `class:` option, but that only works for class attributes
-            # It doesn't work as a CSS selector.
-            # So instead we use the name attribute as a locator
-            page.attach_file("design_file", design_file_path, make_visible: { display: 'block' })
-
-            filename = ::File.basename(design_file_path)
-
-            found = wait_until(reload: false, sleep_interval: 1) do
-              image = find_element(:design_image)
-
-              has_element?(:design_file_name, text: filename) &&
-                image["complete"] &&
-                image["naturalWidth"].to_i > 0
-            end
-
-            raise ElementNotFound, %Q(Attempted to attach design "#{filename}" but it did not appear) unless found
-          end
-
-          def click_design(filename)
-            click_element(:design_file_name, text: filename)
-          end
-
-          def has_annotation?(note)
-            within_element_by_index(:design_discussion_content, 0) do
-              has_element?(:note_content, text: note)
-            end
-          end
-        end
-      end
-    end
-  end
-end

qa/qa/ee/page/project/issue/show.rb

@@ -6,8 +6,6 @@ module QA
       module Project
         module Issue
           module Show
-            include Page::Component::DesignManagement
-
             def self.prepended(page)
               page.module_eval do
                 view 'ee/app/assets/javascripts/related_issues/components/add_issuable_form.vue' do
@@ -34,19 +32,9 @@ module QA
                   element :weight_input_field
                   element :weight_no_value_content
                 end
-
-                view 'ee/app/views/projects/issues/_discussion.html.haml' do
-                  element :designs_tab_link
-                  element :designs_tab_content
-                end
               end
             end
 
-            def click_designs_tab
-              click_element(:designs_tab_link)
-              active_element?(:designs_tab_content)
-            end
-
             def click_remove_weight_link
               click_element(:remove_weight_link)
             end

qa/qa/page/component/design_management.rb

+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Component
+      module DesignManagement
+        def self.prepended(page)
+          page.module_eval do
+            view 'app/assets/javascripts/design_management/components/design_notes/design_discussion.vue' do
+              element :design_discussion_content
+            end
+
+            view 'app/assets/javascripts/design_management/components/design_notes/design_note.vue' do
+              element :note_content
+            end
+
+            view 'app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue' do
+              element :note_textarea
+              element :save_comment_button
+            end
+
+            view 'app/assets/javascripts/design_management/components/design_overlay.vue' do
+              element :design_image_button
+            end
+
+            view 'app/assets/javascripts/design_management/components/list/item.vue' do
+              element :design_file_name
+              element :design_image
+            end
+          end
+        end
+
+        def add_annotation(note)
+          click_element(:design_image_button)
+          fill_element(:note_textarea, note)
+          click_element(:save_comment_button)
+
+          # It takes a moment for the annotation to be saved.
+          # We'll check for the annotation in a test, but here we'll at least
+          # wait for the "Save comment" button to disappear
+          saved = has_no_element?(:save_comment_button)
+
+          raise ExpectationNotMet, %q(There was a problem while adding the annotation) unless saved
+        end
+
+        def add_design(design_file_path)
+          # `attach_file` doesn't seem able to find element via data attributes.
+          # It accepts a `class:` option, but that only works for class attributes
+          # It doesn't work as a CSS selector.
+          # So instead we use the name attribute as a locator
+          page.attach_file("design_file", design_file_path, make_visible: { display: 'block' })
+
+          filename = ::File.basename(design_file_path)
+
+          found = wait_until(reload: false, sleep_interval: 1) do
+            image = find_element(:design_image)
+
+            has_element?(:design_file_name, text: filename) &&
+              image["complete"] &&
+              image["naturalWidth"].to_i > 0
+          end
+
+          raise ElementNotFound, %Q(Attempted to attach design "#{filename}" but it did not appear) unless found
+        end
+
+        def click_design(filename)
+          click_element(:design_file_name, text: filename)
+        end
+
+        def has_annotation?(note)
+          within_element_by_index(:design_discussion_content, 0) do
+            has_element?(:note_content, text: note)
+          end
+        end
+      end
+    end
+  end
+end

qa/qa/page/project/issue/show.rb

@@ -7,6 +7,7 @@ module QA
         class Show < Page::Base
           include Page::Component::Issuable::Common
           include Page::Component::Note
+          include Page::Component::DesignManagement
 
           view 'app/assets/javascripts/notes/components/comment_form.vue' do
             element :comment_button
@@ -56,6 +57,18 @@ module QA
             element :new_note_form, 'attr: :note' # rubocop:disable QA/ElementWithPattern
           end
 
+          view 'app/views/projects/issues/_tabs.html.haml' do
+            element :designs_tab_link
+            element :designs_tab_content
+            element :discussion_tab_link
+            element :discussion_tab_content
+          end
+
+          def click_designs_tab
+            click_element(:designs_tab_link)
+            active_element?(:designs_tab_content)
+          end
+
           def click_milestone_link
             click_element(:milestone_link)
           end