Merge branch '334924-use-findbyrole-tech-debt-follow-up' into 'master'

Clean up data-testid and use findByRole

See merge request gitlab-org/gitlab!66379

app/assets/javascripts/token_access/components/token_access.vue

@@ -187,12 +187,7 @@ export default {
             />
           </template>
           <template #footer>
-            <gl-button
-              variant="confirm"
-              :disabled="isProjectPathEmpty"
-              data-testid="add-project-button"
-              @click="addProject"
-            >
+            <gl-button variant="confirm" :disabled="isProjectPathEmpty" @click="addProject">
               {{ $options.i18n.addProject }}
             </gl-button>
             <gl-button @click="clearTargetProjectPath">{{ $options.i18n.cancel }}</gl-button>

app/assets/javascripts/token_access/components/token_projects_table.vue

@@ -73,7 +73,6 @@ export default {
         variant="danger"
         icon="remove"
         :aria-label="__('Remove access')"
-        data-testid="remove-project-button"
         @click="removeProject(item.fullPath)"
       />
     </template>

spec/frontend/token_access/token_access_spec.js

 import { GlToggle, GlLoadingIcon } from '@gitlab/ui';
-import { createLocalVue, shallowMount, mount } from '@vue/test-utils';
+import { createLocalVue } from '@vue/test-utils';
 import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
+import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import createFlash from '~/flash';
 import TokenAccess from '~/token_access/components/token_access.vue';
@@ -41,15 +42,15 @@ describe('TokenAccess component', () => {
 
   const findToggle = () => wrapper.findComponent(GlToggle);
   const findLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
-  const findAddProjectBtn = () => wrapper.find('[data-testid="add-project-button"]');
-  const findRemoveProjectBtn = () => wrapper.find('[data-testid="remove-project-button"]');
+  const findAddProjectBtn = () => wrapper.findByRole('button', { name: 'Add project' });
+  const findRemoveProjectBtn = () => wrapper.findByRole('button', { name: 'Remove access' });
   const findTokenSection = () => wrapper.find('[data-testid="token-section"]');
 
   const createMockApolloProvider = (requestHandlers) => {
     return createMockApollo(requestHandlers);
   };
 
-  const createComponent = (requestHandlers, mountFn = shallowMount) => {
+  const createComponent = (requestHandlers, mountFn = shallowMountExtended) => {
     wrapper = mountFn(TokenAccess, {
       localVue,
       provide: {
@@ -138,7 +139,7 @@ describe('TokenAccess component', () => {
           [getProjectsWithCIJobTokenScopeQuery, getProjectsWithScope],
           [addProjectCIJobTokenScopeMutation, addProjectSuccessHandler],
         ],
-        mount,
+        mountExtended,
       );
 
       await waitForPromises();
@@ -160,7 +161,7 @@ describe('TokenAccess component', () => {
           [getProjectsWithCIJobTokenScopeQuery, getProjectsWithScope],
           [addProjectCIJobTokenScopeMutation, addProjectFailureHandler],
         ],
-        mount,
+        mountExtended,
       );
 
       await waitForPromises();
@@ -181,7 +182,7 @@ describe('TokenAccess component', () => {
           [getProjectsWithCIJobTokenScopeQuery, getProjectsWithScope],
           [removeProjectCIJobTokenScopeMutation, removeProjectSuccessHandler],
         ],
-        mount,
+        mountExtended,
       );
 
       await waitForPromises();
@@ -203,7 +204,7 @@ describe('TokenAccess component', () => {
           [getProjectsWithCIJobTokenScopeQuery, getProjectsWithScope],
           [removeProjectCIJobTokenScopeMutation, removeProjectFailureHandler],
         ],
-        mount,
+        mountExtended,
       );
 
       await waitForPromises();