Integrate experimentation framework

instead of a custom helper

app/controllers/application_controller.rb

@@ -550,7 +550,7 @@ class ApplicationController < ActionController::Base
   end
 
   def require_role
-    return unless current_user && current_user.role.blank? && helpers.use_experimental_separate_sign_up_flow?
+    return unless current_user && current_user.role.blank? && experiment_enabled?(:signup_flow)
 
     redirect_to users_sign_up_welcome_path
   end

app/controllers/oauth/applications_controller.rb

@@ -5,6 +5,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
   include Gitlab::Allowable
   include PageLayoutHelper
   include OauthApplications
+  include Gitlab::Experimentation::ControllerConcern
 
   before_action :verify_user_oauth_applications_enabled, except: :index
   before_action :authenticate_user!

app/controllers/oauth/authorizations_controller.rb

 # frozen_string_literal: true
 
 class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
+  include Gitlab::Experimentation::ControllerConcern
   layout 'profile'
 
   # Overridden from Doorkeeper::AuthorizationsController to

app/controllers/registrations_controller.rb

@@ -15,7 +15,7 @@ class RegistrationsController < Devise::RegistrationsController
     if: -> { action_name == 'create' && Gitlab::CurrentSettings.current_application_settings.enforce_terms? }
 
   def new
-    if helpers.use_experimental_separate_sign_up_flow?
+    if experiment_enabled?(:signup_flow)
       @resource = build_resource
     else
       redirect_to new_user_session_path(anchor: 'register-pane')
@@ -98,7 +98,7 @@ class RegistrationsController < Devise::RegistrationsController
   def after_sign_up_path_for(user)
     Gitlab::AppLogger.info(user_created_message(confirmed: user.confirmed?))
 
-    return users_sign_up_welcome_path if helpers.use_experimental_separate_sign_up_flow?
+    return users_sign_up_welcome_path if experiment_enabled?(:signup_flow)
 
     confirmed_or_unconfirmed_access_allowed(user) ? stored_location_or_dashboard(user) : users_almost_there_path
   end
@@ -140,7 +140,7 @@ class RegistrationsController < Devise::RegistrationsController
   def sign_up_params
     clean_params = params.require(:user).permit(:username, :email, :email_confirmation, :name, :password)
 
-    if helpers.use_experimental_separate_sign_up_flow?
+    if experiment_enabled?(:signup_flow)
       clean_params[:name] = clean_params[:username]
     end
 
@@ -184,7 +184,7 @@ class RegistrationsController < Devise::RegistrationsController
   # Part of an experiment to build a new sign up flow. Will be resolved
   # with https://gitlab.com/gitlab-org/growth/engineering/issues/64
   def choose_layout
-    if helpers.use_experimental_separate_sign_up_flow?
+    if experiment_enabled?(:signup_flow)
       'devise_experimental_separate_sign_up_flow'
     else
       'devise'

app/helpers/sessions_helper.rb

@@ -4,8 +4,4 @@ module SessionsHelper
   def unconfirmed_email?
     flash[:alert] == t(:unconfirmed, scope: [:devise, :failure])
   end
-
-  def use_experimental_separate_sign_up_flow?
-    ::Gitlab.dev_env_or_com? && Feature.enabled?(:experimental_separate_sign_up_flow)
-  end
 end

app/views/devise/registrations/new.html.haml

 - page_title "Sign up"
-- if use_experimental_separate_sign_up_flow?
+- if experiment_enabled?(:signup_flow)
   = render 'devise/shared/experimental_separate_sign_up_flow_box'
 - else
   = render 'devise/shared/signup_box'

app/views/devise/sessions/new.html.haml

@@ -4,7 +4,7 @@
   - if form_based_providers.any?
     = render 'devise/shared/tabs_ldap'
   - else
-    - unless use_experimental_separate_sign_up_flow?
+    - unless experiment_enabled?(:signup_flow)
       = render 'devise/shared/tabs_normal'
   .tab-content
     - if password_authentication_enabled_for_web? || ldap_enabled? || crowd_enabled?

