Merge branch 'master' into fix_same_name_branch_env_vars_am

Author: travis-architect

lib/travis/api/v3/models/allowance.rb

@@ -5,6 +5,7 @@ class Models::Allowance
     def initialize(subscription_type, owner_id, attributes = {})
       @subscription_type = subscription_type
       @id = owner_id
+      @subscription_type = 3 if !!attributes['no_plan']
       @public_repos = attributes.fetch('public_repos', nil)
       @private_repos = attributes.fetch('private_repos', nil)
       @concurrency_limit = attributes.fetch('concurrency_limit', nil)

lib/travis/api/v3/models/v2_plan_config.rb

@@ -1,7 +1,7 @@
 module Travis::API::V3
   class Models::V2PlanConfig
     attr_reader :id, :name, :private_repos, :starting_price, :starting_users, :plan_type,
-                :private_credits, :public_credits, :addon_configs, :concurrency_limit, :available_standalone_addons, :auto_refill_enabled
+                :private_credits, :public_credits, :addon_configs, :concurrency_limit, :available_standalone_addons, :auto_refill_enabled, :trial_plan
 
     def initialize(attrs)
       @id = attrs.fetch('id')
@@ -15,6 +15,7 @@ def initialize(attrs)
       @plan_type = attrs.fetch('plan_type')
       @concurrency_limit = attrs.fetch('concurrency_limit')
       @available_standalone_addons = attrs.fetch('available_standalone_addons')
+      @trial_plan = attrs.fetch('trial_plan', false)
     end
   end
 end

lib/travis/api/v3/renderer/v2_plan_config.rb

@@ -1,8 +1,8 @@
 module Travis::API::V3
   class Renderer::V2PlanConfig < ModelRenderer
     representation(:standard, :id, :name, :private_repos, :starting_price, :starting_users, :private_credits,
-                   :public_credits, :addon_configs, :plan_type, :concurrency_limit, :available_standalone_addons)
+                   :public_credits, :addon_configs, :plan_type, :concurrency_limit, :available_standalone_addons, :trial_plan)
     representation(:minimal, :id, :name, :private_repos, :starting_price, :starting_users, :private_credits,
-                   :public_credits, :addon_configs, :plan_type, :concurrency_limit)
+                   :public_credits, :addon_configs, :plan_type, :concurrency_limit, :trial_plan)
   end
 end

spec/v3/services/allowance/for_owner_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+RSpec.describe Travis::API::V3::Services::Allowance::ForOwner, set_app: true, billing_spec_helper: true do
+  let(:billing_url) { 'http://billingfake.travis-ci.com' }
+  let(:billing_auth_key) { 'secret' }
+  let(:json_headers) { { 'HTTP_ACCEPT' => 'application/json' } }
+  let(:user_token) { Travis::Api::App::AccessToken.create(user: user, app_id: 1) }
+
+  before do
+    Travis.config.host = 'travis-ci.com'
+    Travis.config.billing.url = billing_url
+    Travis.config.billing.auth_key = billing_auth_key
+  end
+
+  context 'authenticated' do
+    let(:user) { FactoryBot.create(:user, name: 'Joe', login: 'joe') }
+    let(:v2_response_body) { JSON.dump(allowance_data) }
+
+    before do
+      stub_billing_request(:get, "/usage/users/#{user.id}/allowance", auth_key: billing_auth_key, user_id: user.id)
+      .to_return(status: 200, body: v2_response_body)
+    end
+
+    context 'when user has no plan' do
+      let(:allowance_data) { {'no_plan' => true} }
+
+      describe 'returns subscription_type=3' do
+        before { get("/v3/owner/#{user.login}/allowance", {}, json_headers.merge('HTTP_AUTHORIZATION' => "token #{user_token}")) }
+
+        example { expect(last_response).to be_ok }
+        example { expect(JSON.parse(last_response.body)['subscription_type']).to eq(3) }
+      end
+    end
+
+    context 'when user has a plan' do
+      let(:allowance_data) { {'no_plan' => false} }
+
+      describe 'returns subscription_type=3' do
+        before { get("/v3/owner/#{user.login}/allowance", {}, json_headers.merge('HTTP_AUTHORIZATION' => "token #{user_token}")) }
+
+        example { expect(last_response).to be_ok }
+        example { expect(JSON.parse(last_response.body)['subscription_type']).to eq(2) }
+      end
+    end
+  end
+end

spec/v3/services/v2_subscriptions/all_spec.rb

@@ -32,6 +32,7 @@
         'starting_users': 10_000,
         'private_credits': 500_000,
         'public_credits': 40_000,
+        'trial_plan': false,
         'addon_configs' => {
           'free_tier_credits' => {
             'name' => 'Free 10 000 credits (renewed monthly)',
@@ -94,6 +95,7 @@
             'starting_users' => 10_000,
             'private_credits' => 500_000,
             'public_credits' => 40_000,
+            'trial_plan' => false,
             'available_standalone_addons' => [
               {
                 'id' => 'credits_25k',

spec/v3/services/v2_subscriptions/create_spec.rb

@@ -82,6 +82,7 @@
               'starting_users' => 10_000,
               'private_credits' => 500_000,
               'public_credits' => 40_000,
+              'trial_plan': false,
               'available_standalone_addons' => [
                 {
                   'id' => 'credits_25k',
@@ -198,6 +199,7 @@
             'public_credits' => 40_000,
             'concurrency_limit' => 20,
             'plan_type' => 'metered',
+            'trial_plan' => false,
             'available_standalone_addons' => [
               {
                 'id' => 'credits_25k',
@@ -264,7 +266,6 @@
               'addon_id' => 7,
               'addon_quantity' => 40_000,
               'addon_usage' => 0,
-              'remaining' => 40000,
               'purchase_date' => '2017-11-28T00:09:59.502Z',
               'valid_to' => '2017-11-28T00:09:59.502Z',
               'remaining' => 40_000,