Merge branch 'allow-access-to-trials-controllers-in-dev-env' into 'master'

Allow access to trials controllers in dev env

See merge request gitlab-org/gitlab!35092

ee/app/controllers/ee/application_controller.rb

@@ -9,8 +9,8 @@ module EE
       around_action :set_current_ip_address
     end
 
-    def check_if_gl_com
-      render_404 unless ::Gitlab.com?
+    def check_if_gl_com_or_dev
+      render_404 unless ::Gitlab.dev_env_or_com?
     end
 
     def verify_namespace_plan_check_enabled

ee/app/controllers/trial_registrations_controller.rb

@@ -7,7 +7,7 @@ class TrialRegistrationsController < RegistrationsController
 
   skip_before_action :require_no_authentication
 
-  before_action :check_if_gl_com
+  before_action :check_if_gl_com_or_dev
   before_action :set_redirect_url, only: [:new]
 
   def new

ee/app/controllers/trials_controller.rb

@@ -5,7 +5,7 @@ class TrialsController < ApplicationController
 
   layout 'trial'
 
-  before_action :check_if_gl_com
+  before_action :check_if_gl_com_or_dev
   before_action :authenticate_user!
   before_action :find_or_create_namespace, only: :apply
 

ee/spec/controllers/trial_registrations_controller_spec.rb

@@ -3,47 +3,57 @@
 require 'spec_helper'
 
 RSpec.describe TrialRegistrationsController do
-  describe '#new' do
-    let(:user) { create(:user) }
+  let(:dev_env_or_com) { true }
 
   before do
-      allow(Gitlab).to receive(:com?).and_return(true)
+    allow(Gitlab).to receive(:dev_env_or_com?).and_return(dev_env_or_com)
   end
 
-    context 'when customer is authenticated' do
-      before do
-        sign_in(user)
-      end
+  shared_examples 'a dot-com only feature' do
+    let(:success_status) { :ok }
 
-      it 'redirects to the new trial page' do
-        get :new
+    context 'when not on gitlab.com and not in development environment' do
+      let(:dev_env_or_com) { false }
 
-        expect(response).to redirect_to(new_trial_url)
+      it { is_expected.to have_gitlab_http_status(:not_found) }
     end
 
-      it 'redirect keeps the query string parameters' do
-        get_params = { glm_source: 'some_source', glm_content: 'some_content' }
+    context 'when on gitlab.com or in dev environment' do
+      it { is_expected.to have_gitlab_http_status(success_status) }
+    end
+  end
+
+  describe '#new' do
+    let(:logged_in_user) { nil }
+    let(:get_params) { {} }
 
+    before do
+      sign_in(logged_in_user) if logged_in_user.present?
       get :new, params: get_params
+    end
+
+    subject { response }
+
+    it_behaves_like 'a dot-com only feature'
+
+    context 'when customer is authenticated' do
+      let_it_be(:logged_in_user) { create(:user) }
+
+      it { is_expected.to redirect_to(new_trial_url) }
 
-        expect(response).to redirect_to(new_trial_url(get_params))
+      context 'when there are additional query params' do
+        let(:get_params) { { glm_source: 'some_source', glm_content: 'some_content' } }
+
+        it { is_expected.to redirect_to(new_trial_url(get_params)) }
       end
     end
 
     context 'when customer is not authenticated' do
-      it 'renders the regular template' do
-        get :new
-
-        expect(response).to render_template(:new)
-      end
+      it { is_expected.to render_template(:new) }
     end
   end
 
   describe '#create' do
-    before do
-      stub_application_setting(send_user_confirmation_email: true)
-    end
-
     let(:user_params) do
       {
         first_name: 'John',
@@ -54,36 +64,24 @@ RSpec.describe TrialRegistrationsController do
       }
     end
 
-    context 'when invalid - instance is not GL.com' do
     before do
-        allow(Gitlab).to receive(:com?).and_return(false)
-      end
-
-      it 'returns 404 not found' do
+      stub_application_setting(send_user_confirmation_email: true)
       post :create, params: { user: user_params }
