From 94341d132989eedf4e3486a6a4a7e7902501f459 Mon Sep 17 00:00:00 2001
From: Doug Stull <dstull@gitlab.com>
Date: Mon, 2 Dec 2024 13:46:27 -0500
Subject: [PATCH 1/3] Remove company question from duo pro and ultimate trial
 forms

- No longer needed as we do not do anything with this data.
- So we can simplify the form a bit here.
- See https://gitlab.com/gitlab-org/gitlab/-/issues/500682

Changelog: other
EE: true
---
 .../trials/duo_pro_controller.rb              |  2 +-
 .../gitlab_subscriptions/trials_controller.rb |  2 +-
 .../gitlab_subscriptions/trials_helper.rb     |  6 -----
 .../trials/_select_namespace_form.html.haml   | 15 ++----------
 .../duo_pro/_select_namespace_form.html.haml  | 12 +---------
 ...h_multiple_existing_namespace_flow_spec.rb |  2 +-
 ...on_with_no_existing_namespace_flow_spec.rb |  6 ++---
 .../google_analytics_datalayer_spec.rb        |  2 --
 .../trials_helper_spec.rb                     | 24 -------------------
 .../trials/duo_pro_controller_spec.rb         |  5 +---
 .../trials_controller_spec.rb                 |  8 +------
 .../trials/create_service_spec.rb             |  4 +---
 .../support/helpers/features/trial_helpers.rb | 23 ++++++------------
 .../trials/create_service_shared_examples.rb  | 16 ++++++-------
 .../_select_namespace_form.html.haml_spec.rb  |  4 ----
 locale/gitlab.pot                             |  3 ---
 qa/qa/ee/page/trials/select.rb                |  2 --
 17 files changed, 25 insertions(+), 111 deletions(-)

diff --git a/ee/app/controllers/gitlab_subscriptions/trials/duo_pro_controller.rb b/ee/app/controllers/gitlab_subscriptions/trials/duo_pro_controller.rb
index cfb26a6dbd113c..dec72bd80a43ca 100644
--- a/ee/app/controllers/gitlab_subscriptions/trials/duo_pro_controller.rb
+++ b/ee/app/controllers/gitlab_subscriptions/trials/duo_pro_controller.rb
@@ -69,7 +69,7 @@ def track_event(action)
       end
 
       def trial_params
-        params.permit(*::Onboarding::StatusPresenter::GLM_PARAMS, :namespace_id, :trial_entity).to_h
+        params.permit(*::Onboarding::StatusPresenter::GLM_PARAMS, :namespace_id).to_h
       end
 
       def success_flash_message(add_on_purchase)
diff --git a/ee/app/controllers/gitlab_subscriptions/trials_controller.rb b/ee/app/controllers/gitlab_subscriptions/trials_controller.rb
index c660bfc111ea5e..44bc797addfb88 100644
--- a/ee/app/controllers/gitlab_subscriptions/trials_controller.rb
+++ b/ee/app/controllers/gitlab_subscriptions/trials_controller.rb
@@ -85,7 +85,7 @@ def authenticate_user!
     end
 
     def trial_params
-      params.permit(*::Onboarding::StatusPresenter::GLM_PARAMS, :new_group_name, :namespace_id, :trial_entity)
+      params.permit(*::Onboarding::StatusPresenter::GLM_PARAMS, :new_group_name, :namespace_id)
       .with_defaults(organization_id: Current.organization_id).to_h
     end
 
diff --git a/ee/app/helpers/gitlab_subscriptions/trials_helper.rb b/ee/app/helpers/gitlab_subscriptions/trials_helper.rb
index dfc10880326b58..3024db356cb70a 100644
--- a/ee/app/helpers/gitlab_subscriptions/trials_helper.rb
+++ b/ee/app/helpers/gitlab_subscriptions/trials_helper.rb
@@ -2,8 +2,6 @@
 
 module GitlabSubscriptions
   module TrialsHelper
