stripe-ruby-mock 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dc4a01998c2f9e1cd85aee1281cf75d5b4aa436
-  data.tar.gz: 045708a8af619fc7b299055f0822eed79f8cae1f
+  metadata.gz: a861480c10df772899ac63e55dbc97d84ff3eb2c
+  data.tar.gz: 3d44f183f03df9af022be2b36b49fe45a01ed1e6
 SHA512:
-  metadata.gz: 918999885f3cf5e32133f85b535e76ecbe7c482b106b4fe70e9a8de03fcd95132bfd4d43496bc397492da84bfb5eded5c46807e70c2562ee38923e202bf6dd89
-  data.tar.gz: b9ab01a438f10f7148470641a0b0fddcd32b0fedfc28969a8f52020d483ed64e045e384f1acda6ec422680c54f34c36ace6dcb89b2a01949053e96269e9953a6
+  metadata.gz: 38a0c8592b9dc4181fdd8730e9b2d2496f852911a480eddc3621a7061d7cd0e1a6e6268a4f722be98483b58b32dd03eb7664135caaa99a638fce5dc70d20d10c
+  data.tar.gz: 44f924ab949f7101b1854f413b7120a0cafc5432c83ae23ab993c4cde6e879445f33ef8fa863a066d24bc06c14d3f9c299a5d6917f58890fd32a76a07ed72be9

data/.env

@@ -0,0 +1,2 @@
+STRIPE_TEST_SECRET_KEY=sk_test_eFvAvN5rz4GqAbsWxg63Jx79
+STRIPE_TEST_OAUTH_ACCESS_TOKEN=sk_test_WnZmEBIHhMcDltNe98sqWN7z

data/.travis.yml

@@ -1,3 +1,5 @@
+dist: trusty
+sudo: required
 language: ruby
 rvm:
   - 1.9.3

data/README.md

@@ -12,7 +12,7 @@ This gem has unexpectedly grown in popularity and I've gotten pretty busy, so I'
 
 In your gemfile:
 
-    gem 'stripe-ruby-mock', '~> 2.4.0', :require => 'stripe_mock'
+    gem 'stripe-ruby-mock', '~> 2.4.1', :require => 'stripe_mock'
 
 ## Features
 

data/lib/stripe_mock.rb

@@ -26,6 +26,7 @@ require 'stripe_mock/api/client'
 require 'stripe_mock/api/server'
 
 require 'stripe_mock/api/bank_tokens'
+require 'stripe_mock/api/conversion_rate'
 require 'stripe_mock/api/card_tokens'
 require 'stripe_mock/api/debug'
 require 'stripe_mock/api/errors'

data/lib/stripe_mock/api/conversion_rate.rb

@@ -0,0 +1,14 @@
+module StripeMock
+
+  def self.set_conversion_rate(value)
+    case @state
+    when 'local'
+      instance.conversion_rate = value
+    when 'remote'
+      client.set_conversion_rate(value)
+    else
+      raise UnstartedStateError
+    end
+  end
+
+end

data/lib/stripe_mock/client.rb

@@ -65,6 +65,14 @@ module StripeMock
       timeout_wrap { Stripe::Util.symbolize_names @pipe.generate_webhook_event(event_data) }
     end
 
+    def get_conversion_rate
+      timeout_wrap { @pipe.get_data(:conversion_rate) }
+    end
+
+    def set_conversion_rate(value)
+      timeout_wrap { @pipe.set_conversion_rate(value) }
+    end
+
     def destroy_resource(type, id)
       timeout_wrap { @pipe.destroy_resource(type, id) }
     end
@@ -73,6 +81,10 @@ module StripeMock
       timeout_wrap { @pipe.clear_data }
     end
 
+    def upsert_stripe_object(object, attributes)
+      timeout_wrap { @pipe.upsert_stripe_object(object, attributes) }
+    end
+
     def close!
       self.cleanup
       StripeMock.stop_client(:clear_server_data => false)

data/lib/stripe_mock/data/list.rb

@@ -7,6 +7,13 @@ module StripeMock
         @data = Array(data.clone)
         @limit = [[options[:limit] || 10, 100].min, 1].max # restrict @limit to 1..100
         @starting_after = options[:starting_after]
