Merge pull request #1159 from AndriiMysko/plan-migration-fix-am

Plan migration fix

Author: AndriiMysko

lib/travis/api/v3/queries/v2_subscriptions.rb

@@ -1,6 +1,6 @@
 module Travis::API::V3
   class Queries::V2Subscriptions < Query
-    params :plan, :coupon, :organization_id, :client_secret
+    params :plan, :coupon, :organization_id, :client_secret, :v1_subscription_id
     params :first_name, :last_name, :company, :address, :address2, :city, :country, :state, :vat_id, :zip_code, :billing_email, prefix: :billing_info
     params :token, prefix: :credit_card_info
 
@@ -17,7 +17,8 @@ def create(user_id)
         :coupon => params['coupon'],
         :organization_id => params['organization_id'],
         :billing_info => billing_info_params,
-        :credit_card_info => credit_card_info_params
+        :credit_card_info => credit_card_info_params,
+        :v1_subscription_id => params['v1_subscription_id']
       )
     end
   end

lib/travis/api/v3/services/v2_subscriptions/create.rb

@@ -1,7 +1,7 @@
 module Travis::API::V3
   class Services::V2Subscriptions::Create < Service
     result_type :v2_subscription
-    params :plan, :coupon, :organization_id, :client_secret
+    params :plan, :coupon, :organization_id, :client_secret, :v1_subscription_id
     params :first_name, :last_name, :company, :address, :address2, :city, :country, :state, :vat_id, :zip_code, :billing_email, prefix: :billing_info
     params :token, prefix: :credit_card_info
 

spec/v3/services/v2_subscriptions/create_spec.rb

@@ -59,7 +59,9 @@
             },
             'credit_card_info' => {
               'token' => 'token_from_stripe'
-            }})
+            },
+            'v1_subscription_id': nil
+            })
           .to_return(status: 201, body: JSON.dump(billing_subscription_response_body(
             'id' => 1234,
             'owner' => { 'type' => 'Organization', 'id' => organization.id },