Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 1 deletions

diff --git a/app/assets/javascripts/issuable/components/csv_export_modal.vue b/app/assets/javascripts/issuable/components/csv_export_modal.vue
index 29a492c30e3..78987a5c629 100644
--- a/app/assets/javascripts/issuable/components/csv_export_modal.vue
+++ b/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>
diff --git a/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue b/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue
index a6497cd4e05..8f18902b590 100644
--- a/app/assets/javascripts/issuable/components/csv_import_export_buttons.vue
+++ b/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"
       >