app/views/devise/shared/_signin_box.html.haml

@@ -23,7 +23,7 @@
     .login-body
       = render 'devise/sessions/new_base'
 
-- if use_experimental_separate_sign_up_flow?
+- if experiment_enabled?(:signup_flow)
   %p.light.mt-2
     = _("Don't have an account yet?")
     = link_to _("Register now"), new_registration_path(:user)

app/views/layouts/_head.html.haml

@@ -5,7 +5,7 @@
 -# anything from this page beforehand.
 -# Part of an experiment to build a new sign up flow. Will be removed again with
 -# https://gitlab.com/gitlab-org/growth/engineering/issues/64
-- if use_experimental_separate_sign_up_flow? && current_path?("sessions#new")
+- if experiment_enabled?(:signup_flow) && current_path?("sessions#new")
   = javascript_tag nonce: true do
     :plain
       if (window.location.hash === '#register-pane') {

app/views/registrations/welcome.html.haml

@@ -7,7 +7,7 @@
     = form_for(current_user, url: users_sign_up_update_role_path, html: { class: 'new_new_user gl-show-field-errors', 'aria-live' => 'assertive' }) do |f|
       .devise-errors.mt-0
         = render 'devise/shared/error_messages', resource: current_user
-      .form-group
+      .name.form-group
         = f.label :name, _('Full name'), class: 'label-bold'
         = f.text_field :name, class: 'form-control top js-block-emoji js-validate-length', :data => { :max_length => max_name_length, :max_length_message => s_('Name is too long (maximum is %{max_length} characters).') % { max_length: max_name_length }, :qa_selector => 'new_user_name_field' }, required: true, title: _('This field is required.')
       .form-group

ee/app/controllers/ee/registrations_controller.rb

@@ -23,7 +23,7 @@ module EE
         clean_params[:email_opted_in_at] = Time.zone.now
       end
 
-      if helpers.use_experimental_separate_sign_up_flow?
+      if experiment_enabled?(:signup_flow)
         clean_params[:name] = clean_params[:username]
       end
 

spec/features/users/signup_spec.rb

@@ -129,7 +129,7 @@ shared_examples 'Signup' do
 
   describe 'user\'s full name validation', :js do
     before do
-      if Feature.enabled?(:experimental_separate_sign_up_flow)
+      if Gitlab::Experimentation.enabled?(:signup_flow)
         user = create(:user, role: nil)
         sign_in(user)
         visit users_sign_up_welcome_path
@@ -188,7 +188,7 @@ shared_examples 'Signup' do
           fill_in 'new_user_username', with: new_user.username
           fill_in 'new_user_email', with: new_user.email
 
-          unless Feature.enabled?(:experimental_separate_sign_up_flow)
+          unless Gitlab::Experimentation.enabled?(:signup_flow)
             fill_in 'new_user_name', with: new_user.name
             fill_in 'new_user_email_confirmation', with: new_user.email
           end
@@ -213,7 +213,7 @@ shared_examples 'Signup' do
           fill_in 'new_user_username', with: new_user.username
           fill_in 'new_user_email', with: new_user.email
 
-          unless Feature.enabled?(:experimental_separate_sign_up_flow)
+          unless Gitlab::Experimentation.enabled?(:signup_flow)
             fill_in 'new_user_name', with: new_user.name
             fill_in 'new_user_email_confirmation', with: new_user.email
           end
@@ -222,7 +222,7 @@ shared_examples 'Signup' do
 
           expect { click_button 'Register' }.to change { User.count }.by(1)
 
-          if Feature.enabled?(:experimental_separate_sign_up_flow)
+          if Gitlab::Experimentation.enabled?(:signup_flow)
             expect(current_path).to eq users_sign_up_welcome_path
           else
             expect(current_path).to eq dashboard_projects_path
@@ -239,7 +239,7 @@ shared_examples 'Signup' do
         fill_in 'new_user_username', with: new_user.username
         fill_in 'new_user_email', with: new_user.email
 
-        unless Feature.enabled?(:experimental_separate_sign_up_flow)
+        unless Gitlab::Experimentation.enabled?(:signup_flow)
           fill_in 'new_user_name', with: new_user.name
           fill_in 'new_user_email_confirmation', with: new_user.email.capitalize
         end
@@ -247,7 +247,7 @@ shared_examples 'Signup' do
         fill_in 'new_user_password', with: new_user.password
         click_button "Register"
 
-        if Feature.enabled?(:experimental_separate_sign_up_flow)
+        if Gitlab::Experimentation.enabled?(:signup_flow)
           expect(current_path).to eq users_sign_up_welcome_path
         else
           expect(current_path).to eq dashboard_projects_path
@@ -267,7 +267,7 @@ shared_examples 'Signup' do
         fill_in 'new_user_username', with: new_user.username
         fill_in 'new_user_email', with: new_user.email
 
-        unless Feature.enabled?(:experimental_separate_sign_up_flow)
+        unless Gitlab::Experimentation.enabled?(:signup_flow)
           fill_in 'new_user_name', with: new_user.name
           fill_in 'new_user_email_confirmation', with: new_user.email
         end
@@ -275,7 +275,7 @@ shared_examples 'Signup' do
         fill_in 'new_user_password', with: new_user.password
         click_button "Register"
 
-        if Feature.enabled?(:experimental_separate_sign_up_flow)
+        if Gitlab::Experimentation.enabled?(:signup_flow)
           expect(current_path).to eq users_sign_up_welcome_path
         else
           expect(current_path).to eq dashboard_projects_path
@@ -291,7 +291,7 @@ shared_examples 'Signup' do
 
       visit new_user_registration_path
 
-      unless Feature.enabled?(:experimental_separate_sign_up_flow)
+      unless Gitlab::Experimentation.enabled?(:signup_flow)
         fill_in 'new_user_name', with: new_user.name
       end
 
@@ -302,7 +302,7 @@ shared_examples 'Signup' do
 
       expect(current_path).to eq user_registration_path
 
-      if Feature.enabled?(:experimental_separate_sign_up_flow)
+      if Gitlab::Experimentation.enabled?(:signup_flow)
         expect(page).to have_content("error prohibited this user from being saved")
       else
         expect(page).to have_content("errors prohibited this user from being saved")
@@ -317,7 +317,7 @@ shared_examples 'Signup' do
 
       visit new_user_registration_path
 
-      unless Feature.enabled?(:experimental_separate_sign_up_flow)
+      unless Gitlab::Experimentation.enabled?(:signup_flow)
         fill_in 'new_user_name', with: new_user.name
       end
 
@@ -342,7 +342,7 @@ shared_examples 'Signup' do
       fill_in 'new_user_username', with: new_user.username
       fill_in 'new_user_email', with: new_user.email
 
-      unless Feature.enabled?(:experimental_separate_sign_up_flow)
+      unless Gitlab::Experimentation.enabled?(:signup_flow)
         fill_in 'new_user_name', with: new_user.name
         fill_in 'new_user_email_confirmation', with: new_user.email
       end
@@ -361,7 +361,7 @@ shared_examples 'Signup' do
       fill_in 'new_user_username', with: new_user.username
       fill_in 'new_user_email', with: new_user.email
 
-      unless Feature.enabled?(:experimental_separate_sign_up_flow)
+      unless Gitlab::Experimentation.enabled?(:signup_flow)
         fill_in 'new_user_name', with: new_user.name
         fill_in 'new_user_email_confirmation', with: new_user.email
       end
@@ -371,7 +371,7 @@ shared_examples 'Signup' do
 
       click_button "Register"
 
-      if Feature.enabled?(:experimental_separate_sign_up_flow)
+      if Gitlab::Experimentation.enabled?(:signup_flow)
         expect(current_path).to eq users_sign_up_welcome_path
       else
         expect(current_path).to eq dashboard_projects_path
@@ -382,16 +382,15 @@ end
 
 describe 'With original flow' do
   before do
-    stub_feature_flags(experimental_separate_sign_up_flow: false)
+    stub_experiment(signup_flow: false)
   end
 
   it_behaves_like 'Signup'
 end
 
-describe 'With experimental flow on GitLab.com' do
+describe 'With experimental flow' do
   before do
-    allow(::Gitlab).to receive(:com?).and_return(true)
-    stub_feature_flags(experimental_separate_sign_up_flow: true)
+    stub_experiment(signup_flow: true)
   end
 
   it_behaves_like 'Signup'

spec/requests/api/users_spec.rb

@@ -634,40 +634,21 @@ describe API::Users do
   end
 
   describe "GET /users/sign_up" do
-    context 'when experimental_separate_sign_up_flow is active' do
+    context 'when experimental signup_flow is active' do
       before do
-        stub_feature_flags(experimental_separate_sign_up_flow: true)
+        stub_experiment(signup_flow: true)
       end
 
-      context 'on gitlab.com' do
-        before do
-          allow(::Gitlab).to receive(:com?).and_return(true)
-        end
-
-        it "shows sign up page" do
-          get "/users/sign_up"
-          expect(response).to have_gitlab_http_status(200)
-          expect(response).to render_template(:new)
-        end
-      end
-
-      context 'not on gitlab.com' do
-        before do
-          allow(::Gitlab).to receive(:com?).and_return(false)
-        end
-
-        it "redirects to sign in page" do
-          get "/users/sign_up"
-          expect(response).to have_gitlab_http_status(302)
-          expect(response).to redirect_to(new_user_session_path(anchor: 'register-pane'))
-        end
+      it "shows sign up page" do
+        get "/users/sign_up"
+        expect(response).to have_gitlab_http_status(200)
+        expect(response).to render_template(:new)
       end
     end
 
-    context 'when experimental_separate_sign_up_flow is not active' do
+    context 'when experimental signup_flow is not active' do
       before do
-        allow(::Gitlab).to receive(:com?).and_return(true)
-        stub_feature_flags(experimental_separate_sign_up_flow: false)
+        stub_experiment(signup_flow: false)
       end
 
       it "redirects to sign in page" do

spec/spec_helper.rb

@@ -88,6 +88,7 @@ RSpec.configure do |config|
   config.include FixtureHelpers
   config.include GitlabRoutingHelper
   config.include StubFeatureFlags
+  config.include StubExperiments
   config.include StubGitlabCalls
   config.include StubGitlabData
   config.include NextInstanceOf

spec/support/helpers/stub_experiments.rb

+# frozen_string_literal: true
+
+module StubExperiments
+  # Stub Experiment with `key: true/false`
+  #
+  # @param [Hash] experiment where key is feature name and value is boolean whether enabled or not.
+  #
+  # Examples
+  # - `stub_experiment(signup_flow: false)` ... Disable `signup_flow` experiment globally.
+  def stub_experiment(experiments)
+    experiments.each do |experiment_key, enabled|
+      allow(Gitlab::Experimentation).to receive(:enabled?).with(experiment_key, any_args) { enabled }
+    end
+  end
+end

spec/views/devise/shared/_signin_box.html.haml_spec.rb

@@ -10,6 +10,7 @@ describe 'devise/shared/_signin_box' do
       allow(view).to receive(:current_application_settings).and_return(Gitlab::CurrentSettings.current_application_settings)
       allow(view).to receive(:captcha_enabled?).and_return(false)
       allow(view).to receive(:captcha_on_login_required?).and_return(false)
+      allow(view).to receive(:experiment_enabled?).and_return(false)
     end
 
     it 'is shown when Crowd is enabled' do

spec/views/layouts/_head.html.haml_spec.rb

@@ -7,6 +7,7 @@ describe 'layouts/_head' do
 
   before do
     allow(view).to receive(:current_application_settings).and_return(Gitlab::CurrentSettings.current_application_settings)
+    allow(view).to receive(:experiment_enabled?).and_return(false)
   end
 
   it 'escapes HTML-safe strings in page_title' do