+        if @data.first.is_a?(Hash) && @data.first[:created]
+          @data.sort_by! { |x| x[:created] }
+          @data.reverse!
+        elsif @data.first.respond_to?(:created)
+          @data.sort_by { |x| x.created }
+          @data.reverse!
+        end
       end
 
       def url

data/lib/stripe_mock/instance.rb

@@ -45,7 +45,7 @@ module StripeMock
                 :disputes, :events, :invoices, :invoice_items, :orders, :plans, :recipients,
                 :refunds, :transfers, :subscriptions, :country_spec
 
-    attr_accessor :error_queue, :debug
+    attr_accessor :error_queue, :debug, :conversion_rate
 
     def initialize
       @accounts = {}
@@ -71,6 +71,7 @@ module StripeMock
       @error_queue = ErrorQueue.new
       @id_counter = 0
       @balance_transaction_counter = 0
+      @conversion_rate = 1.0
 
       # This is basically a cache for ParamValidators
       @base_strategy = TestStrategies::Base.new
@@ -113,6 +114,33 @@ module StripeMock
       @events[ event_data[:id] ] = symbolize_names(event_data)
     end
 
+    def upsert_stripe_object(object, attributes)
+      # Most Stripe entities can be created via the API.  However, some entities are created when other Stripe entities are
+      # created - such as when BalanceTransactions are created when Charges are created.  This method provides the ability
+      # to create these internal entities.
+      # It also provides the ability to modify existing Stripe entities.
+      id = attributes[:id]
+      if id.nil? || id == ""
+        # Insert new Stripe object
+        case object
+          when :balance_transaction
+            id = new_balance_transaction('txn', attributes)
+          else
+            raise UnsupportedRequestError.new "Unsupported stripe object `#{object}`"
+        end
+      else
+        # Update existing Stripe object
+        case object
+          when :balance_transaction
+            btxn = assert_existence :balance_transaction, id, @balance_transactions[id]
+            btxn.merge!(attributes)
+          else
+            raise UnsupportedRequestError.new "Unsupported stripe object `#{object}`"
+        end
+      end
+      id
+    end
+
     private
 
     def assert_existence(type, id, obj, message=nil)
@@ -135,6 +163,7 @@ module StripeMock
       unless amount.nil?
         # Fee calculation
         params[:fee] ||= (30 + (amount.abs * 0.029).ceil) * (amount > 0 ? 1 : -1)
+        params[:amount] = amount * @conversion_rate
       end
       @balance_transactions[id] = Data.mock_balance_transaction(params.merge(id: id))
       id

data/lib/stripe_mock/request_handlers/balance_transactions.rb

@@ -9,11 +9,27 @@ module StripeMock
 
       def get_balance_transaction(route, method_url, params, headers)
         route =~ method_url
-        assert_existence :balance_transaction, $1, balance_transactions[$1]
+        assert_existence :balance_transaction, $1, hide_additional_attributes(balance_transactions[$1])
       end
 
       def list_balance_transactions(route, method_url, params, headers)
-        Data.mock_list_object(balance_transactions.values, params)
+        values = balance_transactions.values
+        if params.has_key?(:transfer)
+          # If transfer supplied as params, need to filter the btxns returned to only include those with the specified transfer id
+          values = values.select{|btxn| btxn[:transfer] == params[:transfer]}
+        end
+        Data.mock_list_object(values.map{|btxn| hide_additional_attributes(btxn)}, params)
+      end
+
+      private
+
+      def hide_additional_attributes(btxn)
+        # For automatic Stripe transfers, the transfer attribute on balance_transaction stores the transfer which
+        # included this balance_transaction.  However, it is not exposed as a field returned on a balance_transaction.
+        # Therefore, need to not show this attribute if it exists.
+        if !btxn.nil?
+          btxn.reject{|k,v| k == :transfer }
+        end
       end
 
     end

data/lib/stripe_mock/request_handlers/charges.rb

@@ -49,12 +49,13 @@ module StripeMock
             params.merge :id => id,
             :balance_transaction => balance_transaction_id)
 
+        charge = charges[id].clone
         if params[:expand] == ['balance_transaction']
-          charges[id][:balance_transaction] =
+          charge[:balance_transaction] =
             balance_transactions[balance_transaction_id]
         end
 
-        charges[id]
+        charge
       end
 
       def update_charge(route, method_url, params, headers)
@@ -87,7 +88,15 @@ module StripeMock
       def get_charge(route, method_url, params, headers)
         route =~ method_url
         charge_id = $1 || params[:charge]
