Add latest changes from gitlab-org/gitlab@master

3 files changed, 3 insertions, 4 deletions

diff --git a/app/assets/javascripts/vue_shared/components/markdown/editor_mode_switcher.vue b/app/assets/javascripts/vue_shared/components/markdown/editor_mode_switcher.vue
index f19dcca5166..9ffed6245ba 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/editor_mode_switcher.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/editor_mode_switcher.vue
@@ -30,7 +30,7 @@ export default {
     <gl-button
       :id="$options.richTextEditorButtonId"
       class="btn btn-default btn-sm gl-button btn-default-tertiary gl-font-sm! gl-text-secondary! gl-px-4!"
-      data-qa-selector="editing_mode_switcher"
+      data-testid="editing-mode-switcher"
       @click="$emit('switch')"
       >{{ text }}</gl-button
     >
diff --git a/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue b/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue
index fc7e0a7c732..246dc4da801 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue
@@ -292,7 +292,7 @@ export default {
           class="note-textarea js-gfm-input markdown-area"
           dir="auto"
           :data-supports-quick-actions="supportsQuickActions"
-          :data-qa-selector="formFieldProps['data-qa-selector'] || 'markdown_editor_form_field'"
+          :data-testid="formFieldProps['data-testid'] || 'markdown-editor-form-field'"
           :disabled="disabled"
           @input="updateMarkdownFromMarkdownField"
           @keydown="$emit('keydown', $event)"
@@ -323,7 +323,7 @@ export default {
       <input
         v-bind="formFieldProps"
         :value="markdown"
-        data-qa-selector="markdown_editor_form_field"
+        data-testid="markdown-editor-form-field"
         type="hidden"
       />
     </div>
diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
index 4657954c8cc..bb36df0a778 100644
--- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
+++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue
@@ -268,7 +268,6 @@ export default {
           class="issue-title-text"
           dir="auto"
           :href="webUrl"
-          data-qa-selector="issuable_title_link"
           data-testid="issuable-title-link"
           v-bind="issuableTitleProps"
           @click="handleIssuableItemClick"