Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

4 files changed, 4 insertions, 5 deletions

diff --git a/app/assets/javascripts/related_issues/components/add_issuable_form.vue b/app/assets/javascripts/related_issues/components/add_issuable_form.vue
index 7ecc39a56e7..b3033ddf3b6 100644
--- a/app/assets/javascripts/related_issues/components/add_issuable_form.vue
+++ b/app/assets/javascripts/related_issues/components/add_issuable_form.vue
@@ -218,7 +218,7 @@ export default {
         type="submit"
         size="small"
         class="gl-mr-2"
-        data-qa-selector="add_issue_button"
+        data-testid="add_issue_button"
       >
         {{ __('Add') }}
       </gl-button>
diff --git a/app/assets/javascripts/related_issues/components/related_issuable_input.vue b/app/assets/javascripts/related_issues/components/related_issuable_input.vue
index 1846b9cf8f4..f92c81a7eb2 100644
--- a/app/assets/javascripts/related_issues/components/related_issuable_input.vue
+++ b/app/assets/javascripts/related_issues/components/related_issuable_input.vue
@@ -217,7 +217,7 @@ export default {
           :aria-label="inputPlaceholder"
           type="text"
           class="gl-w-full gl-border-none gl-outline-0"
-          data-qa-selector="add_issue_field"
+          data-testid="add_issue_field"
           autocomplete="off"
           @input="onInput"
           @focus="onFocus"
diff --git a/app/assets/javascripts/related_issues/components/related_issues_block.vue b/app/assets/javascripts/related_issues/components/related_issues_block.vue
index 24b350c7f18..f672acda062 100644
--- a/app/assets/javascripts/related_issues/components/related_issues_block.vue
+++ b/app/assets/javascripts/related_issues/components/related_issues_block.vue
@@ -220,7 +220,6 @@ export default {
           <gl-button
             v-if="canAdmin"
             size="small"
-            data-qa-selector="related_issues_plus_button"
             data-testid="related-issues-plus-button"
             :aria-label="addIssuableButtonText"
             class="gl-ml-3"
diff --git a/app/assets/javascripts/related_issues/components/related_issues_list.vue b/app/assets/javascripts/related_issues/components/related_issues_list.vue
index 63452f3eace..8d26917f749 100644
--- a/app/assets/javascripts/related_issues/components/related_issues_list.vue
+++ b/app/assets/javascripts/related_issues/components/related_issues_list.vue
@@ -104,7 +104,7 @@ export default {
       {{ heading }}
     </h4>
     <div class="related-issues-token-body" :class="{ 'sortable-container': canReorder }">
-      <div v-if="isFetching" class="gl-mb-2" data-qa-selector="related_issues_loading_placeholder">
+      <div v-if="isFetching" class="gl-mb-2" data-testid="related_issues_loading_placeholder">
         <gl-loading-icon
           ref="loadingIcon"
           size="sm"
@@ -146,7 +146,7 @@ export default {
             :locked-message="issue.lockedMessage"
             :work-item-type="issue.type"
             event-namespace="relatedIssue"
-            data-qa-selector="related_issuable_content"
+            data-testid="related_issuable_content"
             class="gl-mx-n2"
             @relatedIssueRemoveRequest="$emit('relatedIssueRemoveRequest', $event)"
           />