Merge branch...

Merge branch '284955-engineering-trim-down-the-skip-copy-in-the-com-trial-flow-for-non-gl-users' into 'master'

Trim-down the "skip copy" in the .com trial flow for non-GL users

See merge request gitlab-org/gitlab!48110

ee/app/controllers/trials_controller.rb

@@ -14,6 +14,7 @@ class TrialsController < ApplicationController
 
   def new
     record_experiment_user(:remove_known_trial_form_fields)
+    record_experiment_user(:trimmed_skip_trial_copy)
   end
 
   def select
@@ -36,6 +37,7 @@ class TrialsController < ApplicationController
 
     if @result&.dig(:success)
       record_experiment_conversion_event(:remove_known_trial_form_fields)
+      record_experiment_conversion_event(:trimmed_skip_trial_copy)
       redirect_to group_url(@namespace, { trial: true })
     else
       render :select

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

@@ -4,6 +4,7 @@
     .label
       = s_("Trials|You can always resume this process by selecting your avatar and choosing 'Start a Gold trial'")
   - else
-    = link_to s_('Trials|Skip Trial (Continue with Free Account)'), dashboard_projects_path, class: 'block center py-2'
+    - trial_text = experiment_enabled?(:trimmed_skip_trial_copy) ? s_('Trials|Skip Trial') : s_('Trials|Skip Trial (Continue with Free Account)')
+    = link_to trial_text, dashboard_projects_path, class: 'block center py-2'
     .label
       = s_("Trials|You won't get a free trial right now but you can always resume this process by clicking on your avatar and choosing 'Start a free trial'")

ee/spec/controllers/trials_controller_spec.rb

@@ -54,8 +54,9 @@ RSpec.describe TrialsController do
       response
     end
 
-    it 'calls record_experiment_user for the remove_known_trial_form_fields experiment' do
+    it 'calls record_experiment_user for the remove_known_trial_form_fields & trimmed_skip_trial_copy experiments' do
       expect(controller).to receive(:record_experiment_user).with(:remove_known_trial_form_fields)
+      expect(controller).to receive(:record_experiment_user).with(:trimmed_skip_trial_copy)
 
       subject
     end
@@ -196,8 +197,9 @@ RSpec.describe TrialsController do
       let(:apply_trial_result) { true }
 
       it { is_expected.to redirect_to("/#{namespace.path}?trial=true") }
-      it 'calls the record conversion method for the remove_known_trial_form_fields experiment' do
+      it 'calls the record conversion method for the remove_known_trial_form_fields & trimmed_skip_trial_copy experiments' do
         expect(controller).to receive(:record_experiment_conversion_event).with(:remove_known_trial_form_fields)
+        expect(controller).to receive(:record_experiment_conversion_event).with(:trimmed_skip_trial_copy)
 
         subject
       end
@@ -215,8 +217,9 @@ RSpec.describe TrialsController do
       let(:apply_trial_result) { false }
 
       it { is_expected.to render_template(:select) }
-      it 'does not call the record conversion method for the remove_known_trial_form_fields experiment' do
+      it 'does not call the record conversion method for the remove_known_trial_form_fields & trimmed_skip_trial_copy experiments' do
         expect(controller).not_to receive(:record_experiment_conversion_event).with(:remove_known_trial_form_fields)
+        expect(controller).not_to receive(:record_experiment_conversion_event).with(:trimmed_skip_trial_copy)
 
         subject
       end

ee/spec/views/trials/_skip_trial.html.haml_spec.rb

@@ -5,9 +5,11 @@ require 'spec_helper'
 RSpec.describe 'trials/_skip_trial.html.haml' do
   include ApplicationHelper
 
+  let_it_be(:trimmed_skip_trial_copy_enabled) { false }
   let(:source) { nil }
 
   before do
+    allow(view).to receive(:experiment_enabled?).with(:trimmed_skip_trial_copy).and_return(trimmed_skip_trial_copy_enabled)
     params[:glm_source] = source
     render 'trials/skip_trial'
   end
@@ -26,6 +28,12 @@ RSpec.describe 'trials/_skip_trial.html.haml' do
     let(:source) { 'about.gitlab.com' }
 
     include_examples 'has Skip Trial verbiage'
+
+    context 'when trimmed_skip_trial_copy experiment is enabled' do
+      let_it_be(:trimmed_skip_trial_copy_enabled) { true }
+
+      it { is_expected.to have_content("Skip Trial") }
+    end
   end
 
   context 'with glm_source of gitlab.com' do

ee/spec/views/trials/new.html.haml_spec.rb

@@ -10,6 +10,7 @@ RSpec.describe 'trials/new.html.haml' do
   before do
     allow(view).to receive(:current_user) { user }
     allow(view).to receive(:experiment_enabled?).with(:remove_known_trial_form_fields).and_return(remove_known_trial_form_fields_enabled)
+    allow(view).to receive(:experiment_enabled?).with(:trimmed_skip_trial_copy)
 
     render
   end

lib/gitlab/experimentation.rb

@@ -83,6 +83,9 @@ module Gitlab
       },
       remove_known_trial_form_fields: {
         tracking_category: 'Growth::Conversion::Experiment::RemoveKnownTrialFormFields'
+      },
+      trimmed_skip_trial_copy: {
+        tracking_category: 'Growth::Conversion::Experiment::TrimmedSkipTrialCopy'
       }
     }.freeze
 

locale/gitlab.pot

@@ -28903,6 +28903,9 @@ msgstr ""
 msgid "Trials|Go back to GitLab"
 msgstr ""
 
+msgid "Trials|Skip Trial"
+msgstr ""
+
 msgid "Trials|Skip Trial (Continue with Free Account)"
 msgstr ""