Merge branch 'jswain_combined_registration_without_force_company_trial' into 'master'

force_trial and combined_registration symbiosis

See merge request gitlab-org/gitlab!69898

app/experiments/combined_registration_experiment.rb

@@ -3,6 +3,10 @@
 class CombinedRegistrationExperiment < ApplicationExperiment # rubocop:disable Gitlab/NamespacedClass
   include Rails.application.routes.url_helpers
 
+  def key_for(source, _ = nil)
+    super(source, 'force_company_trial')
+  end
+
   def redirect_path(trial_params)
     @trial_params = trial_params
 

ee/app/controllers/ee/registrations/welcome_controller.rb

@@ -70,6 +70,8 @@ module EE
 
       override :trial_params
       def trial_params
+        return if combined_registration_experiment.variant.name == 'candidate'
+
         experiment(:force_company_trial, user: current_user) do |e|
           e.try { { trial: true } }
           e.run
@@ -87,7 +89,11 @@ module EE
       end
 
       def publish_combined_registration_experiment
-        experiment(:combined_registration, user: current_user).publish_to_client if show_signup_onboarding?
+        combined_registration_experiment.publish_to_client if show_signup_onboarding?
+      end
+
+      def combined_registration_experiment
+        experiment(:combined_registration, user: current_user)
       end
     end
   end

ee/spec/controllers/registrations/welcome_controller_spec.rb

@@ -244,17 +244,24 @@ RSpec.describe Registrations::WelcomeController do
 
           context 'when combined_registration is candidate variant' do
             before do
+              allow(controller).to receive(:experiment).and_call_original
               stub_experiments(combined_registration: :candidate)
             end
 
             it { is_expected.to redirect_to new_users_sign_up_groups_project_path }
+
+            it "doesn't call the force_company_trial experiment" do
+              expect(controller).not_to receive(:experiment).with(:force_company_trial, user: user)
+
+              subject
+            end
           end
 
           context 'and force_company_trial experiment is candidate' do
             let(:setup_for_company) { 'true' }
 
             before do
-              stub_experiments(force_company_trial: :candidate)
+              stub_experiments(combined_registration: :control, force_company_trial: :candidate)
             end
 
             it { is_expected.to redirect_to new_users_sign_up_group_path(trial: true) }

ee/spec/experiments/combined_registration_experiment_spec.rb

@@ -7,6 +7,15 @@ RSpec.describe CombinedRegistrationExperiment, :experiment do
 
   let_it_be(:user) { create(:user) }
 
+  describe '#signature' do
+    let(:force_company_trial) { experiment(:force_company_trial, user: user) }
+
+    it 'returns the same context key for force_company_trial' do
+      expect(subject.signature[:key]).not_to be_nil
+      expect(subject.signature[:key]).to eq(force_company_trial.signature[:key])
+    end
+  end
+
   describe '#redirect_path' do
     it 'when control passes trial_params to path' do
       stub_experiments(combined_registration: :control)