Merge branch 'rd-add-support-for-gl-com-trials' into 'master'

Update billing section to support GitLab.com trials

See merge request gitlab-org/gitlab-ee!6252

db/schema.rb

@@ -1752,6 +1752,7 @@ ActiveRecord::Schema.define(version: 20180702181530) do
     t.integer "plan_id"
     t.integer "project_creation_level"
     t.string "runners_token"
+    t.datetime_with_timezone "trial_ends_on"
   end
 
   add_index "namespaces", ["created_at"], name: "index_namespaces_on_created_at", using: :btree

ee/app/helpers/billing_plans_helper.rb

@@ -22,4 +22,8 @@ module BillingPlansHelper
       button_tag link_text, class: 'btn disabled'
     end
   end
+
+  def new_gitlab_com_trial_url
+    "#{EE::SUBSCRIPTIONS_URL}/trials/new?gl_com=true"
+  end
 end

ee/app/models/ee/namespace.rb

@@ -180,6 +180,23 @@ module EE
         end
     end
 
+    def eligible_for_trial?
+      ::Gitlab.com? &&
+        parent_id.nil? &&
+        trial_ends_on.blank? &&
+        [EARLY_ADOPTER_PLAN, FREE_PLAN].include?(actual_plan_name)
+    end
+
+    def trial_active?
+      trial_ends_on.present? && trial_ends_on >= Date.today
+    end
+
+    def trial_expired?
+      trial_ends_on.present? &&
+        trial_ends_on < Date.today &&
+        actual_plan_name == FREE_PLAN
+    end
+
     private
 
     def validate_plan_name

ee/app/views/shared/billings/_billing_plan_header.html.haml

@@ -20,5 +20,8 @@
     %p= s_("BillingPlans|To manage the plan for this group, visit the billing section of %{parent_billing_page_link}.").html_safe % { parent_billing_page_link: parent_billing_page_link }
     = link_to s_("BillingPlans|Manage plan"), group_billings_path(parent_group), class: 'btn btn-success'
   - else
-    - faq_link = link_to s_("BillingPlans|frequently asked questions"), "https://about.gitlab.com/gitlab-com/#faq"
-    = s_("BillingPlans|Learn more about each plan by reading our %{faq_link}.").html_safe % { faq_link: faq_link }
+    = render 'shared/billings/trial_status', namespace: namespace
+
+  - if namespace.eligible_for_trial?
+    - namespace_billing_url = namespace.is_a?(Group) ? group_billings_url(namespace) : profile_billings_url
+    %p= link_to 'Start your free trial', new_gitlab_com_trial_url, class: 'btn btn-primary btn-inverted'

ee/app/views/shared/billings/_trial_status.html.haml

+- faq_link        = link_to s_("BillingPlans|frequently asked questions"), "https://about.gitlab.com/gitlab-com/#faq"
+- features_link   = link_to s_("BillingPlans|features"), "https://about.gitlab.com/features"
+- learn_more_text = s_("BillingPlans|Learn more about each plan by reading our %{faq_link}.").html_safe % { faq_link: faq_link }
+
+- if namespace.eligible_for_trial?
+  = s_("BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Gold.").html_safe % { faq_link: faq_link }
+- elsif namespace.trial_active?
+  = s_("BillingPlans|Your Gold trial will <strong>expire after %{expiration_date}</strong>. You can learn more about GitLab.com Gold by reading about our %{features_link}.").html_safe % { expiration_date: namespace.trial_ends_on, features_link: features_link }
+- elsif namespace.trial_expired?
+  = s_("BillingPlans|Your GitLab.com trial expired on %{expiration_date}. %{learn_more_text}").html_safe % { expiration_date: namespace.trial_ends_on, learn_more_text: learn_more_text }
+- else
+  = learn_more_text

ee/db/migrate/20180623053658_add_trial_ends_on_to_namespaces.rb

+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddTrialEndsOnToNamespaces < ActiveRecord::Migration
+  DOWNTIME = false
+
+  def change
+    add_column :namespaces, :trial_ends_on, :datetime_with_timezone
+  end
+end

ee/lib/ee/api/entities.rb

@@ -69,6 +69,7 @@ module EE
         extend ActiveSupport::Concern
 
         prepended do
+          expose :trial_ends_on
           expose :shared_runners_minutes_limit, if: ->(_, options) { options[:current_user]&.admin? }
           expose :plan, if: ->(namespace, opts) { ::Ability.allowed?(opts[:current_user], :admin_namespace, namespace) } do |namespace, _|
             namespace.plan&.name

ee/lib/ee/api/namespaces.rb

