Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 5 deletions

diff --git a/app/assets/javascripts/blob/components/blob_content.vue b/app/assets/javascripts/blob/components/blob_content.vue
index cb9997b7c54..5592a75a4d2 100644
--- a/app/assets/javascripts/blob/components/blob_content.vue
+++ b/app/assets/javascripts/blob/components/blob_content.vue
@@ -98,7 +98,7 @@ export default {
         :file-name="blob.name"
         :type="activeViewer.fileType"
         :hide-line-numbers="hideLineNumbers"
-        data-qa-selector="blob_viewer_file_content"
+        data-testid="blob-viewer-file-content"
         @richContentLoaded="richContentLoaded = true"
       />
     </template>
diff --git a/app/assets/javascripts/blob/components/blob_header_default_actions.vue b/app/assets/javascripts/blob/components/blob_header_default_actions.vue
index 12a198f78ea..ddc135e2de7 100644
--- a/app/assets/javascripts/blob/components/blob_header_default_actions.vue
+++ b/app/assets/javascripts/blob/components/blob_header_default_actions.vue
@@ -96,7 +96,7 @@ export default {
 };
 </script>
 <template>
-  <gl-button-group data-qa-selector="default_actions_container">
+  <gl-button-group data-testid="default-actions-container">
     <gl-button
       v-if="showCopyButton"
       v-gl-tooltip.hover
@@ -104,8 +104,7 @@ export default {
       :title="$options.BTN_COPY_CONTENTS_TITLE"
       :disabled="copyDisabled"
       :data-clipboard-target="getBlobHashTarget"
-      data-testid="copyContentsButton"
-      data-qa-selector="copy_contents_button"
+      data-testid="copy-contents-button"
       icon="copy-to-clipboard"
       category="primary"
       variant="default"
diff --git a/app/assets/javascripts/blob/components/blob_header_filepath.vue b/app/assets/javascripts/blob/components/blob_header_filepath.vue
index 95b88937c32..9187b45788a 100644
--- a/app/assets/javascripts/blob/components/blob_header_filepath.vue
+++ b/app/assets/javascripts/blob/components/blob_header_filepath.vue
@@ -49,7 +49,7 @@ export default {
       <file-icon :file-name="fileName" :size="16" aria-hidden="true" css-classes="gl-mr-3" />
       <strong
         class="file-title-name mr-1 js-blob-header-filepath"
-        data-qa-selector="file_title_content"
+        data-testid="file-title-content"
         >{{ fileName }}</strong
       >
     </template>