-    TRIAL_ONBOARDING_SOURCE_URLS = %w[about.gitlab.com docs.gitlab.com learn.gitlab.com].freeze
-
     def create_lead_form_data(eligible_namespaces)
       submit_path = trials_path(
         step: GitlabSubscriptions::Trials::CreateService::LEAD,
@@ -31,10 +29,6 @@ def create_duo_enterprise_lead_form_data(eligible_namespaces)
       _lead_form_data(eligible_namespaces).merge(submit_path: submit_path)
     end
 
-    def should_ask_company_question?
-      TRIAL_ONBOARDING_SOURCE_URLS.exclude?(::Onboarding::StatusPresenter.glm_tracking_attributes(params)[:glm_source])
-    end
-
     def trial_namespace_selector_data(namespaces, namespace_create_errors)
       namespace_selector_data(namespace_create_errors).merge(
         any_trial_eligible_namespaces: namespaces.any?.to_s,
diff --git a/ee/app/views/gitlab_subscriptions/trials/_select_namespace_form.html.haml b/ee/app/views/gitlab_subscriptions/trials/_select_namespace_form.html.haml
index 639d7620a772b9..620a9652c66e06 100644
--- a/ee/app/views/gitlab_subscriptions/trials/_select_namespace_form.html.haml
+++ b/ee/app/views/gitlab_subscriptions/trials/_select_namespace_form.html.haml
@@ -18,20 +18,9 @@
 
     = yield :before_form
 
-    = form_tag trials_path(**::Onboarding::StatusPresenter.glm_tracking_attributes(params), step: GitlabSubscriptions::Trials::CreateService::TRIAL), method: :post, class: 'js-saas-trial-group', data: { testid: 'trial-form' } do
+    = form_tag trials_path(**::Onboarding::StatusPresenter.glm_tracking_attributes(params),
+      step: GitlabSubscriptions::Trials::CreateService::TRIAL), method: :post, class: 'js-saas-trial-group', data: { testid: 'trial-form' } do
       .js-namespace-selector{ data: trial_namespace_selector_data(@eligible_namespaces, local_assigns[:namespace_create_errors]) }
-      - if should_ask_company_question?
-        .form-group
-          = 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', data: { testid: 'trial-company-radio' }
-              = 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: { testid: 'trial-individual-radio' }
-              = label_tag :trial_entity_individual, _('Just me'), class: 'form-check-label'
       = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm, button_options: {data: { testid: 'start-your-free-trial-button' }}) do
         = _('Activate my trial')
 
diff --git a/ee/app/views/gitlab_subscriptions/trials/duo_pro/_select_namespace_form.html.haml b/ee/app/views/gitlab_subscriptions/trials/duo_pro/_select_namespace_form.html.haml
index ccf09d77fa255d..6fa331d6358535 100644
--- a/ee/app/views/gitlab_subscriptions/trials/duo_pro/_select_namespace_form.html.haml
+++ b/ee/app/views/gitlab_subscriptions/trials/duo_pro/_select_namespace_form.html.haml
@@ -15,18 +15,8 @@
 
       = yield :before_form
 
-      = gitlab_ui_form_for '', url: trials_duo_pro_path(step: GitlabSubscriptions::Trials::CreateDuoProService::TRIAL), class: 'js-saas-duo-pro-trial-group', data: { testid: 'trial-form' } do |f|
+      = gitlab_ui_form_for '', url: trials_duo_pro_path(step: GitlabSubscriptions::Trials::CreateDuoProService::TRIAL), class: 'js-saas-duo-pro-trial-group', data: { testid: 'trial-form' } do
         .js-namespace-selector{ data: duo_trial_namespace_selector_data(@eligible_namespaces, local_assigns[:namespace_create_errors]) }
-        - if should_ask_company_question?
-          .form-group
-            = f.label :trial_entity, _('This subscription is for')
-            %div
-              .form-check-inline
-                = f.gitlab_ui_radio_component :trial_entity, 'company', _('My company or team'),
-                  radio_options: { required: true, checked: params[:trial_entity] == 'company' }
-              .form-check-inline
-                = f.gitlab_ui_radio_component :trial_entity, 'individual', _('Just me'),
-                  radio_options: { required: true, checked: params[:trial_entity] == 'individual' }
         = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm) do
           = s_('DuoProTrial|Activate my trial')
 