-        assert_existence :charge, charge_id, charges[charge_id]
+        charge = assert_existence :charge, charge_id, charges[charge_id]
+
+        charge = charge.clone
+        if params[:expand] == ['balance_transaction']
+          balance_transaction = balance_transactions[charge[:balance_transaction]]
+          charge[:balance_transaction] = balance_transaction
+        end
+
+        charge
       end
 
       def capture_charge(route, method_url, params, headers)

data/lib/stripe_mock/request_handlers/coupons.rb

@@ -17,12 +17,12 @@ module StripeMock
 
       def get_coupon(route, method_url, params, headers)
         route =~ method_url
-        assert_existence :id, $1, coupons[$1]
+        assert_existence :coupon, $1, coupons[$1]
       end
 
       def delete_coupon(route, method_url, params, headers)
         route =~ method_url
-        assert_existence :id, $1, coupons.delete($1)
+        assert_existence :coupon, $1, coupons.delete($1)
       end
 
       def list_coupons(route, method_url, params, headers)

data/lib/stripe_mock/request_handlers/customers.rb

@@ -8,6 +8,7 @@ module StripeMock
         klass.add_handler 'get /v1/customers/([^/]*)',              :get_customer
         klass.add_handler 'delete /v1/customers/([^/]*)',           :delete_customer
         klass.add_handler 'get /v1/customers',                      :list_customers
+        klass.add_handler 'delete /v1/customers/([^/]*)/discount',  :delete_customer_discount
       end
 
       def new_customer(route, method_url, params, headers)
@@ -114,6 +115,14 @@ module StripeMock
         Data.mock_list_object(customers.values, params)
       end
 
+      def delete_customer_discount(route, method_url, params, headers)
+        route =~ method_url
+        cus = assert_existence :customer, $1, customers[$1]
+      
+        cus[:discount] = nil
+        
+        cus
+      end
     end
   end
 end

data/lib/stripe_mock/request_handlers/helpers/card_helpers.rb

@@ -77,6 +77,7 @@ module StripeMock
         is_customer = resource.has_key?(:sources)
         new_default = cards_or_sources[:data].count > 0 ? cards_or_sources[:data].first[:id] : nil
         resource[:default_card]   = new_default unless is_customer
+        resource[:sources][:total_count] = cards_or_sources[:data].count if is_customer
         resource[:default_source] = new_default if is_customer
         card
       end

data/lib/stripe_mock/request_handlers/invoices.rb

@@ -52,7 +52,8 @@ module StripeMock
       def pay_invoice(route, method_url, params, headers)
         route =~ method_url
         assert_existence :invoice, $1, invoices[$1]
-        invoices[$1].merge!(:paid => true, :attempted => true, :charge => 'ch_1fD6uiR9FAA2zc')
+        charge = invoice_charge(invoices[$1])
+        invoices[$1].merge!(:paid => true, :attempted => true, :charge => charge[:id])
       end
 
       def upcoming_invoice(route, method_url, params, headers)
@@ -93,6 +94,16 @@ module StripeMock
           })
       end
 
+      ## charge the customer on the invoice, if one does not exist, create
+      #anonymous charge
+      def invoice_charge(invoice)
+        begin
+          new_charge(nil, nil, {customer: invoice[:customer]["id"], amount: invoice[:amount_due], currency: 'usd'}, nil)
+        rescue Stripe::InvalidRequestError
+          new_charge(nil, nil, {source: generate_card_token, amount: invoice[:amount_due], currency: 'usd'}, nil)
+        end
+      end
+
     end
   end
 end

data/lib/stripe_mock/request_handlers/orders.rb

@@ -45,7 +45,7 @@ module StripeMock
           end
         end
 
-        if [:created, :paid, :canceled, :fulfilled, :returned].includes? params[:status]
+        if %w(created paid canceled fulfilled returned).include? params[:status]
           order[:status] = params[:status]
         end
         order

data/lib/stripe_mock/request_handlers/refunds.rb

@@ -15,7 +15,7 @@ module StripeMock
           return refunds[original_refund[:id]] if original_refund
         end
 