+module EE
+  module API
+    module Namespaces
+      extend ActiveSupport::Concern
+
+      prepended do
+        resource :namespaces do
+          desc 'Update a namespace' do
+            success Entities::Namespace
+          end
+          params do
+            optional :plan, type: String, desc: "Namespace or Group plan"
+            optional :shared_runners_minutes_limit, type: Integer, desc: "Pipeline minutes quota for this namespace"
+            optional :trial_ends_on, type: Date, desc: "Trial expiration date"
+          end
+          put ':id' do
+            authenticated_as_admin!
+
+            namespace = find_namespace(params[:id])
+            trial_ends_on = params[:trial_ends_on]
+
+            break not_found!('Namespace') unless namespace
+            break bad_request!("Invalid trial expiration date") if trial_ends_on&.past?
+
+            if namespace.update(declared_params)
+              present namespace, with: ::API::Entities::Namespace, current_user: current_user
+            else
+              render_validation_error!(namespace)
+            end
+          end
+        end
+      end
+    end
+  end
+end

ee/spec/requests/api/namespaces_spec.rb

+require 'spec_helper'
+
+describe API::Namespaces do
+  let(:admin) { create(:admin) }
+  let(:user) { create(:user) }
+  let!(:group1) { create(:group) }
+  let!(:group2) { create(:group, :nested) }
+
+  describe "GET /namespaces" do
+    context "when authenticated as admin" do
+      it "returns correct attributes" do
+        get api("/namespaces", admin)
+
+        group_kind_json_response = json_response.find { |resource| resource['kind'] == 'group' }
+        user_kind_json_response = json_response.find { |resource| resource['kind'] == 'user' }
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(response).to include_pagination_headers
+        expect(group_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
+                                                                 'parent_id', 'members_count_with_descendants',
+                                                                 'plan', 'shared_runners_minutes_limit',
+                                                                 'trial_ends_on')
+
+        expect(user_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
+                                                                'parent_id', 'plan', 'shared_runners_minutes_limit',
+                                                                'trial_ends_on')
+      end
+    end
+
+    context "when authenticated as a regular user" do
+      it "returns correct attributes when user can admin group" do
+        group1.add_owner(user)
+
+        get api("/namespaces", user)
+
+        owned_group_response = json_response.find { |resource| resource['id'] == group1.id }
+
+        expect(owned_group_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
+                                                             'plan', 'parent_id', 'members_count_with_descendants',
+                                                             'trial_ends_on')
+      end
+
+      it "returns correct attributes when user cannot admin group" do
+        group1.add_guest(user)
+
+        get api("/namespaces", user)
+
+        guest_group_response = json_response.find { |resource| resource['id'] == group1.id }
+
+        expect(guest_group_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path', 'parent_id',
+                                                             'trial_ends_on')
+      end
+    end
+  end
+
+  describe 'PUT /namespaces/:id' do
+    before do
+      create(:silver_plan)
+    end
+
+    context 'when authenticated as admin' do
+      it 'updates namespace using full_path' do
+        put api("/namespaces/#{group1.full_path}", admin), plan: 'silver', shared_runners_minutes_limit: 9001
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(json_response['plan']).to eq('silver')
+        expect(json_response['shared_runners_minutes_limit']).to eq(9001)
+      end
+
+      it 'updates namespace using id' do
+        put api("/namespaces/#{group1.id}", admin), plan: 'silver', shared_runners_minutes_limit: 9001
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(json_response['plan']).to eq('silver')
+        expect(json_response['shared_runners_minutes_limit']).to eq(9001)
+      end
+
+      context 'setting the trial expiration date' do
+        context 'when the attr has a future date' do
+          it 'updates the trial expiration date' do
+            date = 30.days.from_now.to_date
+
+            put api("/namespaces/#{group1.id}", admin), trial_ends_on: date
+
+            expect(response).to have_gitlab_http_status(200)
+            expect(json_response['trial_ends_on']).to eq(date.to_s)
+          end
+        end
+
+        context 'when the attr has an old date' do
+          it 'returns 400' do
+            put api("/namespaces/#{group1.id}", admin), trial_ends_on: 2.days.ago.to_date
+
+            expect(response).to have_gitlab_http_status(400)
+            expect(json_response['trial_ends_on']).to eq(nil)
+          end
+        end
+      end
+    end
+
+    context 'when not authenticated as admin' do
+      it 'retuns 403' do
+        put api("/namespaces/#{group1.id}", user), plan: 'silver'
+
+        expect(response).to have_gitlab_http_status(403)
+      end
+    end
+
+    context 'when namespace not found' do
+      it 'returns 404' do
+        put api("/namespaces/12345", admin), plan: 'silver'
+
+        expect(response).to have_gitlab_http_status(404)
+        expect(json_response).to eq('message' => '404 Namespace Not Found')
+      end
+    end
+
+    context 'when invalid params' do
+      it 'returns validation error' do
+        put api("/namespaces/#{group1.id}", admin), plan: 'unknown'
+
+        expect(response).to have_gitlab_http_status(400)
+        expect(json_response['message']).to eq('plan' => ['is not included in the list'])
+      end
+    end
+  end
+end

lib/api/namespaces.rb

@@ -4,6 +4,8 @@ module API
 
     before { authenticate! }
 
+    prepend EE::API::Namespaces
+
     resource :namespaces do
       desc 'Get a namespaces list' do
         success Entities::Namespace
@@ -20,27 +22,6 @@ module API
         present paginate(namespaces), with: Entities::Namespace, current_user: current_user
       end
 