diff --git a/ee/spec/features/gitlab_subscriptions/trials/creation_with_multiple_existing_namespace_flow_spec.rb b/ee/spec/features/gitlab_subscriptions/trials/creation_with_multiple_existing_namespace_flow_spec.rb
index 13c6c720e12cce..3c8b443565974d 100644
--- a/ee/spec/features/gitlab_subscriptions/trials/creation_with_multiple_existing_namespace_flow_spec.rb
+++ b/ee/spec/features/gitlab_subscriptions/trials/creation_with_multiple_existing_namespace_flow_spec.rb
@@ -193,6 +193,6 @@ def fill_in_trial_selection_form_for_new_group(name: 'gitlab')
       expect(page).to have_text('New group name')
     end
 
-    fill_in_trial_form_for_new_group(name: name, glm_source: nil)
+    fill_in_trial_form_for_new_group(name: name)
   end
 end
diff --git a/ee/spec/features/gitlab_subscriptions/trials/creation_with_no_existing_namespace_flow_spec.rb b/ee/spec/features/gitlab_subscriptions/trials/creation_with_no_existing_namespace_flow_spec.rb
index 3aa4066a3168f6..fdd95f17caf907 100644
--- a/ee/spec/features/gitlab_subscriptions/trials/creation_with_no_existing_namespace_flow_spec.rb
+++ b/ee/spec/features/gitlab_subscriptions/trials/creation_with_no_existing_namespace_flow_spec.rb
@@ -86,7 +86,7 @@
 
         expect_to_be_on_namespace_creation_without_company_question
 
-        fill_in_trial_form_for_new_group(glm_source: glm_source)
+        fill_in_trial_form_for_new_group
 
         submit_new_group_trial_selection_form(extra_params: { glm_source: glm_source, **new_group_attrs })
 
@@ -108,7 +108,7 @@
 
         expect_to_be_on_namespace_creation
 
-        fill_in_trial_form_for_new_group(glm_source: glm_source)
+        fill_in_trial_form_for_new_group
 
         submit_new_group_trial_selection_form(extra_params: { glm_source: glm_source, **new_group_attrs })
 
@@ -194,13 +194,11 @@
 
   def expect_to_be_on_namespace_creation
     expect(page).to have_content('New group name')
-    expect(page).to have_content('Who will be using GitLab?')
     expect(page).not_to have_content('This trial is for')
   end
 
   def expect_to_be_on_namespace_creation_without_company_question
     expect(page).to have_content('New group name')
-    expect(page).not_to have_content('Who will be using GitLab?')
     expect(page).not_to have_content('This trial is for')
   end
 end
diff --git a/ee/spec/features/google_analytics_datalayer_spec.rb b/ee/spec/features/google_analytics_datalayer_spec.rb
index 5aa1fccdb77234..9e3b76d547bd1b 100644
--- a/ee/spec/features/google_analytics_datalayer_spec.rb
+++ b/ee/spec/features/google_analytics_datalayer_spec.rb
@@ -59,7 +59,6 @@
       prevent_submit_for('.js-saas-trial-group')
 
       fill_in 'new_group_name', with: group.name
-      find('#trial_entity_company').click
       click_button 'Activate my trial'
 
       data_layer = execute_script('return window.dataLayer')
@@ -85,7 +84,6 @@
       prevent_submit_for('.js-saas-duo-pro-trial-group')
 
       select_from_listbox group.name, from: 'Select a group'
-      find('#trial_entity_company').click
       click_button 'Activate my trial'
 
       data_layer = execute_script('return window.dataLayer')
diff --git a/ee/spec/helpers/gitlab_subscriptions/trials_helper_spec.rb b/ee/spec/helpers/gitlab_subscriptions/trials_helper_spec.rb
index a0d28b2a9d8029..6c76427d766188 100644
--- a/ee/spec/helpers/gitlab_subscriptions/trials_helper_spec.rb
+++ b/ee/spec/helpers/gitlab_subscriptions/trials_helper_spec.rb
@@ -252,30 +252,6 @@
     end
   end
 
