Add latest changes from gitlab-org/gitlab@master

6 files changed, 11 insertions, 18 deletions

diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue
index 47edec8dcb0..eb0f8f04e99 100644
--- a/app/assets/javascripts/environments/components/environment_item.vue
+++ b/app/assets/javascripts/environments/components/environment_item.vue
@@ -615,7 +615,7 @@ export default {
         :title="model.name"
         class="environment-name table-mobile-content"
       >
-        <a data-qa-selector="environment_link" :href="environmentPath">
+        <a :href="environmentPath">
           <span v-if="model.size === 1">{{ model.name }}</span>
           <span v-else>{{ model.name_without_type }}</span>
         </a>
diff --git a/app/assets/javascripts/groups/components/groups.vue b/app/assets/javascripts/groups/components/groups.vue
index 969b41f4755..f654e349119 100644
--- a/app/assets/javascripts/groups/components/groups.vue
+++ b/app/assets/javascripts/groups/components/groups.vue
@@ -40,7 +40,7 @@ export default {
 </script>
 
 <template>
-  <div class="groups-list-tree-container" data-qa-selector="groups_list_tree_container">
+  <div class="groups-list-tree-container" data-testid="groups-list-tree-container">
     <group-folder :groups="groups" :action="action" />
     <pagination-links
       :change="change"
diff --git a/app/assets/javascripts/groups/components/overview_tabs.vue b/app/assets/javascripts/groups/components/overview_tabs.vue
index 90a0582cc9f..8781f03a412 100644
--- a/app/assets/javascripts/groups/components/overview_tabs.vue
+++ b/app/assets/javascripts/groups/components/overview_tabs.vue
@@ -228,7 +228,7 @@ export default {
             <gl-search-box-by-type
               :value="search"
               :placeholder="$options.i18n.searchPlaceholder"
-              data-qa-selector="groups_filter_field"
+              data-testid="groups-filter-field"
               @input="handleSearchInput"
             />
           </div>
diff --git a/app/assets/javascripts/groups_projects/components/transfer_locations.vue b/app/assets/javascripts/groups_projects/components/transfer_locations.vue
index 5774065bff9..bce0a217deb 100644
--- a/app/assets/javascripts/groups_projects/components/transfer_locations.vue
+++ b/app/assets/javascripts/groups_projects/components/transfer_locations.vue
@@ -237,7 +237,6 @@ export default {
     <gl-form-group :label="label">
       <gl-dropdown
         :text="selectedText"
-        data-qa-selector="namespaces_list"
         data-testid="transfer-locations-dropdown"
         block
         toggle-class="gl-mb-0"
@@ -248,7 +247,7 @@ export default {
           <gl-search-box-by-type
             v-model.trim="searchTerm"
             :is-loading="isSearchLoading"
-            data-qa-selector="namespaces_list_search"
+            data-testid="transfer-locations-search"
           />
         </template>
         <template v-if="showAdditionalDropdownItems">
@@ -265,23 +264,18 @@ export default {
           <gl-dropdown-item
             v-for="item in userTransferLocations"
             :key="item.id"
-            data-qa-selector="namespaces_list_item"
             @click="handleSelect(item)"
             >{{ item.humanName }}</gl-dropdown-item
           >
         </div>
-        <div
-          v-if="hasGroupTransferLocations"
-          data-qa-selector="namespaces_list_groups"
-          data-testid="group-transfer-locations"
-        >
+        <div v-if="hasGroupTransferLocations" data-testid="group-transfer-locations">
           <gl-dropdown-section-header v-if="showUserTransferLocations">{{
             $options.i18n.GROUPS
           }}</gl-dropdown-section-header>
           <gl-dropdown-item
             v-for="item in groupTransferLocations"
             :key="item.id"
-            data-qa-selector="namespaces_list_item"
+            data-testid="group-transfer-item"
             @click="handleSelect(item)"
             >{{ item.humanName }}</gl-dropdown-item
           >
diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
index 8c6c11a9704..db354a01899 100644
--- a/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
+++ b/app/assets/javascripts/import_entities/import_groups/components/import_table.vue
@@ -146,7 +146,7 @@ export default {
     {
       key: 'progress',
       label: __('Status'),
-      tdAttr: { 'data-qa-selector': 'import_status_indicator' },
+      tdAttr: { 'data-testid': 'import-status-indicator' },
     },
     {
       key: 'actions',
@@ -326,7 +326,7 @@ export default {
     qaRowAttributes(group, type) {
       if (type === 'row') {
         return {
-          'data-qa-selector': 'import_item',
+          'data-testid': 'import-item',
           'data-qa-source-group': group.fullPath,
         };
       }
@@ -756,7 +756,6 @@ export default {
         <gl-table
           ref="table"
           class="gl-w-full import-table"
-          data-qa-selector="import_table"
           :tbody-tr-class="rowClasses"
           :tbody-tr-attr="qaRowAttributes"
           thead-class="gl-sticky gl-z-index-2 gl-bg-gray-10"
diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js
index 2c31e4c210c..674a901aebc 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js
+++ b/app/assets/javascripts/lib/utils/common_utils.js
@@ -82,7 +82,7 @@ export const handleLocationHash = () => {
 
   const fixedTabs = document.querySelector('.js-tabs-affix');
   const fixedDiffStats = document.querySelector('.js-diff-files-changed');
-  const fixedNav = document.querySelector('.navbar-gitlab');
+  const headerLoggedOut = document.querySelector('.header-logged-out');
   const fixedTopBar = document.querySelector('.top-bar-fixed');
   const performanceBar = document.querySelector('#js-peek');
   const topPadding = 8;
@@ -91,7 +91,7 @@ export const handleLocationHash = () => {
 
   let adjustment = 0;
 
-  adjustment -= getElementOffsetHeight(fixedNav);
+  adjustment -= getElementOffsetHeight(headerLoggedOut);
   adjustment -= getElementOffsetHeight(fixedTabs);
   adjustment -= getElementOffsetHeight(fixedDiffStats);
   adjustment -= getElementOffsetHeight(fixedTopBar);
@@ -153,7 +153,7 @@ export const contentTop = () => {
   const isDesktop = breakpointInstance.isDesktop();
   const heightCalculators = [
     () => getOuterHeight('#js-peek'),
-    () => getOuterHeight('.navbar-gitlab'),
+    () => getOuterHeight('.header-logged-out'),
     () => getOuterHeight('.top-bar-fixed'),
     ({ desktop }) => {
       const mrStickyHeader = document.querySelector('.merge-request-sticky-header');