Remove data-qa-selector for fulfillment Cdot e2e tests

ee/app/assets/javascripts/subscriptions/buy_addons_shared/components/checkout/addon_purchase_details.vue

@@ -113,7 +113,7 @@ export default {
           type="number"
           :min="1"
           :state="isValid"
-          data-qa-selector="quantity"
+          data-testid="quantity"
           class="gl-w-15"
         />
         <div class="gl-ml-3" data-testid="addon-quantity-text">

ee/app/assets/javascripts/subscriptions/new/components/checkout/subscription_details.vue

@@ -307,7 +307,7 @@ export default {
           v-model="selectedPlanModel"
           v-auto-focus-on-show
           :options="availablePlans"
-          data-qa-selector="plan_name"
+          data-testid="plan-name"
         />
       </gl-form-group>
       <gl-form-group
@@ -321,7 +321,7 @@ export default {
           ref="group-select"
           v-model="selectedGroupModel"
           :options="groupOptionsWithDefault"
-          data-qa-selector="group_name"
+          data-testid="group-name"
         />
       </gl-form-group>
       <gl-form-group
@@ -347,7 +347,7 @@ export default {
             type="number"
             :min="billableData.minimumSeats"
             :disabled="shouldDisableNumberOfUsers"
-            data-qa-selector="number_of_users"
+            data-testid="number-of-users"
           />
         </gl-form-group>
         <gl-form-group

ee/app/assets/javascripts/subscriptions/new/components/order_summary/summary_details.vue

@@ -56,12 +56,9 @@ export default {
     <div class="gl-display-flex gl-justify-content-space-between gl-font-weight-bold gl-mb-3">
       <div data-testid="selected-plan" data-qa-selector="selected_plan">
         {{ sprintf($options.i18n.selectedPlanText, { selectedPlanText }) }}
-        <span
-          v-if="usersPresent"
-          data-testid="number-of-users"
-          data-qa-selector="number_of_users"
-          >{{ sprintf($options.i18n.numberOfUsers, { numberOfUsers }) }}</span
-        >
+        <span v-if="usersPresent" data-testid="number-of-users">{{
+          sprintf($options.i18n.numberOfUsers, { numberOfUsers })
+        }}</span>
       </div>
       <gl-loading-icon v-if="isInvoicePreviewLoading" inline class="gl-my-auto gl-ml-3" />
       <div v-else class="gl-ml-3" data-testid="amount" data-qa-selector="total">

ee/app/assets/javascripts/usage_quotas/storage/components/storage_usage_statistics.vue

@@ -103,7 +103,7 @@ export default {
         :target="buyAddonTargetAttr"
         category="primary"
         variant="confirm"
-        data-qa-selector="purchase_more_storage"
+        data-testid="purchase-more-storage"
       >
         {{ $options.i18n.purchaseButtonText }}
       </gl-button>
@@ -121,7 +121,7 @@ export default {
         :used-storage="usedStorage"
         :total-storage="totalStorage"
         :loading="loading"
-        data-qa-selector="namespace_usage_total"
+        data-testid="namespace-usage-total"
         class="gl-w-full"
       />
       <total-storage-available-breakdown-card

ee/app/assets/javascripts/vue_shared/purchase_flow/components/checkout/billing_address.vue

@@ -188,25 +188,24 @@ export default {
           class="js-country"
           value-field="id"
           text-field="name"
-          data-qa-selector="country"
-          data-testid="country-select"
+          data-testid="country"
         />
       </gl-form-group>
       <gl-form-group :label="$options.i18n.streetAddressLabel" label-size="sm" class="mb-3">
         <gl-form-input
           v-model="streetAddressLine1Model"
           type="text"
-          data-qa-selector="street_address_1"
+          data-testid="street-address-1"
         />
         <gl-form-input
           v-model="streetAddressLine2Model"
           type="text"
-          data-qa-selector="street_address_2"
+          data-testid="street-address-2"
           class="gl-mt-3"
         />
       </gl-form-group>
       <gl-form-group :label="$options.i18n.cityLabel" label-size="sm" class="mb-3">
-        <gl-form-input v-model="cityModel" type="text" data-qa-selector="city" />
+        <gl-form-input v-model="cityModel" type="text" data-testid="city" />
       </gl-form-group>
       <div class="combined d-flex">
         <gl-form-group
@@ -220,11 +219,11 @@ export default {
             :options="stateOptionsWithDefault"
             value-field="id"
             text-field="name"
-            data-qa-selector="state"
+            data-testid="state"
           />
         </gl-form-group>
         <gl-form-group :label="$options.i18n.zipCodeLabel" label-size="sm" class="w-50">
-          <gl-form-input v-model="zipCodeModel" type="text" data-qa-selector="zip_code" />
+          <gl-form-input v-model="zipCodeModel" type="text" data-testid="zip-code" />
         </gl-form-group>
       </div>
     </template>

ee/spec/frontend/subscriptions/buy_addons_shared/__snapshots__/app_spec.js.snap

@@ -39,7 +39,7 @@ exports[`Buy Addons Shared App CI Minutes labels does not show labels if input i
       >
         <gl-form-input-stub
           class="gl-w-15"
-          data-qa-selector="quantity"
+          data-testid="quantity"
           min="1"
           name="quantity"
           type="number"
@@ -304,7 +304,7 @@ exports[`Buy Addons Shared App CI Minutes labels shows labels correctly for 1 pa
       >
         <gl-form-input-stub
           class="gl-w-15"
-          data-qa-selector="quantity"
+          data-testid="quantity"
           min="1"
           name="quantity"
           state="true"
@@ -584,7 +584,7 @@ exports[`Buy Addons Shared App CI Minutes labels shows labels correctly for 2 pa
       >
         <gl-form-input-stub
           class="gl-w-15"
-          data-qa-selector="quantity"
+          data-testid="quantity"
           min="1"
           name="quantity"
           state="true"
@@ -850,7 +850,7 @@ exports[`Buy Addons Shared App Storage labels does not show labels if input is i
       >
         <gl-form-input-stub
           class="gl-w-15"
-          data-qa-selector="quantity"
+          data-testid="quantity"
           min="1"
           name="quantity"
           type="number"
@@ -1128,7 +1128,7 @@ exports[`Buy Addons Shared App Storage labels shows labels correctly for 1 pack
       >
         <gl-form-input-stub
           class="gl-w-15"
-          data-qa-selector="quantity"
+          data-testid="quantity"
           min="1"
           name="quantity"
           state="true"
@@ -1421,7 +1421,7 @@ exports[`Buy Addons Shared App Storage labels shows labels correctly for 2 packs
       >
         <gl-form-input-stub
           class="gl-w-15"
-          data-qa-selector="quantity"
+          data-testid="quantity"
           min="1"
           name="quantity"
           state="true"

ee/spec/frontend/vue_shared/purchase_flow/components/checkout/billing_address_spec.js

@@ -18,7 +18,7 @@ describe('Billing Address', () => {
   let wrapper;
   let updateState = jest.fn();
-  const findCountrySelect = () => wrapper.findByTestId('country-select');
+  const findCountrySelect = () => wrapper.findByTestId('country');
   const createComponent = (apolloLocalState = {}) => {
     const apolloResolvers = {