-      desc 'Update a namespace' do
-        success Entities::Namespace
-      end
-      params do
-        optional :plan, type: String, desc: "Namespace or Group plan"
-        optional :shared_runners_minutes_limit, type: Integer, desc: "Pipeline minutes quota for this namespace"
-      end
-      put ':id' do
-        authenticated_as_admin!
-
-        namespace = find_namespace(params[:id])
-
-        break not_found!('Namespace') unless namespace
-
-        if namespace.update(declared_params)
-          present namespace, with: Entities::Namespace, current_user: current_user
-        else
-          render_validation_error!(namespace)
-        end
-      end
-
       desc 'Get a namespace by ID' do
         success Entities::Namespace
       end

locale/gitlab.pot

@@ -823,6 +823,9 @@ msgstr ""
 msgid "BillingPlans|Downgrade"
 msgstr ""
 
+msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Gold."
+msgstr ""
+
 msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}."
 msgstr ""
 
@@ -847,6 +850,15 @@ msgstr ""
 msgid "BillingPlans|You are currently on the %{plan_link} plan."
 msgstr ""
 
+msgid "BillingPlans|Your GitLab.com trial expired on %{expiration_date}. %{learn_more_text}"
+msgstr ""
+
+msgid "BillingPlans|Your Gold trial will <strong>expire after %{expiration_date}</strong>. You can learn more about GitLab.com Gold by reading about our %{features_link}."
+msgstr ""
+
+msgid "BillingPlans|features"
+msgstr ""
+
 msgid "BillingPlans|frequently asked questions"
 msgstr ""
 

spec/requests/api/namespaces_spec.rb

@@ -23,12 +23,10 @@ describe API::Namespaces do
 
         expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
-        expect(group_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
-                                                                 'parent_id', 'members_count_with_descendants',
-                                                                 'plan', 'shared_runners_minutes_limit')
+        expect(group_kind_json_response.keys).to include('id', 'kind', 'name', 'path', 'full_path',
+                                                         'parent_id', 'members_count_with_descendants')
 
-        expect(user_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
-                                                                'parent_id', 'plan', 'shared_runners_minutes_limit')
+        expect(user_kind_json_response.keys).to include('id', 'kind', 'name', 'path', 'full_path', 'parent_id')
       end
 
       it "admin: returns an array of all namespaces" do
@@ -60,8 +58,8 @@ describe API::Namespaces do
 
         owned_group_response = json_response.find { |resource| resource['id'] == group1.id }
 
-        expect(owned_group_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
-                                                             'plan', 'parent_id', 'members_count_with_descendants')
+        expect(owned_group_response.keys).to include('id', 'kind', 'name', 'path', 'full_path',
+                                                     'parent_id', 'members_count_with_descendants')
       end
 
       it "returns correct attributes when user cannot admin group" do
@@ -71,7 +69,7 @@ describe API::Namespaces do
 
         guest_group_response = json_response.find { |resource| resource['id'] == group1.id }
 
-        expect(guest_group_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path', 'parent_id')
+        expect(guest_group_response.keys).to include('id', 'kind', 'name', 'path', 'full_path', 'parent_id')
       end
 
       it "user: returns an array of namespaces" do
@@ -94,56 +92,6 @@ describe API::Namespaces do
     end
   end
 
-  describe 'PUT /namespaces/:id' do
-    before do
-      create(:silver_plan)
-    end
-
-    context 'when authenticated as admin' do
-      it 'updates namespace using full_path' do
-        put api("/namespaces/#{group1.full_path}", admin), plan: 'silver', shared_runners_minutes_limit: 9001
-
-        expect(response).to have_gitlab_http_status(200)
-        expect(json_response['plan']).to eq('silver')
-        expect(json_response['shared_runners_minutes_limit']).to eq(9001)
-      end
-
-      it 'updates namespace using id' do
-        put api("/namespaces/#{group1.id}", admin), plan: 'silver', shared_runners_minutes_limit: 9001
-
-        expect(response).to have_gitlab_http_status(200)
-        expect(json_response['plan']).to eq('silver')
-        expect(json_response['shared_runners_minutes_limit']).to eq(9001)
-      end
-    end
-
-    context 'when not authenticated as admin' do
-      it 'retuns 403' do
-        put api("/namespaces/#{group1.id}", user), plan: 'silver'
-
-        expect(response).to have_gitlab_http_status(403)
-      end
-    end
-
-    context 'when namespace not found' do
-      it 'returns 404' do
-        put api("/namespaces/12345", admin), plan: 'silver'
-
-        expect(response).to have_gitlab_http_status(404)
-        expect(json_response).to eq('message' => '404 Namespace Not Found')
-      end
-    end
-
-    context 'when invalid params' do
-      it 'returns validation error' do
-        put api("/namespaces/#{group1.id}", admin), plan: 'unknown'
-
-        expect(response).to have_gitlab_http_status(400)
-        expect(json_response['message']).to eq('plan' => ['is not included in the list'])
-      end
-    end
-  end
-
   describe 'GET /namespaces/:id' do
     let(:owned_group) { group1 }
     let(:user2) { create(:user) }