-        charge = get_charge(route, method_url, params, headers)
+        charge = assert_existence :charge, params[:charge], charges[params[:charge]]
         params[:amount] ||= charge[:amount]
         id = new_id('re')
         bal_trans_params = {

data/lib/stripe_mock/request_handlers/subscriptions.rb

@@ -46,12 +46,12 @@ module StripeMock
           customer[:default_source] = new_card[:id]
         end
 
-        # Ensure customer has card to charge if plan has no trial and is not free
-        verify_card_present(customer, plan, params)
-
         subscription = Data.mock_subscription({ id: (params[:id] || new_id('su')) })
         subscription.merge!(custom_subscription_params(plan, customer, params))
 
+        # Ensure customer has card to charge if plan has no trial and is not free
+        verify_card_present(customer, plan, subscription, params)
+
         if params[:coupon]
           coupon_id = params[:coupon]
 
@@ -79,7 +79,8 @@ module StripeMock
         plan_id = params[:plan].to_s
         plan = assert_existence :plan, plan_id, plans[plan_id]
 
-        customer_id = params[:customer].to_s
+        customer = params[:customer]
+        customer_id = customer.is_a?(Stripe::Customer) ? customer[:id] : customer.to_s
         customer = assert_existence :customer, customer_id, customers[customer_id]
 
         if params[:source]
@@ -88,12 +89,18 @@ module StripeMock
           customer[:default_source] = new_card[:id]
         end
 
-        # Ensure customer has card to charge if plan has no trial and is not free
-        verify_card_present(customer, plan, params)
+        allowed_params = %w(customer application_fee_percent coupon items metadata plan quantity source tax_percent trial_end trial_period_days)
+        unknown_params = params.keys - allowed_params.map(&:to_sym)
+        if unknown_params.length > 0
+          raise Stripe::InvalidRequestError.new("Received unknown parameter: #{unknown_params.join}", unknown_params.first.to_s, 400)
+        end
 
         subscription = Data.mock_subscription({ id: (params[:id] || new_id('su')) })
         subscription.merge!(custom_subscription_params(plan, customer, params))
 
+        # Ensure customer has card to charge if plan has no trial and is not free
+        verify_card_present(customer, plan, subscription, params)
+
         if params[:coupon]
           coupon_id = params[:coupon]
 
@@ -169,7 +176,7 @@ module StripeMock
 
         assert_existence :plan, plan_name, plan
         params[:plan] = plan if params[:plan]
-        verify_card_present(customer, plan)
+        verify_card_present(customer, plan, subscription)
 
         if subscription[:cancel_at_period_end]
           subscription[:cancel_at_period_end] = false
@@ -216,9 +223,8 @@ module StripeMock
 
       private
 
-      def verify_card_present(customer, plan, params={})
-        if customer[:default_source].nil? && customer[:trial_end].nil? && plan[:trial_period_days].nil? &&
-           plan[:amount] != 0 && plan[:trial_end].nil? && params[:trial_end].nil?
+      def verify_card_present(customer, plan, subscription, params={})
+        if customer[:default_source].nil? && customer[:trial_end].nil? && plan[:trial_period_days].nil? && plan[:amount] != 0 && plan[:trial_end].nil? && params[:trial_end].nil? && (subscription.nil? || subscription[:trial_end].nil? || subscription[:trial_end] == 'now')
           raise Stripe::InvalidRequestError.new('You must supply a valid card xoxo', nil, 400)
         end
       end

data/lib/stripe_mock/server.rb

@@ -65,6 +65,10 @@ module StripeMock
       @instance.generate_webhook_event(event_data)
     end
 
+    def set_conversion_rate(value)
+      @instance.conversion_rate = value
+    end
+
     def error_queue
       @instance.error_queue
     end
@@ -76,5 +80,10 @@ module StripeMock
     def ping
       true
     end
+
+    def upsert_stripe_object(object, attributes)
+      @instance.upsert_stripe_object(object, attributes)
+    end
+
   end
 end

data/lib/stripe_mock/test_strategies/live.rb

@@ -30,6 +30,11 @@ module StripeMock
           # do nothing
         end
       end
+
+      def upsert_stripe_object(object, attributes)
+        raise UnsupportedRequestError.new "Updating or inserting Stripe objects in Live mode not supported"
+      end
+
     end
   end
 end

data/lib/stripe_mock/test_strategies/mock.rb

@@ -14,6 +14,14 @@ module StripeMock
         end
       end
 
+      def upsert_stripe_object(object, attributes = {})
+        if StripeMock.state == 'remote'
+          StripeMock.client.upsert_stripe_object(object, attributes)
+        elsif StripeMock.state == 'local'
+          StripeMock.instance.upsert_stripe_object(object, attributes)
+        end
+      end
+
     end
   end
 end

data/lib/stripe_mock/version.rb

@@ -1,4 +1,4 @@
 module StripeMock
   # stripe-ruby-mock version
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

data/spec/instance_spec.rb

@@ -47,4 +47,9 @@ describe StripeMock::Instance do
     StripeMock.start
     expect(StripeMock.instance.debug).to eq(false)
   end
+
+  it "can set a conversion rate" do
+    StripeMock.set_conversion_rate(1.25)
+    expect(StripeMock.instance.conversion_rate).to eq(1.25)
+  end
 end

data/spec/list_spec.rb

@@ -34,6 +34,20 @@ describe StripeMock::Data::List do
     expect(list.url).to eq("/v1/customers")
   end
 
+  it "returns in descending order if created available" do
+    charge_newer = Stripe::Charge.create(amount: 1, currency: 'usd', source: stripe_helper.generate_card_token, created: 5)
+    charge_older = Stripe::Charge.create(amount: 1, currency: 'usd', source: stripe_helper.generate_card_token, created: 4)
+    list = StripeMock::Data::List.new([charge_older, charge_newer])
+    hash = list.to_h
+
+    expect(hash).to eq(
+      object: "list",
+      data: [charge_newer, charge_older],
+      url: "/v1/charges",
+      has_more: false
+    )
+  end
+
   it "eventually gets turned into a hash" do
     charge1 = Stripe::Charge.create(amount: 1, currency: 'usd', source: stripe_helper.generate_card_token)
     charge2 = Stripe::Charge.create(amount: 1, currency: 'usd', source: stripe_helper.generate_card_token)
@@ -43,7 +57,7 @@ describe StripeMock::Data::List do
 
     expect(hash).to eq(
       object: "list",
-      data: [charge1, charge2, charge3],
+      data: [charge3, charge2, charge1],
       url: "/v1/charges",
       has_more: false
     )
@@ -111,9 +125,8 @@ describe StripeMock::Data::List do
       data[89] = new_charge
       list = StripeMock::Data::List.new(data, starting_after: new_charge.id)
       hash = list.to_h
-
       expect(hash[:data].size).to eq(10)
-      expect(hash[:data]).to eq(data[90, 10])
+      expect(hash[:data]).to eq(data[79, 10].reverse)
     end
 
     it "raises an error if starting_after cursor is not found" do

data/spec/server_spec.rb

@@ -132,4 +132,8 @@ describe 'StripeMock Server', :mock_server => true do
     end
   end
 
+  it "can set a conversion rate" do
+    StripeMock.set_conversion_rate(1.2)
+    expect(StripeMock.client.get_conversion_rate).to eq(1.2)
+  end
 end

data/spec/shared_stripe_examples/balance_transaction_examples.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 shared_examples 'Balance Transaction API' do
 
+  let(:stripe_helper) { StripeMock.create_test_helper }
+
   it "returns an error if balance transaction does not exist" do
     txn_id = 'txn_xxxxxxxxxxxxxxxxxxxxxxxx'
 
@@ -32,4 +34,30 @@ shared_examples 'Balance Transaction API' do
 
   end
 
+  it 'retrieves balance transactions for an automated transfer' do
+    transfer_id = Stripe::Transfer.create({ amount: 2730, currency: "usd" })
+
+    # verify transfer currently has no balance transactions
+    transfer_transactions = Stripe::BalanceTransaction.all({transfer: transfer_id})
+    expect(transfer_transactions.count).to eq(0)
+
+    # verify we can create a new balance transaction associated with the transfer
+    new_txn_id = stripe_helper.upsert_stripe_object(:balance_transaction, {amount: 12300, transfer: transfer_id})
+    new_txn = Stripe::BalanceTransaction.retrieve(new_txn_id)
+    expect(new_txn).to be_a(Stripe::BalanceTransaction)
+    expect(new_txn.amount).to eq(12300)
+    # although transfer was specified as an attribute on the balance_transaction, it should not be returned in the object
+    expect{new_txn.transfer}.to raise_error(NoMethodError)
+
+    # verify we can update an existing balance transaction to associate with the transfer
+    existing_txn_id = 'txn_05RsQX2eZvKYlo2C0FRTGSSA'
+    existing_txn = Stripe::BalanceTransaction.retrieve(existing_txn_id)
+    stripe_helper.upsert_stripe_object(:balance_transaction, {id: existing_txn_id, transfer: transfer_id})
+
+    # now verify that only these balance transactions are retrieved with the transfer
+    transfer_transactions = Stripe::BalanceTransaction.all({transfer: transfer_id})
+    expect(transfer_transactions.count).to eq(2)
+    expect(transfer_transactions.map &:id).to include(new_txn_id, existing_txn_id)
+  end
+
 end

data/spec/shared_stripe_examples/card_examples.rb

@@ -166,6 +166,13 @@ shared_examples 'Card API' do
       expect(retrieved_cus.default_source).to be_nil
     end
 
+    it 'updates total_count if deleted' do
+      card.delete
+      sources = Stripe::Customer.retrieve(customer.id).sources
+
+      expect(sources.total_count).to eq 0
+    end
+
     context "deletion when the user has two cards" do
       let!(:card_token_2) { stripe_helper.generate_card_token(last4: "1123", exp_month: 11, exp_year: 2099) }
       let!(:card_2) { customer.sources.create(source: card_token_2) }

data/spec/shared_stripe_examples/charge_examples.rb

@@ -174,7 +174,23 @@ shared_examples 'Charge API' do
     expect(bal_trans.source).to eq(charge.source)
   end
 
-  it "can expand balance transaction" do
+  context 'when conversion rate is set' do
+    it "balance transaction stores amount converted from charge currency to USD" do
+      StripeMock.set_conversion_rate(1.2)
+
+      charge = Stripe::Charge.create({
+        amount: 300,
+        currency: 'CAD',
+        source: stripe_helper.generate_card_token
+      })
+      bal_trans = Stripe::BalanceTransaction.retrieve(charge.balance_transaction)
+      expect(bal_trans.amount).to eq(charge.amount * 1.2)
+      expect(bal_trans.fee).to eq(39)
+      expect(bal_trans.currency).to eq('usd')
+    end
+  end
+
+  it "can expand balance transaction when creating a charge" do
     charge = Stripe::Charge.create({
       amount: 300,
       currency: 'USD',
@@ -196,6 +212,20 @@ shared_examples 'Charge API' do
     expect(charge.amount).to eq(original.amount)
   end
 
+  it "can expand balance transaction when retrieving a charge" do
+    original = Stripe::Charge.create({
+      amount: 300,
+      currency: 'USD',
+      source: stripe_helper.generate_card_token
+    })
+    charge = Stripe::Charge.retrieve(
+      id: original.id,
+      expand: ['balance_transaction']
+    )
+
+    expect(charge.balance_transaction).to be_a(Stripe::BalanceTransaction)
+  end
+
   it "cannot retrieve a charge that doesn't exist" do
     expect { Stripe::Charge.retrieve('nope') }.to raise_error {|e|
       expect(e).to be_a Stripe::InvalidRequestError
@@ -310,7 +340,7 @@ shared_examples 'Charge API' do
     end
 
     it "stores all charges in memory" do
-      expect(Stripe::Charge.all.data.map(&:id)).to eq([@charge.id, @charge2.id])
+      expect(Stripe::Charge.all.data.map(&:id).reverse).to eq([@charge.id, @charge2.id])
     end
 
     it "defaults count to 10 charges" do

data/spec/shared_stripe_examples/coupon_examples.rb

@@ -56,7 +56,7 @@ shared_examples 'Coupon API' do
     it "cannot retrieve a stripe coupon that doesn't exist" do
       expect { Stripe::Coupon.retrieve('nope') }.to raise_error {|e|
         expect(e).to be_a Stripe::InvalidRequestError
-        expect(e.param).to eq('id')
+        expect(e.param).to eq('coupon')
         expect(e.http_status).to eq(404)
       }
     end
@@ -71,7 +71,7 @@ shared_examples 'Coupon API' do
 
       expect { Stripe::Coupon.retrieve(coupon.id) }.to raise_error {|e|
         expect(e).to be_a Stripe::InvalidRequestError
-        expect(e.param).to eq('id')
+        expect(e.param).to eq('coupon')
         expect(e.http_status).to eq(404)
       }
     end

data/spec/shared_stripe_examples/customer_examples.rb

@@ -387,4 +387,18 @@ shared_examples 'Customer API' do
     }.not_to raise_error
   end
   
+  it "deletes a stripe customer discount" do
+    original = Stripe::Customer.create(id: 'test_customer_update')
+
+    coupon = Stripe::Coupon.create(id: "10PERCENT", duration: 'once')
+    original.coupon = coupon.id
+    original.save
+
+    expect(original.discount.coupon).to be_a Stripe::Coupon
+    
+    original.delete_discount
+
+    customer = Stripe::Customer.retrieve("test_customer_update")
+    expect(customer.discount).to be nil
+  end
 end

data/spec/shared_stripe_examples/dispute_examples.rb

@@ -79,7 +79,7 @@ shared_examples 'Dispute API' do
       disputes = Stripe::Dispute.all(limit: 3)
 
       expect(disputes.count).to eq(3)
-      expect(disputes.map &:id).to include('dp_05RsQX2eZvKYlo2C0FRTGSSA','dp_15RsQX2eZvKYlo2C0ERTYUIA', 'dp_25RsQX2eZvKYlo2C0ZXCVBNM')
+      expect(disputes.map &:id).to include('dp_95RsQX2eZvKYlo2C0EDFRYUI','dp_85RsQX2eZvKYlo2C0UJMCDET', 'dp_75RsQX2eZvKYlo2C0EDCXSWQ')
     end
 
   end

data/spec/shared_stripe_examples/invoice_examples.rb

@@ -76,18 +76,34 @@ shared_examples 'Invoice API' do
   context "paying an invoice" do
     before do
       @invoice = Stripe::Invoice.create
-      @invoice.pay
     end
 
     it 'updates attempted and paid flags' do
+      @invoice.pay
       expect(@invoice.attempted).to eq(true)
       expect(@invoice.paid).to eq(true)
     end
 
+    it 'creates a new charge object' do
+      expect{ @invoice.pay }.to change { Stripe::Charge.list.data.count }.by 1
+    end
+
     it 'sets the charge attribute' do
+      @invoice.pay
       expect(@invoice.charge).to be_a String
       expect(@invoice.charge.length).to be > 0
     end
+
+    it 'charges the invoice customers default card' do
+      customer = Stripe::Customer.create({
+        source: stripe_helper.generate_card_token
+      })
+      customer_invoice = Stripe::Invoice.create({customer: customer})
+
+      customer_invoice.pay
+
+      expect(Stripe::Charge.list.data.first.customer).to eq customer.id
+    end
   end
 
   context "retrieving upcoming invoice" do

data/spec/shared_stripe_examples/refund_examples.rb

@@ -262,7 +262,7 @@ shared_examples 'Refund API' do
       end
 
       it "stores all charges in memory" do
-        expect(Stripe::Refund.all.data.map(&:id)).to eq([@refund.id, @refund2.id])
+        expect(Stripe::Refund.all.data.map(&:id)).to eq([@refund2.id, @refund.id])
       end
 
       it "defaults count to 10 charges" do

data/spec/shared_stripe_examples/subscription_examples.rb

@@ -35,6 +35,36 @@ shared_examples 'Customer Subscriptions' do
       expect(customer.subscriptions.data.first.metadata.example).to eq( "yes" )
     end
 
+    it 'when customer object provided' do
+      plan = stripe_helper.create_plan(id: 'silver', name: 'Silver Plan', amount: 4999, currency: 'usd')
+      customer = Stripe::Customer.create(source: gen_card_tk)
+
+      expect(customer.subscriptions.data).to be_empty
+      expect(customer.subscriptions.count).to eq(0)
+
+      sub = Stripe::Subscription.create({ plan: 'silver', customer: customer, metadata: { foo: "bar", example: "yes" } })
+
+      expect(sub.object).to eq('subscription')
+      expect(sub.plan.to_hash).to eq(plan.to_hash)
+      expect(sub.metadata.foo).to eq( "bar" )
+      expect(sub.metadata.example).to eq( "yes" )
+
+      customer = Stripe::Customer.retrieve(customer.id)
+      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.currency).to eq( "usd" )
+
+      expect(customer.subscriptions.data.first.id).to eq(sub.id)
+      expect(customer.subscriptions.data.first.plan.to_hash).to eq(plan.to_hash)
+
+      expect(customer.subscriptions.data.first.customer).to eq(customer.id)
+
+      expect(customer.subscriptions.data.first.metadata.foo).to eq( "bar" )
+      expect(customer.subscriptions.data.first.metadata.example).to eq( "yes" )
+    end
+
     it "adds a new subscription to customer (string/symbol agnostic)" do
       customer = Stripe::Customer.create(source: gen_card_tk)
       expect(customer.subscriptions.count).to eq(0)
@@ -185,6 +215,18 @@ shared_examples 'Customer Subscriptions' do
       }
     end
 
+    it 'when attempting to create a new subscription with the params trial', focus: true, live: true do
+      plan = stripe_helper.create_plan(id: 'trial', amount: 999)
+      customer = Stripe::Customer.create(source: gen_card_tk)
+
+      expect{ Stripe::Subscription.create(plan: plan.id, customer: customer.id, trial: 10) }.to raise_error {|e|
+        expect(e).to be_a Stripe::InvalidRequestError
+        expect(e.http_status).to eq(400)
+        expect(e.param).to eq('trial')
+        expect(e.message).to match /Received unknown parameter/
+      }
+    end
+
     it "subscribes a customer with no card to a plan with a free trial" do
       plan = stripe_helper.create_plan(id: 'trial', amount: 999, trial_period_days: 14)
       customer = Stripe::Customer.create(id: 'cardless')

data/spec/shared_stripe_examples/transfer_examples.rb

@@ -78,4 +78,20 @@ shared_examples 'Transfer API' do
       expect(e.http_status).to eq(400)
     }
   end
