Merge branch 'e2e-update-trial-selector' into 'master'

Update selector in trial e2e spec

See merge request gitlab-org/gitlab!82345

ee/app/assets/javascripts/trials/components/country_or_region_selector.vue

@@ -141,6 +141,7 @@ export default {
         :options="stateOptionsWithDefault"
         value-field="id"
         text-field="name"
+        data-qa-selector="state"
         data-testid="state"
         :required="required"
         @change="selected"

ee/app/views/trials/select.html.haml

@@ -27,7 +27,7 @@
           = label_tag :trial_entity, _('Who will be using GitLab?')
           .gl-form-checkbox-group
             .gl-form-checkbox.form-check.form-check-inline
-              = radio_button_tag :trial_entity, :company, params[:trial_entity]=='company', required: true, class: 'form-check-input'
+              = radio_button_tag :trial_entity, :company, params[:trial_entity]=='company', required: true, class: 'form-check-input', data: { qa_selector: 'trial_company' }
               = label_tag :trial_entity_company, _('My company or team'), class: 'form-check-label'
             .gl-form-checkbox.form-check.form-check-inline
               = radio_button_tag :trial_entity, :individual, params[:trial_entity]=='individual', required: true, class: 'form-check-input', data: { qa_selector: 'trial_individual' }

qa/qa/page/trials/new.rb

@@ -12,7 +12,7 @@ module QA
         select :number_of_employees
         text_field :telephone_number
         select :country
-        select :state, id: 'state'
+        select :state
         button :continue
       end
     end

qa/qa/page/trials/select.rb

@@ -6,12 +6,11 @@ module QA
       class Select < Chemlab::Page
         path '/-/trials/select'
 
-        # TODO: Supplant with data-qa-selectors
-        select :subscription_for, id: 'namespace_id'
-        text_field :new_group_name, id: 'new_group_name'
-        button :start_your_free_trial, value: 'Start your free trial'
-        radio :trial_company, id: 'trial_entity_company'
-        radio :trial_individual, id: 'trial_entity_individual'
+        select :subscription_for
+        text_field :new_group_name
+        button :start_your_free_trial
+        radio :trial_company
+        radio :trial_individual
       end
     end
   end