diff --git a/ee/app/controllers/gitlab_subscriptions/trials/duo_enterprise_controller.rb b/ee/app/controllers/gitlab_subscriptions/trials/duo_enterprise_controller.rb
index 917fbd703e69baf25be37698d3f3acca2e5fec46..a5a44a48757e6caac351da63059b5866c870f32d 100644
--- a/ee/app/controllers/gitlab_subscriptions/trials/duo_enterprise_controller.rb
+++ b/ee/app/controllers/gitlab_subscriptions/trials/duo_enterprise_controller.rb
@@ -82,9 +82,9 @@ def trial_params
def success_flash_message
safe_format(
s_(
- 'DuoEnterpriseTrial|Congratulations, your free GitLab Duo Enterprise trial is activated and will ' \
- 'expire on %{exp_date}. The new license might take a minute to show on the page. ' \
- 'To give members access to new GitLab Duo Enterprise features, ' \
+ 'DuoEnterpriseTrial|Congratulations, your free Ultimate and GitLab Duo Enterprise trial is ' \
+ 'activated and will expire on %{exp_date}. The new license might take a minute to show on the ' \
+ 'page. To give members access to new GitLab Duo Enterprise features, ' \
'%{assign_link_start}assign them%{assign_link_end} to GitLab Duo Enterprise seats.'
),
success_doc_link,
diff --git a/ee/app/helpers/gitlab_subscriptions/trials_helper.rb b/ee/app/helpers/gitlab_subscriptions/trials_helper.rb
index a8af5837ef70a1460d9c29a2e089d60fdc714fac..6e61082f52a3737db67f92be3b419e6606957a07 100644
--- a/ee/app/helpers/gitlab_subscriptions/trials_helper.rb
+++ b/ee/app/helpers/gitlab_subscriptions/trials_helper.rb
@@ -5,11 +5,17 @@ module TrialsHelper
TRIAL_ONBOARDING_SOURCE_URLS = %w[about.gitlab.com docs.gitlab.com learn.gitlab.com].freeze
def create_lead_form_data
+ submit_button_text = if Feature.enabled?(:duo_enterprise_trials, current_user)
+ _('Continue')
+ else
+ s_('Trial|Start free GitLab Ultimate trial')
+ end
+
_lead_form_data.merge(
submit_path: trials_path(
step: GitlabSubscriptions::Trials::CreateService::LEAD, **params.permit(:namespace_id).merge(glm_params)
),
- submit_button_text: s_('Trial|Start free GitLab Ultimate trial')
+ submit_button_text: submit_button_text
)
end
@@ -73,7 +79,11 @@ def glm_source
def trial_selection_intro_text
if any_trial_eligible_namespaces?
- s_('Trials|You can apply your trial to a new group or an existing group.')
+ if Feature.enabled?(:duo_enterprise_trials, current_user)
+ s_('Trials|You can apply your Ultimate and GitLab Duo Enterprise trial to a group.')
+ else
+ s_('Trials|You can apply your trial to a new group or an existing group.')
+ end
else
s_('Trials|Create a new group to start your GitLab Ultimate trial.')
end
diff --git a/ee/app/views/gitlab_subscriptions/trials/_lead_form.html.haml b/ee/app/views/gitlab_subscriptions/trials/_lead_form.html.haml
index 83b6bc373d539887d41ac5c0e9e01554e87a0cda..806f71a9d5939fc500d3b70081f9e9ece1491ad1 100644
--- a/ee/app/views/gitlab_subscriptions/trials/_lead_form.html.haml
+++ b/ee/app/views/gitlab_subscriptions/trials/_lead_form.html.haml
@@ -1,4 +1,7 @@
-- page_title _('Start your Free Ultimate Trial')
+- if Feature.enabled?(:duo_enterprise_trials, current_user)
+ - page_title _('Start your Free Ultimate and GitLab Duo Enterprise Trial')
+- else
+ - page_title _('Start your Free Ultimate Trial')
- content_for :page_specific_javascripts do
= render 'layouts/google_tag_manager_head'
= render 'layouts/one_trust'
@@ -7,9 +10,15 @@
.row.gl-items-center
.col-md-6.m-sm-6
%h2.gl-pb-5.gl-my-0
- = _('Start your Free Ultimate Trial')
+ - if Feature.enabled?(:duo_enterprise_trials, current_user)
+ = _('Start your Free Ultimate and GitLab Duo Enterprise Trial')
+ - else
+ = _('Start your Free Ultimate Trial')
%p.gl-text-gray-700.gl-text-lg
+ - if Feature.enabled?(:duo_enterprise_trials, current_user)
+ = s_('Trial|Your combined Ultimate and GitLab Duo Enterprise trial lasts for 60 days. We just need some additional information to activate it.')
+ - else
= s_('Trial|Your GitLab Ultimate trial lasts for 30 days, but you can keep your free GitLab account forever. We just need some additional information to activate your trial.')
= yield :before_form
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 ef1f613417257ac753764000d2156fc8437244c5..55a29a4f4e04d0e9a6c2627f78b6149eb1231908 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
@@ -1,4 +1,7 @@
-- page_title _('Start a Free Ultimate Trial')
+- if Feature.enabled?(:duo_enterprise_trials, current_user)
+ - page_title _('Start your Free Ultimate and GitLab Duo Enterprise Trial')
+- else
+ - page_title _('Start a Free Ultimate Trial')
- content_for :page_specific_javascripts do
= render 'layouts/google_tag_manager_head'
= render 'layouts/one_trust'
@@ -7,7 +10,10 @@
.row
.col-md-6.m-sm-6
%h2.gl-pb-5.gl-my-0
- = _('Almost there')
+ - if Feature.enabled?(:duo_enterprise_trials, current_user)
+ = s_('Trial|Apply your combined trial to an existing group')
+ - else
+ = _('Almost there')
%p.gl-text-gray-700.gl-text-lg
= trial_selection_intro_text
@@ -29,7 +35,10 @@
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
- = _('Start your free trial')
+ - if Feature.enabled?(:duo_enterprise_trials, current_user)
+ = _('Activate my trial')
+ - else
+ = _('Start your free trial')
.col-md-4.gl-mt-9
= image_tag 'illustrations/saas-trial-illustration.svg', alt: '', class: 'gl-hidden md:gl-inline gl-w-full'
diff --git a/ee/app/views/registrations/company/new.html.haml b/ee/app/views/registrations/company/new.html.haml
index 8503f66c0c285fb4c9f008885ad0b5deaab1b306..b1ee422da0d172dc97f04574de1cedf3e610a1cc 100644
--- a/ee/app/views/registrations/company/new.html.haml
+++ b/ee/app/views/registrations/company/new.html.haml
@@ -1,4 +1,7 @@
-- page_title _('Start your Free Ultimate Trial')
+- if Feature.enabled?(:duo_enterprise_trials, current_user)
+ - page_title _('Start your Free Ultimate and GitLab Duo Enterprise Trial')
+- else
+ - page_title _('Start your Free Ultimate Trial')
- content_for :page_specific_javascripts do
= render "layouts/google_tag_manager_head"
= render "layouts/one_trust"
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 477e9a5d935a0a7980e1aea2aabf2e6336f006d1..52a2a97a1f6016044038b1d58f2c5edb31a846d5 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
@@ -17,7 +17,7 @@
fill_in_company_information
- submit_company_information_form(button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(button_text: 'Continue')
expect_to_be_on_namespace_selection
@@ -38,7 +38,7 @@
fill_in_company_information
- submit_company_information_form(extra_params: glm_params, button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(extra_params: glm_params, button_text: 'Continue')
expect_to_be_on_namespace_selection
@@ -59,7 +59,7 @@
fill_in_company_information
submit_company_information_form(
- button_text: 'Start free GitLab Ultimate trial', extra_params: { glm_content: 'discover-group-security' }
+ button_text: 'Continue', extra_params: { glm_content: 'discover-group-security' }
)
expect_to_be_on_namespace_selection
@@ -81,7 +81,7 @@
fill_in_company_information
- submit_company_information_form(button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(button_text: 'Continue')
expect_to_be_on_namespace_selection
@@ -106,7 +106,7 @@
fill_in_company_information
- submit_company_information_form(button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(button_text: 'Continue')
expect_to_be_on_namespace_selection
@@ -116,7 +116,7 @@
# namespace invalid check
fill_in_trial_selection_form_for_new_group(name: '_invalid group name_')
- click_button 'Start your free trial'
+ click_button 'Activate my trial'
expect_to_have_namespace_creation_errors
@@ -140,12 +140,12 @@
fill_in_company_information
# lead failure
- submit_company_information_form(lead_result: lead_failure, button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(lead_result: lead_failure, button_text: 'Continue')
expect_to_be_on_lead_form_with_errors
# success
- submit_company_information_form(button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(button_text: 'Continue')
expect_to_be_on_namespace_selection
@@ -166,7 +166,7 @@
fill_in_company_information
- submit_company_information_form(button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(button_text: 'Continue')
expect_to_be_on_namespace_selection
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 72d66c27f841b4fb7e57ca55c691a6e19c026985..04167f4df33d3de2bafd20b76d9eaf1f64ae1a24 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
@@ -13,11 +13,11 @@
fill_in_company_information
- submit_company_information_form(button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(button_text: 'Continue')
expect_to_be_on_namespace_creation
- click_button 'Start your free trial'
+ click_button 'Activate my trial'
# required field check
expect(page).to have_native_text_validation_message('new_group_name')
@@ -25,7 +25,7 @@
# namespace invalid check
fill_in_trial_form_for_new_group(name: '_invalid group name_')
- click_button 'Start your free trial'
+ click_button 'Activate my trial'
expect_to_be_on_namespace_creation
expect_to_have_namespace_creation_errors
@@ -33,7 +33,7 @@
# namespace filled out with blank spaces
fill_in_trial_form_for_new_group(name: ' ')
- click_button 'Start your free trial'
+ click_button 'Activate my trial'
expect_to_be_on_namespace_creation
expect_to_have_namespace_creation_errors(group_name: ' ', error_message: "Name can't be blank")
@@ -55,7 +55,7 @@
fill_in_company_information
submit_company_information_form(
- button_text: 'Start free GitLab Ultimate trial', extra_params: { glm_content: 'discover-group-security' }
+ button_text: 'Continue', extra_params: { glm_content: 'discover-group-security' }
)
expect_to_be_on_namespace_creation
@@ -81,7 +81,7 @@
fill_in_company_information
submit_company_information_form(
- button_text: 'Start free GitLab Ultimate trial', extra_params: { glm_source: glm_source }
+ button_text: 'Continue', extra_params: { glm_source: glm_source }
)
expect_to_be_on_namespace_creation_without_company_question
@@ -105,7 +105,7 @@
fill_in_company_information
submit_company_information_form(
- button_text: 'Start free GitLab Ultimate trial', extra_params: { glm_source: glm_source }
+ button_text: 'Continue', extra_params: { glm_source: glm_source }
)
expect_to_be_on_namespace_creation
@@ -129,12 +129,12 @@
fill_in_company_information
# lead failure
- submit_company_information_form(lead_result: lead_failure, button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(lead_result: lead_failure, button_text: 'Continue')
expect_to_be_on_lead_form_with_errors
# success
- submit_company_information_form(button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(button_text: 'Continue')
expect_to_be_on_namespace_creation
@@ -154,7 +154,7 @@
fill_in_company_information
- submit_company_information_form(button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(button_text: 'Continue')
expect_to_be_on_namespace_creation
@@ -182,13 +182,13 @@
fill_in_company_information
- submit_company_information_form(button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(button_text: 'Continue')
expect_to_be_on_namespace_creation
fill_in_trial_form_for_new_group
- click_button 'Start your free trial'
+ click_button 'Activate my trial'
expect(page).to have_content('Page not found')
end
diff --git a/ee/spec/features/gitlab_subscriptions/trials/creation_with_one_existing_namespace_flow_spec.rb b/ee/spec/features/gitlab_subscriptions/trials/creation_with_one_existing_namespace_flow_spec.rb
index b64b04e065788a20e13c78ce3f65d074bc11cd6e..48926f7954ba31cf67afc0cbf1e34e14aaa542e8 100644
--- a/ee/spec/features/gitlab_subscriptions/trials/creation_with_one_existing_namespace_flow_spec.rb
+++ b/ee/spec/features/gitlab_subscriptions/trials/creation_with_one_existing_namespace_flow_spec.rb
@@ -14,7 +14,7 @@
fill_in_company_information
- submit_company_information_form(with_trial: true, button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(with_trial: true, button_text: 'Continue')
expect_to_be_on_group_page
end
@@ -29,7 +29,7 @@
submit_company_information_form(
with_trial: true,
- button_text: 'Start free GitLab Ultimate trial',
+ button_text: 'Continue',
extra_params: { glm_content: 'discover-group-security' }
)
@@ -48,12 +48,12 @@
fill_in_company_information
# lead failure
- submit_company_information_form(lead_result: lead_failure, button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(lead_result: lead_failure, button_text: 'Continue')
expect_to_be_on_lead_form_with_errors
# success
- submit_company_information_form(with_trial: true, button_text: 'Start free GitLab Ultimate trial')
+ submit_company_information_form(with_trial: true, button_text: 'Continue')
expect_to_be_on_group_page
end
@@ -70,7 +70,7 @@
# trial failure
submit_company_information_form(
- with_trial: true, trial_result: trial_failure, button_text: 'Start free GitLab Ultimate trial'
+ with_trial: true, trial_result: trial_failure, button_text: 'Continue'
)
expect_to_be_on_namespace_selection_with_errors
@@ -93,7 +93,7 @@
# trial failure
submit_company_information_form(
- with_trial: true, trial_result: trial_failure, button_text: 'Start free GitLab Ultimate trial'
+ with_trial: true, trial_result: trial_failure, button_text: 'Continue'
)
expect_to_be_on_namespace_selection_with_errors
diff --git a/ee/spec/features/google_analytics_datalayer_spec.rb b/ee/spec/features/google_analytics_datalayer_spec.rb
index 4bc1543a02d14a5a76fd251f6a3ae6840126f24b..5aa1fccdb772340afa8e42c1d52cf60b77158310 100644
--- a/ee/spec/features/google_analytics_datalayer_spec.rb
+++ b/ee/spec/features/google_analytics_datalayer_spec.rb
@@ -60,7 +60,7 @@
fill_in 'new_group_name', with: group.name
find('#trial_entity_company').click
- click_button 'Start your free trial'
+ click_button 'Activate my trial'
data_layer = execute_script('return window.dataLayer')
last_event_in_data_layer = data_layer[-1]
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 26de9ee2d930e894daa7ca554b93e2906c718fdf..407e2fb8568568c9d8f6af9e3ea65f8fce3e79d9 100644
--- a/ee/spec/features/trials/lead_creation_form_validation_spec.rb
+++ b/ee/spec/features/trials/lead_creation_form_validation_spec.rb
@@ -47,9 +47,9 @@
expect(service).to receive(:execute).with(lead_params).and_return(ServiceResponse.success) # rubocop:disable RSpec/ExpectInHook
end
- click_button 'Start free GitLab Ultimate trial'
+ click_button 'Continue'
- expect(page).to have_content('Almost there')
+ expect(page).to have_content('Activate my trial')
expect(page).to have_content('Who will be using GitLab?')
end
diff --git a/ee/spec/helpers/gitlab_subscriptions/trials_helper_spec.rb b/ee/spec/helpers/gitlab_subscriptions/trials_helper_spec.rb
index 5ddae7c651c50f5db5e35dfeec7d3a83f0066af8..dcf0e9f19768617e84aa7b212d42b912fc49eac6 100644
--- a/ee/spec/helpers/gitlab_subscriptions/trials_helper_spec.rb
+++ b/ee/spec/helpers/gitlab_subscriptions/trials_helper_spec.rb
@@ -4,6 +4,7 @@
RSpec.describe GitlabSubscriptions::TrialsHelper, feature_category: :acquisition do
using RSpec::Parameterized::TableSyntax
+ include Devise::Test::ControllerHelpers
describe '#create_lead_form_data' do
let(:user) { build_stubbed(:user, user_detail: build_stubbed(:user_detail, organization: '_org_')) }
@@ -381,13 +382,28 @@
subject { helper.trial_selection_intro_text }
where(:have_group_namespace, :text) do
- true | 'You can apply your trial to a new group or an existing group.'
+ true | 'You can apply your Ultimate and GitLab Duo Enterprise trial to a group.'
false | 'Create a new group to start your GitLab Ultimate trial.'
end
with_them do
it { is_expected.to eq(text) }
end
+
+ context 'with the duo_enterprise_trials feature flag off' do
+ before do
+ stub_feature_flags(duo_enterprise_trials: false)
+ end
+
+ where(:have_group_namespace, :text) do
+ true | 'You can apply your trial to a new group or an existing group.'
+ false | 'Create a new group to start your GitLab Ultimate trial.'
+ end
+
+ with_them do
+ it { is_expected.to eq(text) }
+ end
+ end
end
context 'with namespace_selector_data', :saas do
diff --git a/ee/spec/requests/gitlab_subscriptions/trials/duo_enterprise_controller_spec.rb b/ee/spec/requests/gitlab_subscriptions/trials/duo_enterprise_controller_spec.rb
index 918efde28646fc878ca7b7a3d87e3761fd2902d5..cfd1c8c6206d26a43311692f47f159e0f17d692c 100644
--- a/ee/spec/requests/gitlab_subscriptions/trials/duo_enterprise_controller_spec.rb
+++ b/ee/spec/requests/gitlab_subscriptions/trials/duo_enterprise_controller_spec.rb
@@ -193,9 +193,9 @@
expires_on = GitlabSubscriptions::Trials::AddOns::DURATION.from_now.to_date.iso8601
message = format(
s_(
- 'DuoEnterpriseTrial|Congratulations, your free GitLab Duo Enterprise trial is activated and will ' \
- 'expire on %{exp_date}. The new license might take a minute to show on the page. To give members ' \
- 'access to new GitLab Duo Enterprise features, <a target="_blank" rel="noopener noreferrer" ' \
+ 'DuoEnterpriseTrial|Congratulations, your free Ultimate and GitLab Duo Enterprise trial is activated ' \
+ 'and will expire on %{exp_date}. The new license might take a minute to show on the page. To give ' \
+ 'members access to new GitLab Duo Enterprise features, <a target="_blank" rel="noopener noreferrer" ' \
'href="/help/subscriptions/subscription-add-ons#assign-gitlab-duo-seats">assign them</a> ' \
'to GitLab Duo Enterprise seats.'
),
diff --git a/ee/spec/requests/gitlab_subscriptions/trials_controller_spec.rb b/ee/spec/requests/gitlab_subscriptions/trials_controller_spec.rb
index 4dabbc421bb238fdfefa4f98ef637cbe6596a6d4..3aee58f4f2ca76d8ddaf728cf2cc8c1923496ba8 100644
--- a/ee/spec/requests/gitlab_subscriptions/trials_controller_spec.rb
+++ b/ee/spec/requests/gitlab_subscriptions/trials_controller_spec.rb
@@ -197,10 +197,10 @@
expect(post_create).to have_gitlab_http_status(:ok)
expect(response.body).to include(_('your trial could not be created'))
- expect(response.body).to include(_('Start your Free Ultimate Trial'))
- expect(response.body).to include(s_('Trial|Your GitLab Ultimate trial lasts for 30 days, ' \
- 'but you can keep your free GitLab account forever. ' \
- 'We just need some additional information to activate your trial.'))
+ expect(response.body).to include(_('Start your Free Ultimate and GitLab Duo Enterprise Trial'))
+ expect(response.body).to include(s_('Trial|Your combined Ultimate and GitLab Duo Enterprise trial ' \
+ 'lasts for 60 days. We just need some additional information ' \
+ 'to activate it.'))
end
end
@@ -289,8 +289,8 @@ def expect_create_failure(reason, payload = {})
RSpec::Matchers.define :render_select_namespace do
match do |response|
expect(response).to have_gitlab_http_status(:ok)
- expect(response.body).to include(_('Almost there'))
- expect(response.body).to include(_('Start your free trial'))
+ expect(response.body).to include(_('Apply your combined trial to an existing group'))
+ expect(response.body).to include(_('Activate my trial'))
end
end
diff --git a/ee/spec/support/helpers/features/trial_helpers.rb b/ee/spec/support/helpers/features/trial_helpers.rb
index 41b84af31a0c03079eb2c253bfddfcbcfab2b221..30d2853d527ac7b5332c96ec1acef32fcc23c9c1 100644
--- a/ee/spec/support/helpers/features/trial_helpers.rb
+++ b/ee/spec/support/helpers/features/trial_helpers.rb
@@ -166,13 +166,13 @@ def submit_trial_selection_form(result: ServiceResponse.success, extra_params: {
extra_params: extra_with_glm_source(extra_params).merge(existing_group_attrs)
)
- click_button 'Start your free trial'
+ click_button 'Activate my trial'
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))
- click_button 'Start your free trial'
+ click_button 'Activate my trial'
end
def extra_with_glm_source(extra_params)
diff --git a/ee/spec/views/subscriptions/trials/_lead_form.html.haml_spec.rb b/ee/spec/views/subscriptions/trials/_lead_form.html.haml_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..439c9b2c3eaa1eb8505db47df0bcafe4129693d9
--- /dev/null
+++ b/ee/spec/views/subscriptions/trials/_lead_form.html.haml_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'gitlab_subscriptions/trials/_lead_form.html.haml', feature_category: :subscription_management do
+ include Devise::Test::ControllerHelpers
+
+ let(:user) { build_stubbed(:user) }
+
+ before do
+ allow(view).to receive(:current_user) { user }
+ end
+
+ it 'renders lead form' do
+ render 'gitlab_subscriptions/trials/lead_form'
+
+ expect(rendered).to have_content(_('Start your Free Ultimate and GitLab Duo Enterprise Trial'))
+ end
+
+ context 'with the duo_enterprise_trials feature flag off' do
+ before do
+ stub_feature_flags(duo_enterprise_trials: false)
+ end
+
+ it 'renders lead for and trial only referenced Ultimate verbage' do
+ render 'gitlab_subscriptions/trials/lead_form'
+
+ expect(rendered).to have_content(_('Start your Free Ultimate Trial'))
+ end
+ end
+end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 9a72743b33da7464081084a92296f8c8a5c66ccd..fc46359168f13fa3eec7da5c6d373aeea758c1de 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3038,6 +3038,9 @@ msgstr ""
msgid "Activate Service Desk"
msgstr ""
+msgid "Activate my trial"
+msgstr ""
+
msgid "Activated"
msgstr ""
@@ -20156,7 +20159,7 @@ msgstr ""
msgid "DuoEnterpriseTrial|Apply your GitLab Duo Enterprise trial to an existing group"
msgstr ""
-msgid "DuoEnterpriseTrial|Congratulations, your free GitLab Duo Enterprise trial is activated and will expire on %{exp_date}. The new license might take a minute to show on the page. To give members access to new GitLab Duo Enterprise features, %{assign_link_start}assign them%{assign_link_end} to GitLab Duo Enterprise seats."
+msgid "DuoEnterpriseTrial|Congratulations, your free Ultimate and GitLab Duo Enterprise trial is activated and will expire on %{exp_date}. The new license might take a minute to show on the page. To give members access to new GitLab Duo Enterprise features, %{assign_link_start}assign them%{assign_link_end} to GitLab Duo Enterprise seats."
msgstr ""
msgid "DuoEnterpriseTrial|Enhance security and remediate vulnerabilities efficiently"
@@ -52810,6 +52813,9 @@ msgstr ""
msgid "Start your Free Ultimate Trial"
msgstr ""
+msgid "Start your Free Ultimate and GitLab Duo Enterprise Trial"
+msgstr ""
+
msgid "Start your free trial"
msgstr ""
@@ -57745,6 +57751,9 @@ msgstr ""
msgid "Trials|Upgrade to regain access to powerful features like advanced team management for code, security, and reporting."
msgstr ""
+msgid "Trials|You can apply your Ultimate and GitLab Duo Enterprise trial to a group."
+msgstr ""
+
msgid "Trials|You can apply your trial to a new group or an existing group."
msgstr ""
@@ -57765,6 +57774,9 @@ msgstr ""
msgid "Trial|Allowed characters: +, 0-9, -, and spaces."
msgstr ""
+msgid "Trial|Apply your combined trial to an existing group"
+msgstr ""
+
msgid "Trial|By clicking \"%{buttonText}\" you accept the %{gitlabSubscriptionAgreement} and acknowledge the %{privacyStatement} and %{cookiePolicy}"
msgstr ""
@@ -57801,6 +57813,9 @@ msgstr ""
msgid "Trial|Your GitLab Ultimate trial lasts for 30 days, but you can keep your free GitLab account forever. We just need some additional information to activate your trial."
msgstr ""
+msgid "Trial|Your combined Ultimate and GitLab Duo Enterprise trial lasts for 60 days. We just need some additional information to activate it."
+msgstr ""
+
msgid "Trigger"
msgstr ""