+
+  it 'when amount is negative', focus: true, live: true do
+    rec = Stripe::Recipient.create({
+                                       type:  'individual',
+                                       name: 'Alex Smith',
+                                   })
+    expect { Stripe::Transfer.create(amount: '-400',
+                                     currency: 'usd',
+                                     recipient: rec.id,
+                                     description: 'Transfer for test@example.com') }.to raise_error { |e|
+      expect(e).to be_a Stripe::InvalidRequestError
+      expect(e.param).to eq('amount')
+      expect(e.message).to match(/^Invalid.*integer/)
+      expect(e.http_status).to eq(400)
+    }
+  end
 end

data/spec/shared_stripe_examples/webhook_event_examples.rb

@@ -183,8 +183,8 @@ shared_examples 'Webhook Events API' do
       events = Stripe::Event.all(limit: 3)
 
       expect(events.count).to eq(3)
-      expect(events.map &:id).to include(customer_created_event.id, plan_created_event.id, coupon_created_event.id)
-      expect(events.map &:type).to include('customer.created', 'plan.created', 'coupon.created')
+      expect(events.map &:id).to include(invoice_item_created_event.id, invoice_created_event.id, coupon_created_event.id)
+      expect(events.map &:type).to include('invoiceitem.created', 'invoice.created', 'coupon.created')
     end
 
   end