-
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
     end
 
-    context 'when valid' do
-      before do
-        allow(Gitlab).to receive(:com?).and_return(true)
+    it_behaves_like 'a dot-com only feature' do
+      let(:success_status) { :found }
+      subject { response }
     end
 
     it 'marks the account as unconfirmed' do
-        post :create, params: { user: user_params }
-
       expect(User.last).not_to be_confirmed
     end
 
     context 'derivation of name' do
       it 'sets name from first and last name' do
-          post :create, params: { user: user_params }
-
         expect(User.last.name).to eq("#{user_params[:first_name]} #{user_params[:last_name]}")
       end
     end
   end
-  end
 end

ee/spec/controllers/trials_controller_spec.rb

@@ -3,74 +3,87 @@
 require 'spec_helper'
 
 RSpec.describe TrialsController do
-  shared_examples 'an authenticated endpoint' do |verb, action|
-    it 'redirects to login page' do
-      send(verb, action)
+  let_it_be(:user) { create(:user, email_opted_in: true) }
 
-      expect(response).to redirect_to(new_trial_registration_url)
-    end
-  end
+  let(:dev_env_or_com) { true }
+  let(:logged_in) { true }
 
   before do
-    allow(::Gitlab).to receive(:com?).and_return(true)
+    allow(::Gitlab).to receive(:dev_env_or_com?).and_return(dev_env_or_com)
+    sign_in(user) if logged_in
   end
 
-  describe '#new' do
-    it_behaves_like 'an authenticated endpoint', :get, :new
+  shared_examples 'an authenticated endpoint' do
+    let(:success_status) { :ok }
 
-    context 'when invalid - instance is not GL.com' do
-      it 'returns 404 not found' do
-        allow(::Gitlab).to receive(:com?).and_return(false)
+    context 'when not authenticated' do
+      let(:logged_in) { false }
 
-        get :new
+      it { is_expected.to redirect_to(new_trial_registration_url) }
+    end
 
-        expect(response).to have_gitlab_http_status(:not_found)
+    context 'when authenticated' do
+      it { is_expected.to have_gitlab_http_status(success_status) }
     end
   end
+
+  shared_examples 'a dot-com only feature' do
+    let(:success_status) { :ok }
+
+    context 'when not on gitlab.com and not in development environment' do
+      let(:dev_env_or_com) { false }
+
+      it { is_expected.to have_gitlab_http_status(:not_found) }
     end
 
-  describe '#create_lead' do
-    it_behaves_like 'an authenticated endpoint', :post, :create_lead
+    context 'when on gitlab.com or in dev environment' do
+      it { is_expected.to have_gitlab_http_status(success_status) }
+    end
+  end
 
-    describe 'authenticated' do
-      let(:user) { create(:user, email_opted_in: true) }
-      let(:create_lead_result) { nil }
+  describe '#new' do
+    subject do
+      get :new
+      response
+    end
 
-      before do
-        sign_in(user)
+    it_behaves_like 'an authenticated endpoint'
+    it_behaves_like 'a dot-com only feature'
   end
 
-      context 'response url' do
+  describe '#create_lead' do
+    let(:post_params) { {} }
+    let(:create_lead_result) { nil }
+
     before do
       allow_next_instance_of(GitlabSubscriptions::CreateLeadService) do |lead_service|
         expect(lead_service).to receive(:execute).and_return({ success: create_lead_result })
       end
     end
 
+    subject do
+      post :create_lead, params: post_params
+      response
+    end
+
+    it_behaves_like 'an authenticated endpoint'
+    it_behaves_like 'a dot-com only feature'
+
     context 'on success' do
       let(:create_lead_result) { true }
 
-          it 'redirects user to Step 3' do
-            post :create_lead
-
-            expect(response).to redirect_to(select_trials_url)
-          end
+      it { is_expected.to redirect_to(select_trials_url) }
     end
 
     context 'on failure' do
       let(:create_lead_result) { false }
 