-  describe '#should_ask_company_question?' do
-    let(:params) { ActionController::Parameters.new(url_params) }
-
-    before do
-      allow(helper).to receive(:params).and_return(params)
-    end
-
-    subject { helper.should_ask_company_question? }
-
-    where(:url_params, :result) do
-      { glm_source: 'about.gitlab.com' }  | false
-      { glm_source: 'learn.gitlab.com' }  | false
-      { glm_source: 'docs.gitlab.com' }   | false
-      { glm_source: 'abouts.gitlab.com' } | true
-      { glm_source: 'about.gitlab.org' }  | true
-      { glm_source: 'about.gitlob.com' }  | true
-      {}                                  | true
-    end
-
-    with_them do
-      it { is_expected.to eq(result) }
-    end
-  end
-
   describe '#show_tier_badge_for_new_trial?' do
     where(:trials_available?, :paid?, :private?, :never_had_trial?, :authorized, :result) do
       false | false | true | true | true | false
diff --git a/ee/spec/requests/gitlab_subscriptions/trials/duo_pro_controller_spec.rb b/ee/spec/requests/gitlab_subscriptions/trials/duo_pro_controller_spec.rb
index 1a64d41e0fdc5b..34fd52a8b03ffc 100644
--- a/ee/spec/requests/gitlab_subscriptions/trials/duo_pro_controller_spec.rb
+++ b/ee/spec/requests/gitlab_subscriptions/trials/duo_pro_controller_spec.rb
@@ -164,10 +164,7 @@
       }.with_indifferent_access
     end
 
-    let(:trial_params) do
-      { trial_entity: '_trial_entity_' }.merge(namespace_id).with_indifferent_access
-    end
-
+    let(:trial_params) { namespace_id.with_indifferent_access }
     let(:base_params) { lead_params.merge(trial_params).merge(step: step) }
 
     subject(:post_create) do
diff --git a/ee/spec/requests/gitlab_subscriptions/trials_controller_spec.rb b/ee/spec/requests/gitlab_subscriptions/trials_controller_spec.rb
index 8602d9be3e3f25..333bd3a9b77939 100644
--- a/ee/spec/requests/gitlab_subscriptions/trials_controller_spec.rb
+++ b/ee/spec/requests/gitlab_subscriptions/trials_controller_spec.rb
@@ -150,13 +150,7 @@
       }.with_indifferent_access
     end
 
-    let(:trial_params) do
-      {
-        trial_entity: '_trial_entity_',
-        organization_id: anything
-      }.merge(namespace_id).with_indifferent_access
-    end
-
+    let(:trial_params) { { organization_id: anything }.merge(namespace_id).with_indifferent_access }
     let(:base_params) { lead_params.merge(trial_params).merge(glm_params).merge(step: step) }
 
     subject(:post_create) do
diff --git a/ee/spec/services/gitlab_subscriptions/trials/create_service_spec.rb b/ee/spec/services/gitlab_subscriptions/trials/create_service_spec.rb
index 1e30bca1ccef09..5ddd276dd2e60a 100644
--- a/ee/spec/services/gitlab_subscriptions/trials/create_service_spec.rb
+++ b/ee/spec/services/gitlab_subscriptions/trials/create_service_spec.rb
@@ -120,9 +120,7 @@
 
     context 'when in the create group flow' do
       let(:step) { described_class::TRIAL }
-      let(:extra_params) do
-        { trial_entity: '_entity_', organization_id: organization.id, with_add_on: true, add_on_name: "duo_enterprise" }
-      end
+      let(:extra_params) { { organization_id: organization.id, with_add_on: true, add_on_name: "duo_enterprise" } }
 
       let(:trial_params) do
         { new_group_name: 'gitlab', namespace_id: '0' }.merge(extra_params)
diff --git a/ee/spec/support/helpers/features/trial_helpers.rb b/ee/spec/support/helpers/features/trial_helpers.rb
index 4048bd6902ec16..f2c74c232e9e13 100644
--- a/ee/spec/support/helpers/features/trial_helpers.rb
+++ b/ee/spec/support/helpers/features/trial_helpers.rb
@@ -34,12 +34,11 @@ def expect_to_be_on_duo_pro_namespace_selection_with_errors
     end
 
     def expect_to_be_on_duo_pro_namespace_selection
-      expect(page).to have_content('This subscription is for')
+      expect(page).to have_content('Apply your GitLab Duo Pro trial to an existing group')
     end
 
     def expect_to_be_on_namespace_selection
       expect(page).to have_content('This trial is for')
