diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-06 00:08:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-06 00:08:43 +0300 |
commit | 59712a466f6f12acf517cdea2c4fa876f0214124 (patch) | |
tree | ba91f1d944811e9eef71bd45843797ad9989c3af /app/assets/javascripts/nav | |
parent | 2b2299ea5f8717ad59a47c1c40d951409dfeb35b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/nav')
4 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/nav/components/new_nav_toggle.vue b/app/assets/javascripts/nav/components/new_nav_toggle.vue index 9db123da405..82302ec4602 100644 --- a/app/assets/javascripts/nav/components/new_nav_toggle.vue +++ b/app/assets/javascripts/nav/components/new_nav_toggle.vue @@ -92,7 +92,7 @@ export default { :value="isEnabled" :label="$options.i18n.toggleLabel" label-position="hidden" - data-qa-selector="new_navigation_toggle" + data-testid="new_navigation_toggle" /> </div> </li> diff --git a/app/assets/javascripts/nav/components/responsive_home.vue b/app/assets/javascripts/nav/components/responsive_home.vue index a80fda96363..371b252a6ba 100644 --- a/app/assets/javascripts/nav/components/responsive_home.vue +++ b/app/assets/javascripts/nav/components/responsive_home.vue @@ -55,7 +55,7 @@ export default { v-gl-tooltip="{ title: newDropdownViewModel.title }" :view-model="newDropdownViewModel" class="gl-ml-3" - data-qa-selector="mobile_new_dropdown" + data-testid="mobile_new_dropdown" /> </header> <top-nav-menu-sections class="gl-h-full" :sections="menuSections" v-on="$listeners" /> diff --git a/app/assets/javascripts/nav/components/top_nav_app.vue b/app/assets/javascripts/nav/components/top_nav_app.vue index ab9313f7041..22c77e9ae32 100644 --- a/app/assets/javascripts/nav/components/top_nav_app.vue +++ b/app/assets/javascripts/nav/components/top_nav_app.vue @@ -35,7 +35,7 @@ export default { <gl-nav class="navbar-sub-nav"> <gl-nav-item-dropdown v-gl-tooltip.bottom="navData.menuTooltip" - data-qa-selector="navbar_dropdown" + data-testid="navbar_dropdown" data-qa-title="Menu" menu-class="gl-mt-3! gl-max-w-none! gl-max-h-none! gl-sm-w-auto! js-top-nav-dropdown-menu" toggle-class="top-nav-toggle js-top-nav-dropdown-toggle gl-px-3!" diff --git a/app/assets/javascripts/nav/components/top_nav_dropdown_menu.vue b/app/assets/javascripts/nav/components/top_nav_dropdown_menu.vue index 0f069670d09..fa202a0574d 100644 --- a/app/assets/javascripts/nav/components/top_nav_dropdown_menu.vue +++ b/app/assets/javascripts/nav/components/top_nav_dropdown_menu.vue @@ -87,7 +87,6 @@ export default { :slot-key="activeView" class="gl-w-grid-size-40 gl-overflow-hidden gl-p-3" data-testid="menu-subview" - data-qa-selector="menu_subview_container" > <template #projects> <top-nav-container-view |