Commit 938d772a authored by Jan Provaznik's avatar Jan Provaznik

Merge branch...

Merge branch '322467-experiment-cleanup-trim-down-the-skip-copy-in-the-com-trial-flow-for-non-gl-users' into 'master'

Cleanup trim-down the "skip copy"  experiment [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!54911
parents 2050e382 9a2b59a2
......@@ -57,11 +57,9 @@ module Registrations
def apply_trial_for_trial_onboarding_flow
if apply_trial
record_experiment_user(:remove_known_trial_form_fields, namespace_id: @group.id)
record_experiment_user(:trimmed_skip_trial_copy, namespace_id: @group.id)
record_experiment_user(:trial_registration_with_social_signin, namespace_id: @group.id)
record_experiment_user(:trial_onboarding_issues, namespace_id: @group.id)
record_experiment_conversion_event(:remove_known_trial_form_fields)
record_experiment_conversion_event(:trimmed_skip_trial_copy)
record_experiment_conversion_event(:trial_registration_with_social_signin)
record_experiment_conversion_event(:trial_onboarding_issues)
......
......@@ -14,7 +14,6 @@ class TrialsController < ApplicationController
def new
record_experiment_user(:remove_known_trial_form_fields, remove_known_trial_form_fields_context)
record_experiment_user(:trimmed_skip_trial_copy)
record_experiment_user(:trial_registration_with_social_signin, trial_registration_with_social_signin_context)
end
......@@ -42,11 +41,9 @@ class TrialsController < ApplicationController
if @result&.dig(:success)
record_experiment_user(:remove_known_trial_form_fields, namespace_id: @namespace.id)
record_experiment_user(:trimmed_skip_trial_copy, namespace_id: @namespace.id)
record_experiment_user(:trial_registration_with_social_signin, namespace_id: @namespace.id)
record_experiment_user(:trial_onboarding_issues, namespace_id: @namespace.id)
record_experiment_conversion_event(:remove_known_trial_form_fields)
record_experiment_conversion_event(:trimmed_skip_trial_copy)
record_experiment_conversion_event(:trial_registration_with_social_signin)
record_experiment_conversion_event(:trial_onboarding_issues)
......
......@@ -4,7 +4,6 @@
.label
= s_("Trials|You can always resume this process by selecting your avatar and choosing 'Start an Ultimate trial'")
- else
- 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'
= link_to s_('Trials|Skip Trial'), 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'")
---
title: Trim-down "Skip Trial" link on the trial flow page
merge_request: 54911
author:
type: changed
---
name: trimmed_skip_trial_copy_experiment_percentage
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48110
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284956
milestone: '13.7'
type: experiment
group: group::conversion
default_enabled: false
......@@ -142,11 +142,9 @@ RSpec.describe Registrations::GroupsController do
expect(service).to receive(:execute).with(apply_trial_params).and_return({ success: true })
end
expect(controller).to receive(:record_experiment_user).with(:remove_known_trial_form_fields, namespace_id: group.id)
expect(controller).to receive(:record_experiment_user).with(:trimmed_skip_trial_copy, namespace_id: group.id)
expect(controller).to receive(:record_experiment_user).with(:trial_registration_with_social_signin, namespace_id: group.id)
expect(controller).to receive(:record_experiment_user).with(:trial_onboarding_issues, namespace_id: group.id)
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)
expect(controller).to receive(:record_experiment_conversion_event).with(:trial_registration_with_social_signin)
expect(controller).to receive(:record_experiment_conversion_event).with(:trial_onboarding_issues)
end
......
......@@ -63,7 +63,6 @@ RSpec.describe TrialsController do
it 'calls record_experiment_user for the experiments' do
expect(controller).to receive(:record_experiment_user).with(:remove_known_trial_form_fields, remove_known_trial_form_fields_context)
expect(controller).to receive(:record_experiment_user).with(:trimmed_skip_trial_copy)
expect(controller).to receive(:record_experiment_user).with(:trial_registration_with_social_signin, trial_registration_with_social_signin_context)
subject
......@@ -228,11 +227,9 @@ RSpec.describe TrialsController do
it { is_expected.to redirect_to("/#{namespace.path}?trial=true") }
it 'calls the record conversion method for the experiments' do
expect(controller).to receive(:record_experiment_user).with(:remove_known_trial_form_fields, namespace_id: namespace.id)
expect(controller).to receive(:record_experiment_user).with(:trimmed_skip_trial_copy, namespace_id: namespace.id)
expect(controller).to receive(:record_experiment_user).with(:trial_registration_with_social_signin, namespace_id: namespace.id)
expect(controller).to receive(:record_experiment_user).with(:trial_onboarding_issues, namespace_id: namespace.id)
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)
expect(controller).to receive(:record_experiment_conversion_event).with(:trial_registration_with_social_signin)
expect(controller).to receive(:record_experiment_conversion_event).with(:trial_onboarding_issues)
......@@ -254,7 +251,6 @@ RSpec.describe TrialsController do
it { is_expected.to render_template(:select) }
it 'does not call the record conversion method for the 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)
expect(controller).not_to receive(:record_experiment_conversion_event).with(:trial_registration_with_social_signin)
subject
......
......@@ -5,11 +5,9 @@ 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
......@@ -17,7 +15,7 @@ RSpec.describe 'trials/_skip_trial.html.haml' do
subject { rendered }
shared_examples 'has Skip Trial verbiage' do
it { is_expected.to have_content("Skip Trial (Continue with Free Account)") }
it { is_expected.to have_content("Skip Trial") }
end
context 'without glm_source' do
......@@ -28,12 +26,6 @@ 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
......
......@@ -10,7 +10,6 @@ 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
......
......@@ -61,9 +61,6 @@ module Gitlab
remove_known_trial_form_fields: {
tracking_category: 'Growth::Conversion::Experiment::RemoveKnownTrialFormFields'
},
trimmed_skip_trial_copy: {
tracking_category: 'Growth::Conversion::Experiment::TrimmedSkipTrialCopy'
},
trial_registration_with_social_signin: {
tracking_category: 'Growth::Conversion::Experiment::TrialRegistrationWithSocialSigning'
},
......
......@@ -31359,9 +31359,6 @@ msgstr ""
msgid "Trials|Skip Trial"
msgstr ""
msgid "Trials|Skip Trial (Continue with Free Account)"
msgstr ""
msgid "Trials|You can always resume this process by selecting your avatar and choosing 'Start an Ultimate trial'"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment