Merge remote-tracking branch 'upstream/master'

Author: TrevorHinesley

.travis.yml

@@ -3,6 +3,8 @@ rvm:
  - 1.9.3
  - 2.0.0
  - 2.1.6
+before_install:
+ - gem install bundler
 before_script:
  - "sudo touch /var/log/stripe-mock-server.log"
  - "sudo chown travis /var/log/stripe-mock-server.log"

lib/stripe_mock/request_handlers/helpers/subscription_helpers.rb

@@ -26,6 +26,8 @@ def custom_subscription_params(plan, cus, options = {})
  end
 
  def add_subscription_to_customer(cus, sub)
+ id = new_id('ch')
+ charges[id] = Data.mock_charge(:id => id, :customer => cus[:id], :amount => sub[:plan][:amount])
  cus[:subscriptions][:total_count] = (cus[:subscriptions][:total_count] || 0) + 1
  cus[:subscriptions][:data].unshift sub
  end
@@ -41,14 +43,14 @@ def delete_subscription_from_customer(cus, subscription)
  # `intervals` is set to 2 when calculating Stripe::Invoice.upcoming end from current_period_start & plan
  def get_ending_time(start_time, plan, intervals = 1)
  case plan[:interval]
-  when "week"
-  start_time + (604800 * (plan[:interval_count] || 1) * intervals)
-  when "month"
-  (Time.at(start_time).to_datetime >> ((plan[:interval_count] || 1) * intervals)).to_time.to_i
-  when "year"
-  (Time.at(start_time).to_datetime >> (12 * intervals)).to_time.to_i # max period is 1 year
-  else
-  start_time
+ when "week"
+ start_time + (604800 * (plan[:interval_count] || 1) * intervals)
+ when "month"
+ (Time.at(start_time).to_datetime >> ((plan[:interval_count] || 1) * intervals)).to_time.to_i
+ when "year"
+ (Time.at(start_time).to_datetime >> (12 * intervals)).to_time.to_i # max period is 1 year
+ else
+ start_time
  end
  end
 

spec/shared_stripe_examples/subscription_examples.rb

@@ -25,6 +25,7 @@ def gen_card_tk
  expect(customer.subscriptions.data).to_not be_empty
  expect(customer.subscriptions.count).to eq(1)
  expect(customer.subscriptions.data.length).to eq(1)
+ expect(customer.charges.data.length).to eq(1)
 
  expect(customer.subscriptions.data.first.id).to eq(sub.id)
  expect(customer.subscriptions.data.first.plan.to_hash).to eq(plan.to_hash)
@@ -33,6 +34,17 @@ def gen_card_tk
  expect(customer.subscriptions.data.first.metadata.example).to eq( "yes" )
 
  end
+ 
+ it 'creates a charge for the customer', live: true do
+ stripe_helper.create_plan(id: 'silver', name: 'Silver Plan', amount: 4999)
+
+ customer = Stripe::Customer.create(source: gen_card_tk)
+ customer.subscriptions.create({ :plan => 'silver', :metadata => { :foo => "bar", :example => "yes" } })
+ customer = Stripe::Customer.retrieve(customer.id)
+
+ expect(customer.charges.data.length).to eq(1)
+ expect(customer.charges.data.first.amount).to eq(4999)
+ end
 
  it 'contains coupon object', live: true do
  plan = stripe_helper.create_plan(id: 'plan_with_coupon', name: 'One More Test Plan', amount: 777)