Add latest changes from gitlab-org/gitlab@master

6 files changed, 18 insertions, 5 deletions

diff --git a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue
index f28e49df56e..14e99977a85 100644
--- a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue
+++ b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue
@@ -79,6 +79,8 @@ export default {
     :title="tooltipTitle"
     :class="{ 'ml-auto': isCentered }"
     class="file-changed-icon d-inline-block"
+    data-qa-selector="changed_file_icon_content"
+    :data-qa-title="tooltipTitle"
   >
     <gl-icon v-if="showIcon" :name="changedIcon" :size="size" :class="changedIconClass" />
   </span>
diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue
index fa5707c306c..9ff35132ac9 100644
--- a/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue
@@ -54,7 +54,7 @@ export default {
 </script>
 
 <template>
-  <div class="preview-container">
+  <div class="preview-container" data-qa-selector="preview_container">
     <image-viewer v-if="type === 'image'" :path="path" :file-size="fileSize" />
     <markdown-viewer
       v-if="type === 'markdown'"
diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue
index 12078cdc16d..af85a2fda06 100644
--- a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue
@@ -41,7 +41,14 @@ export default {
         {{ fileName }}
         <template v-if="fileSize > 0"> ({{ fileSizeReadable }}) </template>
       </p>
-      <a :href="path" class="btn btn-default" rel="nofollow" :download="fileName" target="_blank">
+      <a
+        :href="path"
+        class="btn btn-default"
+        rel="nofollow"
+        :download="fileName"
+        target="_blank"
+        data-qa-selector="download_button"
+      >
         <gl-icon :size="16" name="download" class="float-left gl-mr-3" />
         {{ __('Download') }}
       </a>
diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue
index 4c3dd6cd229..9ece6a52805 100644
--- a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue
@@ -82,7 +82,7 @@ export default {
 </script>
 
 <template>
-  <div data-testid="image-viewer">
+  <div data-testid="image-viewer" data-qa-selector="image_viewer_container">
     <div :class="innerCssClasses" class="position-relative">
       <img ref="contentImg" :src="path" @load="onImgLoad" />
       <slot
diff --git a/app/assets/javascripts/vue_shared/components/file_row.vue b/app/assets/javascripts/vue_shared/components/file_row.vue
index 4d07d9fcfdd..96567111bbc 100644
--- a/app/assets/javascripts/vue_shared/components/file_row.vue
+++ b/app/assets/javascripts/vue_shared/components/file_row.vue
@@ -137,7 +137,11 @@ export default {
     @click="clickFile"
     @mouseleave="$emit('mouseleave', $event)"
   >
-    <div class="file-row-name-container">
+    <div
+      class="file-row-name-container"
+      data-qa-selector="file_row_container"
+      :data-qa-file-name="file.name"
+    >
       <span
         ref="textOutput"
         :style="levelIndentation"
diff --git a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
index ea483416c46..efb99eb0d94 100644
--- a/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
+++ b/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue
@@ -104,7 +104,7 @@ export default {
       :target="() => $refs.userAvatarImage"
       :placement="tooltipPlacement"
       boundary="window"
-      class="js-user-avatar-image-toolip"
+      class="js-user-avatar-image-tooltip"
     >
       <slot> {{ tooltipText }} </slot>
     </gl-tooltip>