Merge branch 'willmeek-master-patch-71748' into 'master'

Update to re-add QA selectors

See merge request gitlab-org/gitlab!56324

app/assets/javascripts/issuable/components/csv_export_modal.vue

@@ -41,7 +41,7 @@ export default {
 </script>
 
 <template>
-  <gl-modal :modal-id="modalId" body-class="gl-p-0!">
+  <gl-modal :modal-id="modalId" body-class="gl-p-0!" data-qa-selector="export_issuable_modal">
     <template #modal-title>
       <gl-sprintf :message="__('Export %{name}')">
         <template #name>{{ issuableName }}</template>

app/assets/javascripts/issuable/components/csv_import_export_buttons.vue

@@ -60,11 +60,13 @@ export default {
         v-gl-tooltip.hover="__('Export as CSV')"
         v-gl-modal="exportModalId"
         icon="export"
+        data-qa-selector="export_as_csv_button"
         data-testid="export-csv-button"
       />
       <gl-dropdown
         v-if="showImportButton"
         v-gl-tooltip.hover="__('Import issues')"
+        data-qa-selector="import_issues_dropdown"
         data-testid="import-csv-dropdown"
         icon="import"
       >

qa/qa/page/project/issue/index.rb

@@ -15,18 +15,18 @@ module QA
             element :avatar_counter_content
           end
 
-          view 'app/views/shared/issuable/csv_export/_button.html.haml' do
+          view 'app/assets/javascripts/issuable/components/csv_import_export_buttons.vue' do
             element :export_as_csv_button
+            element :import_issues_dropdown
+            element :import_from_jira_link
           end
 
           view 'app/views/shared/issuable/csv_export/_modal.html.haml' do
             element :export_issues_button
-            element :export_issuable_modal
           end
 
-          view 'app/views/projects/issues/import_csv/_button.html.haml' do
-            element :import_issues_button
-            element :import_from_jira_link
+          view 'app/assets/javascripts/issuable/components/csv_export_modal.vue' do
+            element :export_issuable_modal
           end
 
           view 'app/views/shared/issuable/_nav.html.haml' do
@@ -60,7 +60,7 @@ module QA
           def click_import_issues_dropdown
             # When there are no issues, the image that loads causes the buttons to jump
             has_loaded_all_images?
-            click_element(:import_issues_button)
+            click_element(:import_issues_dropdown)
           end
 
           def export_issues_modal