Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 4 deletions

diff --git a/app/assets/javascripts/access_tokens/components/access_token_table_app.vue b/app/assets/javascripts/access_tokens/components/access_token_table_app.vue
index 9a7296b6b1f..3b71e39d69b 100644
--- a/app/assets/javascripts/access_tokens/components/access_token_table_app.vue
+++ b/app/assets/javascripts/access_tokens/components/access_token_table_app.vue
@@ -158,7 +158,7 @@ export default {
               :aria-label="$options.i18n.revokeButton"
               :data-confirm="modalMessage(name)"
               data-confirm-btn-variant="danger"
-              data-qa-selector="revoke_button"
+              data-testid="revoke-button"
               data-method="put"
               :href="revokePath"
               icon="remove"
diff --git a/app/assets/javascripts/access_tokens/components/expires_at_field.vue b/app/assets/javascripts/access_tokens/components/expires_at_field.vue
index 38501d63d3a..65206670a3c 100644
--- a/app/assets/javascripts/access_tokens/components/expires_at_field.vue
+++ b/app/assets/javascripts/access_tokens/components/expires_at_field.vue
@@ -68,7 +68,7 @@ export default {
       :input-name="inputAttrs.name"
       :input-id="inputAttrs.id"
       :placeholder="inputAttrs.placeholder"
-      data-qa-selector="expiry_date_field"
+      data-testid="expiry-date-field"
     />
     <template #description>
       <template v-if="description">
diff --git a/app/assets/javascripts/access_tokens/components/new_access_token_app.vue b/app/assets/javascripts/access_tokens/components/new_access_token_app.vue
index 4b51b4333aa..f476503c091 100644
--- a/app/assets/javascripts/access_tokens/components/new_access_token_app.vue
+++ b/app/assets/javascripts/access_tokens/components/new_access_token_app.vue
@@ -45,7 +45,7 @@ export default {
     formInputGroupProps() {
       return {
         id: this.$options.tokenInputId,
-        'data-qa-selector': 'created_access_token_field',
+        'data-testid': 'created-access-token-field',
         name: this.$options.tokenInputId,
       };
     },
@@ -110,7 +110,7 @@ export default {
     @[$options.EVENT_ERROR]="onError"
     @[$options.EVENT_SUCCESS]="onSuccess"
   >
-    <div ref="container" data-testid="access-token-section" data-qa-selector="access_token_section">
+    <div ref="container" data-testid="access-token-section">
       <gl-alert
         v-if="newToken"
         variant="success"