Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 4 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 d36b29f69a5..a0e876b4c19 100644
--- a/app/assets/javascripts/related_issues/components/add_issuable_form.vue
+++ b/app/assets/javascripts/related_issues/components/add_issuable_form.vue
@@ -219,7 +219,7 @@ export default {
         type="submit"
         size="small"
         class="gl-mr-2"
-        data-testid="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 f92c81a7eb2..4811dfef3d0 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-testid="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_list.vue b/app/assets/javascripts/related_issues/components/related_issues_list.vue
index 8d26917f749..0e47184e24e 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-testid="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-testid="related_issuable_content"
+            data-testid="related-issuable-content"
             class="gl-mx-n2"
             @relatedIssueRemoveRequest="$emit('relatedIssueRemoveRequest', $event)"
           />