Merge branch '454823-use-full-state-name' into 'master'

Use name field in state selector so that it is used in leads

See merge request !149120



Merged-by: Vitali Tatarintev <vtatarintev@gitlab.com>
Approved-by: Roy Liu <rliu@gitlab.com>
Approved-by: Thomas Hutterer <thutterer@gitlab.com>
Approved-by: Savas Vedova <svedova@gitlab.com>
Approved-by: Vitali Tatarintev <vtatarintev@gitlab.com>
Co-authored-by: Doug Stull <dstull@gitlab.com>

ee/app/assets/javascripts/pages/subscriptions/trials/duo_pro/new/index.js

@@ -4,5 +4,5 @@ import 'ee/trials/track_trial_user_errors';
 import { initNamespaceSelector } from 'ee/trials/init_namespace_selector';
 
 trackSaasDuoProTrialGroup();
-initTrialCreateLeadForm('saasDuoProTrialSubmit', 'name');
+initTrialCreateLeadForm('saasDuoProTrialSubmit');
 initNamespaceSelector();

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

@@ -19,7 +19,6 @@ export default {
   directives: {
     autofocusonshow,
   },
-  inject: { stateValueField: { default: 'id' } },
   props: {
     country: {
       type: String,
@@ -139,7 +138,7 @@ export default {
         v-autofocusonshow
         name="state"
         :options="stateOptionsWithDefault"
-        :value-field="stateValueField"
+        value-field="name"
         text-field="name"
         data-testid="state"
         :required="required"

ee/app/assets/javascripts/trials/init_create_lead_form.js

@@ -2,7 +2,7 @@ import Vue from 'vue';
 import TrialCreateLeadForm from 'ee/trials/components/trial_create_lead_form.vue';
 import apolloProvider from 'ee/subscriptions/buy_addons_shared/graphql';
 
-export const initTrialCreateLeadForm = (gtmSubmitEventLabel, stateValueField = 'id') => {
+export const initTrialCreateLeadForm = (gtmSubmitEventLabel) => {
   const el = document.querySelector('#js-trial-create-lead-form');
 
   if (!el) {
@@ -35,7 +35,6 @@ export const initTrialCreateLeadForm = (gtmSubmitEventLabel, stateValueField = '
       },
       submitPath,
       gtmSubmitEventLabel,
-      stateValueField,
     },
     render(createElement) {
       return createElement(TrialCreateLeadForm);

ee/spec/controllers/registrations/company_controller_spec.rb

@@ -90,7 +90,7 @@
         company_size: '1-99',
         phone_number: '+1 23 456-78-90',
         country: 'US',
-        state: 'CA',
+        state: 'California',
         website_url: 'gitlab.com',
         trial: trial_registration
       }.merge(glm_params)

ee/spec/features/billings/billing_plans_spec.rb

@@ -349,7 +349,7 @@ def external_upgrade_url(namespace, plan)
           "company_size" => form_data[:company_size].delete(' '),
           "phone_number" => form_data[:phone_number],
           "country" => form_data.dig(:country, :id),
-          "state" => form_data.dig(:state, :id),
+          "state" => form_data.dig(:state, :name),
           "namespace_id" => namespace.id,
           "comment" => '',
           "glm_content" => 'billing-group',
@@ -534,7 +534,7 @@ def fill_in_and_submit_code_suggestions_hand_raise_lead
         "company_size" => form_data[:company_size].delete(' '),
         "phone_number" => form_data[:phone_number],
         "country" => form_data.dig(:country, :id),
-        "state" => form_data.dig(:state, :id),
+        "state" => form_data.dig(:state, :name),
         "namespace_id" => namespace.id,
         "comment" => '',
         "glm_content" => 'code-suggestions',

ee/spec/features/groups/usage_quotas/code_suggestions_usage_tab_spec.rb

@@ -146,7 +146,7 @@ def fill_in_and_submit_code_suggestions_hand_raise_lead
       "company_size" => form_data[:company_size].delete(' '),
       "phone_number" => form_data[:phone_number],
       "country" => form_data.dig(:country, :id),
-      "state" => form_data.dig(:state, :id),
+      "state" => form_data.dig(:state, :name),
       "namespace_id" => group.id,
       "comment" => '',
       "glm_content" => 'code-suggestions',

ee/spec/features/trial_registrations/company_information_spec.rb

@@ -41,7 +41,7 @@
         company_size: '1-99',
         phone_number: '+1234567890',
         country: 'US',
-        state: 'FL',
+        state: 'Florida',
         website_url: 'https://gitlab.com',
         trial_onboarding_flow: true,
         trial: false

ee/spec/frontend/trials/components/country_or_region_selector_spec.js

@@ -15,7 +15,7 @@ Vue.use(VueApollo);
 describe('CountryOrRegionSelector', () => {
   let wrapper;
 
-  const createComponent = (props = {}, provides = {}) => {
+  const createComponent = (props = {}) => {
     const mockResolvers = {
       Query: {
         countries() {
@@ -29,9 +29,6 @@ describe('CountryOrRegionSelector', () => {
 
     return shallowMountExtended(CountryOrRegionSelector, {
       apolloProvider: createMockApollo([], mockResolvers),
-      provide: {
-        ...provides,
-      },
       propsData: {
         country: COUNTRY_WITH_STATES,
         state: STATE,
@@ -126,15 +123,9 @@ describe('CountryOrRegionSelector', () => {
       ]);
     });
 
-    it('has the default value field populated when not set', () => {
+    it('has the proper value field populated with name', () => {
       wrapper = createComponent();
 
-      expect(findFormInput('state').attributes('value-field')).toBe('id');
-    });
-
-    it('has the proper value field populated when set', () => {
-      wrapper = createComponent({}, { stateValueField: 'name' });
-
       expect(findFormInput('state').attributes('value-field')).toBe('name');
     });
   });

ee/spec/support/helpers/features/trial_helpers.rb

@@ -103,7 +103,7 @@ def submit_company_information_form(
         skip_email_confirmation: true,
         gitlab_com_trial: true,
         provider: 'gitlab',
-        state: trial_type == DUO_PRO_TRIAL ? form_data.dig(:state, :name) : form_data.dig(:state, :id)
+        state: form_data.dig(:state, :name)
       }.merge(extra_params)
 
       if trial_type == DUO_PRO_TRIAL

ee/spec/support/helpers/saas_registration_helpers.rb

@@ -433,7 +433,7 @@ def company_params(user, glm: true, trial: false)
       last_name: 'User',
       phone_number: '+1234567890',
       country: 'US',
-      state: 'FL',
+      state: 'Florida',
       website_url: 'https://gitlab.com',
       trial_onboarding_flow: true,
       # these are the passed through params