-          it 'renders the :new template' do
-            post :create_lead
-
-            expect(response).to render_template(:new)
-          end
-        end
+      it { is_expected.to render_template(:new) }
     end
 
     context 'request params to Lead Service' do
-        it 'sends appropriate request params' do
-          params = {
+      let(:post_params) do
+        {
           company_name: 'Gitlab',
           company_size: '1-99',
           first_name: user.first_name,
@@ -79,7 +92,10 @@ RSpec.describe TrialsController do
           number_of_users: "20",
           country: 'IN'
         }
-          extra_params = {
+      end
+
+      let(:extra_params) do
+        {
           work_email: user.email,
           uid: user.id,
           skip_email_confirmation: true,
@@ -87,49 +103,62 @@ RSpec.describe TrialsController do
           provider: 'gitlab',
           newsletter_segment: user.email_opted_in
         }
-          expected_params = ActionController::Parameters.new(params).merge(extra_params).permit!
+      end
 
+      let(:expected_params) do
+        ActionController::Parameters.new(post_params).merge(extra_params).permit!
+      end
+
+      it 'sends appropriate request params' do
         expect_next_instance_of(GitlabSubscriptions::CreateLeadService) do |lead_service|
           expect(lead_service).to receive(:execute).with({ trial_user: expected_params }).and_return({ success: true })
         end
 
-          post :create_lead, params: params
-        end
+        subject
       end
     end
   end
 
   describe '#select' do
-    it_behaves_like 'an authenticated endpoint', :get, :select
+    subject do
+      get :select
+      response
+    end
+
+    it_behaves_like 'an authenticated endpoint'
+    it_behaves_like 'a dot-com only feature'
   end
 
   describe '#apply' do
-    let(:user) { create(:user) }
-    let(:namespace) { create(:namespace, owner_id: user.id, path: 'namespace-test') }
+    let_it_be(:namespace) { create(:namespace, owner_id: user.id, path: 'namespace-test') }
+
     let(:apply_trial_result) { nil }
+    let(:post_params) { { namespace_id: namespace.id } }
 
     before do
-      sign_in(user)
-
       allow_any_instance_of(GitlabSubscriptions::ApplyTrialService).to receive(:execute) do
         { success: apply_trial_result }
       end
     end
 
+    subject do
+      post :apply, params: post_params
+      response
+    end
+
+    it_behaves_like 'an authenticated endpoint'
+    it_behaves_like 'a dot-com only feature'
+
     context 'on success' do
       let(:apply_trial_result) { true }
 
-      it "redirects to group's path with the parameter trial as true" do
-        post :apply, params: { namespace_id: namespace.id }
-
-        expect(response).to redirect_to("/#{namespace.path}?trial=true")
-      end
+      it { is_expected.to redirect_to("/#{namespace.path}?trial=true") }
 
       context 'with a new Group' do
+        let(:post_params) { { new_group_name: 'GitLab' } }
+
         it 'creates the Group' do
-          expect do
-            post :apply, params: { new_group_name: 'GitLab' }
-          end.to change { Group.count }.to(1)
+          expect { subject }.to change { Group.count }.to(1)
         end
       end
     end
@@ -137,18 +166,15 @@ RSpec.describe TrialsController do
     context 'on failure' do
       let(:apply_trial_result) { false }
 
-      it 'renders the :select view' do
-        post :apply, params: { namespace_id: namespace.id }
-
-        expect(response).to render_template(:select)
-      end
+      it { is_expected.to render_template(:select) }
 
       context 'with a new Group' do
-        it 'renders the :select view' do
-          post :apply, params: { new_group_name: 'admin' }
+        let(:post_params) { { new_group_name: 'admin' } }
+
+        it { is_expected.to render_template(:select) }
 
-          expect(response).to render_template(:select)
-          expect(Group.count).to eq(0)
+        it 'does not create the Group' do
+          expect { subject }.not_to change { Group.count }.from(0)
         end
       end
     end