Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/admin')
-rw-r--r--app/assets/javascripts/admin/users/components/actions/approve.vue4
-rw-r--r--app/assets/javascripts/admin/users/components/user_actions.vue3
2 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/admin/users/components/actions/approve.vue b/app/assets/javascripts/admin/users/components/actions/approve.vue
index 5b13bd177ae..bcd17570b95 100644
--- a/app/assets/javascripts/admin/users/components/actions/approve.vue
+++ b/app/assets/javascripts/admin/users/components/actions/approve.vue
@@ -44,7 +44,7 @@ export default {
},
actionPrimary: {
text: I18N_USER_ACTIONS.approve,
- attributes: { variant: 'confirm', 'data-qa-selector': 'approve_user_confirm_button' },
+ attributes: { variant: 'confirm', 'data-testid': 'approve-user-confirm-button' },
},
messageHtml,
},
@@ -55,7 +55,7 @@ export default {
</script>
<template>
- <gl-disclosure-dropdown-item data-qa-selector="approve_user_button" @action="onClick">
+ <gl-disclosure-dropdown-item @action="onClick">
<template #list-item>
<slot></slot>
</template>
diff --git a/app/assets/javascripts/admin/users/components/user_actions.vue b/app/assets/javascripts/admin/users/components/user_actions.vue
index 38c7d3f9b90..a9482d479b6 100644
--- a/app/assets/javascripts/admin/users/components/user_actions.vue
+++ b/app/assets/javascripts/admin/users/components/user_actions.vue
@@ -116,8 +116,7 @@ export default {
category="tertiary"
:toggle-text="$options.i18n.userAdministration"
text-sr-only
- data-testid="dropdown-toggle"
- data-qa-selector="user_actions_dropdown_toggle"
+ data-testid="user-actions-dropdown-toggle"
:data-qa-username="user.username"
no-caret
>