-      expect(page).to have_content('Who will be using GitLab?')
     end
 
     def expect_to_have_namespace_creation_errors(group_name: '_invalid group name_', error_message: 'Group URL can')
@@ -77,16 +76,14 @@ def expect_to_be_on_gitlab_duo_page(path: 'gitlab', name: 'gitlab')
 
     def fill_in_trial_selection_form(from: 'Select a group', group_select: true)
       select_from_listbox group.name, from: from if group_select
-      choose :trial_entity_company
     end
 
     def fill_in_duo_enterprise_trial_selection_form(from: 'Select a group', group_select: true)
       select_from_listbox group.name, from: from if group_select
     end
 
-    def fill_in_trial_form_for_new_group(name: 'gitlab', glm_source: nil)
+    def fill_in_trial_form_for_new_group(name: 'gitlab')
       fill_in 'new_group_name', with: name
-      choose :trial_entity_company if glm_source != 'about.gitlab.com'
     end
 
     def form_data
@@ -152,7 +149,7 @@ def submit_trial_selection_form(result: ServiceResponse.success, extra_params: {
       stub_apply_trial(
         namespace_id: group.id,
         result: result,
-        extra_params: extra_with_glm_source(extra_params).merge(existing_group_attrs)
+        extra_params: extra_params.merge(existing_group_attrs)
       )
       stub_duo_landing_page_data
 
@@ -160,7 +157,7 @@ def submit_trial_selection_form(result: ServiceResponse.success, extra_params: {
     end
 
     def submit_new_group_trial_selection_form(result: ServiceResponse.success, extra_params: {})
-      stub_apply_trial(result: result, extra_params: extra_with_glm_source(extra_params))
+      stub_apply_trial(result: result, extra_params: extra_params)
       stub_duo_landing_page_data
 
       click_button 'Activate my trial'
@@ -180,12 +177,6 @@ def stub_duo_landing_page_data
       stub_signing_key
     end
 
-    def extra_with_glm_source(extra_params)
-      extra_params[:trial_entity] = 'company' unless extra_params[:glm_source] == 'about.gitlab.com'
-
-      extra_params
-    end
-
     def existing_group_attrs
       { namespace: group.slice(:id, :name, :path, :kind, :trial_ends_on).merge(plan: group.actual_plan.name) }
     end
@@ -266,12 +257,12 @@ def submit_duo_pro_trial_company_form(
       wait_for_requests
     end
 
-    def stub_apply_duo_pro_trial(result: ServiceResponse.success, extra_params: {})
+    def stub_apply_duo_pro_trial(result: ServiceResponse.success)
       trial_user_params = {
         namespace_id: group.id,
         gitlab_com_trial: true,
         sync_to_gl: true
-      }.merge(existing_group_attrs).merge(extra_params)
+      }.merge(existing_group_attrs)
 
       service_params = {
         trial_user_information: trial_user_params,
@@ -374,7 +365,7 @@ def submit_duo_enterprise_trial_company_form(
     end
 
     def submit_duo_pro_trial_selection_form(result: ServiceResponse.success)
-      stub_apply_duo_pro_trial(result: result, extra_params: { trial_entity: 'company' })
+      stub_apply_duo_pro_trial(result: result)
       stub_duo_landing_page_data
 
       click_button 'Activate my trial'
diff --git a/ee/spec/support/shared_contexts/services/gitlab_subscriptions/trials/create_service_shared_examples.rb b/ee/spec/support/shared_contexts/services/gitlab_subscriptions/trials/create_service_shared_examples.rb
index b12b10b412cbf4..3dd95085dd3634 100644
--- a/ee/spec/support/shared_contexts/services/gitlab_subscriptions/trials/create_service_shared_examples.rb
+++ b/ee/spec/support/shared_contexts/services/gitlab_subscriptions/trials/create_service_shared_examples.rb
@@ -88,12 +88,11 @@
   context 'in the existing namespace flow' do
     let_it_be(:group) { create(:group_with_plan, plan: plan_name, name: 'gitlab', owners: user) }
     let(:namespace_id) { group.id.to_s }
-    let(:extra_params) { { trial_entity: '_entity_' } }
-    let(:trial_params) { { namespace_id: namespace_id }.merge(extra_params) }
+    let(:trial_params) { { namespace_id: namespace_id } }
 
     shared_examples 'starts a trial' do
       it do
-        expect_apply_trial_success(user, group, extra_params: extra_params.merge(existing_group_attrs(group)))
+        expect_apply_trial_success(user, group, extra_params: existing_group_attrs(group))
 
         expect(execute).to be_success
         expect(execute.payload).to eq({ namespace: group })
@@ -115,7 +114,7 @@
       context 'when a valid namespace_id of non zero and new_group_name is present' do
         # This can *currently* happen on validation failure for creating
         # a new namespace.
-        let(:trial_params) { { new_group_name: 'gitlab', namespace_id: group.id, trial_entity: '_entity_' } }
+        let(:trial_params) { { new_group_name: 'gitlab', namespace_id: group.id } }
 
         context 'with the namespace_id' do
           it_behaves_like 'starts a trial'
@@ -125,7 +124,7 @@
 
     context 'when trial creation is not successful' do
       it 'returns an error indicating trial failed' do
-        expect_apply_trial_fail(user, group, extra_params: extra_params.merge(existing_group_attrs(group)))
+        expect_apply_trial_fail(user, group, extra_params: existing_group_attrs(group))
 
         expect(execute).to be_error
         expect(execute.reason).to eq(:trial_failed)
@@ -270,11 +269,10 @@
   end
 
   let(:namespace_id) { namespace.id.to_s }
-  let(:extra_params) { { trial_entity: '_entity_' } }
-  let(:trial_params) { { namespace_id: namespace_id }.merge(extra_params) }
+  let(:trial_params) { { namespace_id: namespace_id } }
 
   it 'tracks when trial registration is successful', :clean_gitlab_redis_shared_state do
-    expect_apply_trial_success(user, namespace, extra_params: extra_params.merge(existing_group_attrs(namespace)))
+    expect_apply_trial_success(user, namespace, extra_params: existing_group_attrs(namespace))
 
     expect do
       execute
@@ -300,7 +298,7 @@
   end
 
   it 'tracks when trial registration fails', :clean_gitlab_redis_shared_state do
-    expect_apply_trial_fail(user, namespace, extra_params: extra_params.merge(existing_group_attrs(namespace)))
+    expect_apply_trial_fail(user, namespace, extra_params: existing_group_attrs(namespace))
 
     expect do
       execute
diff --git a/ee/spec/views/gitlab_subscriptions/trials/duo_pro/_select_namespace_form.html.haml_spec.rb b/ee/spec/views/gitlab_subscriptions/trials/duo_pro/_select_namespace_form.html.haml_spec.rb
index 618a28a70810e8..b8e68a426db72f 100644
--- a/ee/spec/views/gitlab_subscriptions/trials/duo_pro/_select_namespace_form.html.haml_spec.rb
+++ b/ee/spec/views/gitlab_subscriptions/trials/duo_pro/_select_namespace_form.html.haml_spec.rb
@@ -15,10 +15,6 @@
     render 'gitlab_subscriptions/trials/duo_pro/select_namespace_form'
 
     expect(rendered).to have_content(s_('DuoProTrial|Apply your GitLab Duo Pro trial to an existing group'))
-    expect(rendered).to have_content(_('This subscription is for'))
-    expect(rendered).to have_content(_('My company or team'))
-    expect(rendered).to have_content(_('Just me'))
-
     expect(rendered).to render_template('gitlab_subscriptions/trials/duo_pro/_advantages_list')
   end
 end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index bc455b3431a779..1b8ed15a234c34 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -56710,9 +56710,6 @@ msgstr ""
 msgid "This stage has one or more manual jobs that require confirmation before retrying. Do you want to proceed?"
 msgstr ""
 
-msgid "This subscription is for"
-msgstr ""
-
 msgid "This suggestion already matches its content."
 msgstr ""
 
diff --git a/qa/qa/ee/page/trials/select.rb b/qa/qa/ee/page/trials/select.rb
index 09e12f97d49449..6bd1e58c1dfb04 100644
--- a/qa/qa/ee/page/trials/select.rb
+++ b/qa/qa/ee/page/trials/select.rb
@@ -10,8 +10,6 @@ class Select < QA::Page::Base
           view 'ee/app/views/gitlab_subscriptions/trials/_select_namespace_form.html.haml' do
             element 'trial-form'
             element 'start-your-free-trial-button'
-            element 'trial-company-radio'
-            element 'trial-individual-radio'
           end
 
           def trial_for=(group)
-- 
GitLab


From 8146b2a0c308e96a097e9e428b262485e33ba1f6 Mon Sep 17 00:00:00 2001
From: Doug Stull <dstull@gitlab.com>
Date: Thu, 5 Dec 2024 09:54:38 -0500
Subject: [PATCH 2/3] Add qa test changes

---
 qa/qa/ee/flow/trial.rb         | 1 -
 qa/qa/ee/page/trials/select.rb | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/qa/qa/ee/flow/trial.rb b/qa/qa/ee/flow/trial.rb
index 574e02d1150cac..dcd73abf97d21a 100644
--- a/qa/qa/ee/flow/trial.rb
+++ b/qa/qa/ee/flow/trial.rb
@@ -24,7 +24,6 @@ def register_for_trial(group: nil)
 
           EE::Page::Trials::Select.perform do |select|
             select.trial_for = group.path
-            select.click_trial_for_company_option
             select.click_start_your_free_trial_button
           end
         end
diff --git a/qa/qa/ee/page/trials/select.rb b/qa/qa/ee/page/trials/select.rb
index 6bd1e58c1dfb04..792fd9f270f957 100644
--- a/qa/qa/ee/page/trials/select.rb
+++ b/qa/qa/ee/page/trials/select.rb
@@ -19,10 +19,6 @@ def trial_for=(group)
             end
           end
 
-          def click_trial_for_company_option
-            click_element('trial-company-radio')
-          end
-
           def click_start_your_free_trial_button
             click_element('start-your-free-trial-button')
           end
-- 
GitLab


From b1e6dedd0cc562e6cd15437d48770493db3b1112 Mon Sep 17 00:00:00 2001
From: Doug Stull <dstull@gitlab.com>
Date: Thu, 5 Dec 2024 16:19:52 -0500
Subject: [PATCH 3/3] Update test and prediction file

---
 ee/spec/features/trials/lead_creation_form_validation_spec.rb | 1 -
 scripts/verify-tff-mapping                                    | 1 +
 tests.yml                                                     | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ee/spec/features/trials/lead_creation_form_validation_spec.rb b/ee/spec/features/trials/lead_creation_form_validation_spec.rb
index 57ef534d850384..72661b85369211 100644
--- a/ee/spec/features/trials/lead_creation_form_validation_spec.rb
+++ b/ee/spec/features/trials/lead_creation_form_validation_spec.rb
@@ -50,7 +50,6 @@
       click_button 'Continue'
 
       expect(page).to have_content('Activate my trial')
-      expect(page).to have_content('Who will be using GitLab?')
     end
 
     def fill_in_company_information
diff --git a/scripts/verify-tff-mapping b/scripts/verify-tff-mapping
index 561cea8f7f8e43..ad80f476e035dc 100755
--- a/scripts/verify-tff-mapping
+++ b/scripts/verify-tff-mapping
@@ -588,6 +588,7 @@ tests = [
       ee/spec/features/gitlab_subscriptions/trials/creation_with_one_existing_namespace_flow_spec.rb
       ee/spec/requests/gitlab_subscriptions/trials_controller_spec.rb
       ee/spec/features/gitlab_subscriptions/trials/access_denied_spec.rb
+      ee/spec/features/trials/lead_creation_form_validation_spec.rb
     ]
   },
 
diff --git a/tests.yml b/tests.yml
index 57dbd2b02f9dbf..960d5e317685d9 100644
--- a/tests.yml
+++ b/tests.yml
@@ -316,6 +316,7 @@ mapping:
     test:
     - 'ee/spec/features/gitlab_subscriptions/trials/creation_*_spec.rb'
     - ee/spec/features/gitlab_subscriptions/trials/access_denied_spec.rb
+    - ee/spec/features/trials/lead_creation_form_validation_spec.rb
 
   # duo pro trials
   - source: 'ee/app/controllers/gitlab_subscriptions/trials/duo_pro_controller\.rb'
-- 
GitLab