data/spec/spec_helper.rb

@@ -46,7 +46,7 @@ RSpec.configure do |c|
       StripeMock.stub(:stop).and_return(nil)
       Stripe.api_key = api_key
     end
-    c.after(:each) { sleep 1 }
+    c.after(:each) { sleep 0.01 }
   else
     c.filter_run_excluding :oauth => true
     Stripe.api_key ||= ''

data/stripe-ruby-mock.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'stripe', '~> 1.31'
+  gem.add_dependency 'stripe', ['>= 1.31.0', '<= 1.58.0']
   gem.add_dependency 'multi_json', '~> 1.0'
   gem.add_dependency 'dante', '>= 0.2.0'
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: stripe-ruby-mock
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Gilbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stripe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.31.0
+    - - <=
       - !ruby/object:Gem::Version
-        version: '1.31'
+        version: 1.58.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.31.0
+    - - <=
       - !ruby/object:Gem::Version
-        version: '1.31'
+        version: 1.58.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +107,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .env
 - .gitignore
 - .rspec
 - .travis.yml
@@ -114,6 +121,7 @@ files:
 - lib/stripe_mock/api/bank_tokens.rb
 - lib/stripe_mock/api/card_tokens.rb
 - lib/stripe_mock/api/client.rb
+- lib/stripe_mock/api/conversion_rate.rb
 - lib/stripe_mock/api/debug.rb
 - lib/stripe_mock/api/errors.rb
 - lib/stripe_mock/api/global_id_prefix.rb