stripe-ruby-mock 3.1.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b5b1b83df91e8e6fd700456710804749b9b1008e572fd8c74eec4f1519e8a49
-  data.tar.gz: bf362cf2fe9aa556e155df2b61076248335e3b2a43f69e0e6fc046406d65da57
+  metadata.gz: 148628f00d214cfaa405f65529b1b8155da9475063166370b0b287084afcd0d4
+  data.tar.gz: ac5f7249f7a83d1fe2ac9f7a1eb4ff007465b404289f1f8bd60d277fe110d4d9
 SHA512:
-  metadata.gz: a397bf1b196f62bb7c8d76f79e2582f6d6594d20ddb9473b8dd5e7680c1844620a29456cddd8be8c5d9b785f4317ea1b092b340f841ccdbef92d849c6bb116e7
-  data.tar.gz: 90f97fe65c4dcd10eaa853aec740bce21c56b8df57bc1a589acc6f13ebf1b65943731b50f820d9f8eaa77954673f78b34bb62b326cbb7c71f5692a0b74a347c0
+  metadata.gz: 8627e73ab695f6a0403d8438abb979a3b4b241d1b04419a2e82844225426dbd19a02eef3ac95a719f644ece575090e46f68b504ab83d5a865e46d1e14f353099
+  data.tar.gz: 9ea4b6e5b061a0d8342f4459fd558df25df4888bf713142e21263e73029411e6f226baa86eb6341de726891cb4245a34ef0c0d744e21b378d6afe0dcae64eda8

data/.github/workflows/rspec_tests.yml

@@ -18,21 +18,18 @@ permissions:
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
-
+        ruby: ['3.1', '3.2', '3.3']
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+    - uses: actions/checkout@v4
+    - name: Install Ruby and gems
+      # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+      # change this to (see https://github.com/ruby/setup-ruby#versioning):
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby-version }}
+        ruby-version: ${{ matrix.ruby }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run tests
       run: bundle exec rspec

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 ### Unreleased
 
+### 4.1.0 (2025-04-24)
+- [#920](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/920) Adds DRB as a dependency in preparation to Ruby 3.4.0 [@lucascppessoa](https://github.com/lucascppessoa)
+- [#927](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/927) Allow :cancel_url nil in create Checkout Session [@shu-illy](https://github.com/shu-illy)
+- [#929](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/929) Actions uses only supported ruby versions [@alexmamonchik](https://github.com/alexmamonchik)
+- [#925](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/925) Fix github actions and add missing product attributes [@bettysteger](https://github.com/bettysteger)
+- [#928](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/928) Add tax ID endpoints and data [@lfittl](https://github.com/lfittl)
+- [#835](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/835) Account: replace deprecated verification hash by requirements [@fabianoarruda](https://github.com/fabianoarruda) 
+- [#903](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/903) Add require option to require additional file [@stevenharman](https://github.com/stevenharman)
+- [#904](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/904) Add has_more to Subscription.items data [@stevenharman](https://github.com/stevenharman)
+- [#843](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/843) Some updates around subscriptions [@donnguyen](https://github.com/donnguyen)
+- [#917](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/917) Removed charges on PI and added latest_charge [@espen](https://github.com/espen)
+- [#916](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/916) Better tests for payout [@espen](https://github.com/espen) 
+- [#862](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/862) Add simple support for us bank accounts [@smtlaissezfaire](https://github.com/smtlaissezfaire)
+- [#907](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/907) Fix calls to use raise instead of throw [@smtlaissezfaire](https://github.com/smtlaissezfaire)
+- [#908](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/908) Add update_payout [@espen](https://github.com/espen)
+
+### 4.0.0 (2024-08-07)
+- [#905](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/905) Allow Stripe SDK v11 by [@stevenharman ](https://github.com/stevenharman)
+- [#830](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/830) Implement search API by [@adamstegman](https://github.com/adamstegman)
+- [#848](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/848) Extending runtime dependency on Stripe gem from version 5 through 11 by [@smakani](https://github.com/smakani)
+- [#893](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/893) Adds support for stripe-ruby v10 by [@fabianoarruda](https://github.com/fabianoarruda)
+
+
+### 3.1.0 (2024-01-03)
 - [#693](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/693) gemspec: add change,issue,source_code URL by [@mtmail](https://github.com/mtmail) 
 - [#700](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/700) update the balance API to respond with instant_available by [@iamnader](https://github.com/iamnader) 
 - [#687](https://github.com/stripe-ruby-mock/stripe-ruby-mock/pull/687) Add PaymentIntent Webhooks by [@klaustopher](https://github.com/klaustopher) 

data/Gemfile

@@ -1,10 +1,5 @@
 source 'https://rubygems.org'
 
-platforms :ruby_19 do
-  gem 'mime-types', '~> 2.6'
-  gem 'rest-client', '~> 1.8'
-end
-
 group :test do
   gem 'rake'
   gem 'dotenv'

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', '~> 3.1.0', :require => 'stripe_mock'
+    gem 'stripe-ruby-mock', :require => 'stripe_mock'
 
 ## !!! Important
 
@@ -29,8 +29,8 @@ version `3.0.0` has [breaking changes](https://github.com/stripe-ruby-mock/strip
 
 ### Requirements
 
-* ruby >= 2.6.0
-* stripe >= 5.0.0
+* ruby >= 2.7.0
+* stripe > 5 & < 11
 
 ### Specifications
 

data/bin/stripe-mock-server

@@ -11,6 +11,7 @@ opts = Trollop::options do
   opt :server, "Server to use", :type => :string, :default => 'thin'
   opt :debug, "Request and response output", :default => true
   opt :pid_path, "Location to put server pid file", :type => :string, :default => './stripe-mock-server.pid'
+  opt :require, "Extra path to require when loading the server; can be specified multiple times", :type => :string, :multi => true
 end
 
 require 'stripe_mock'

data/lib/stripe_mock/api/client.rb

@@ -27,7 +27,7 @@ module StripeMock
 
   private
 
-  def self.redirect_to_mock_server(method, url, api_key: nil, api_base: nil, params: {}, headers: {})
+  def self.redirect_to_mock_server(method, url, api_key: nil, api_base: nil, usage: [], params: {}, headers: {})
     handler = Instance.handler_for_method_url("#{method} #{url}")
 
     if mock_error = client.error_queue.error_for_handler_name(handler[:name])

data/lib/stripe_mock/data.rb

@@ -34,10 +34,15 @@ module StripeMock
 
           ]
         },
-        verification: {
-          fields_needed: [],
-          due_by: nil,
-          contacted: false
+        requirements: {
+          alternatives: [],
+          current_deadline: nil,
+          currently_due: [],
+          disabled_reason: nil,
+          errors: [],
+          eventually_due: [],
+          past_due: [],
+          pending_verification: []
         },
         transfer_schedule: {
           delay_days: 7,
@@ -122,6 +127,25 @@ module StripeMock
       }.merge(params)
     end
 
+    def self.mock_tax_id(params)
+      {
+        id: 'test_cus_default',
+        object: 'tax_id',
+        country: 'DE',
+        created: 1559079603,
+        customer: nil,
+        livemode: false,
+        type: 'eu_vat',
+        value: 'DE123456789',
+        verification: nil,
+        owner: {
+          type: 'self',
+          customer: nil
+        },
+        metadata: {}
+      }.merge(params)
+    end
+
     def self.mock_tax_rate(params)
       {
         id: 'test_cus_default',
@@ -382,7 +406,8 @@ module StripeMock
               currency: StripeMock.default_currency
             },
             quantity: 1
-          }]
+          }],
+          has_more: false
         },
         cancel_at_period_end: false,
         canceled_at: nil,
@@ -401,7 +426,12 @@ module StripeMock
         default_payment_method: nil,
         pending_invoice_item_interval: nil,
         next_pending_invoice_item_invoice: nil,
-        latest_invoice: nil
+        pending_setup_intent: nil,
+        latest_invoice: nil,
+        application_fee_percent: nil,
+        cancel_at: nil,
+        end_at: nil,
+        pause_collection: nil
       }, params)
     end
 
@@ -642,15 +672,18 @@ module StripeMock
         attributes:[],
         caption: nil,
         created: 1466698000,
+        default_price: nil,
         deactivate_on: [],
         description: nil,
         images: [],
+        marketing_features: [],
         livemode: false,
         metadata: {},
         name: "The Mock Product",
         package_dimensions: nil,
         shippable: nil,
         statement_descriptor: nil,
+        tax_code: nil,
         type: "service",
         unit_label: "my_unit",
         updated: 1537939442,
@@ -1221,7 +1254,8 @@ module StripeMock
           statement_descriptor: nil,
           trial_period_days: nil
         },
-        quantity: 2
+        quantity: 2,
+        price: mock_price
       }.merge(params)
     end
 
@@ -1336,7 +1370,17 @@ module StripeMock
           country: 'DE',
           fingerprint: 'FD81kbVPe7M05BMj',
           last4: params.dig(:sepa_debit, :iban)&.[](-4..) || '3000'
-        }
+        },
+        us_bank_account: {
+          account_holder_type: "individual",
+          account_type: "checking",
+          bank_name: "STRIPE TEST BANK",
+          financial_connections_account: "fca_0614042384b19afec4474940",
+          fingerprint: "7bc48d016359a45a",
+          last4: "6789",
+          networks: {"preferred"=>"ach", "supported"=>["ach"]},
+          routing_number: "110000000"
+        },
       }
 
       {
@@ -1396,7 +1440,7 @@ module StripeMock
         id: cs_id,
         object: 'checkout.session',
         billing_address_collection: nil,
-        cancel_url: 'https://example.com/cancel',
+        cancel_url: nil,
         client_reference_id: nil,
         customer: nil,
         customer_email: nil,

data/lib/stripe_mock/instance.rb

@@ -52,6 +52,7 @@ module StripeMock
     include StripeMock::RequestHandlers::CountrySpec
     include StripeMock::RequestHandlers::Payouts
     include StripeMock::RequestHandlers::EphemeralKey
+    include StripeMock::RequestHandlers::TaxIds
     include StripeMock::RequestHandlers::TaxRates
     include StripeMock::RequestHandlers::Checkout
     include StripeMock::RequestHandlers::Checkout::Session
@@ -59,7 +60,7 @@ module StripeMock
     attr_reader :accounts, :balance, :balance_transactions, :bank_tokens, :charges, :coupons, :customers,
                 :disputes, :events, :invoices, :invoice_items, :orders, :payment_intents, :payment_methods,
                 :setup_intents, :plans, :prices, :promotion_codes, :recipients, :refunds, :transfers, :payouts,
-                :subscriptions, :country_spec, :subscriptions_items, :products, :tax_rates, :checkout_sessions,
+                :subscriptions, :country_spec, :subscriptions_items, :products, :tax_ids, :tax_rates, :checkout_sessions,
                 :checkout_session_line_items
 
     attr_accessor :error_queue, :debug, :conversion_rate, :account_balance
@@ -93,6 +94,7 @@ module StripeMock
       @subscriptions = {}
       @subscriptions_items = {}
       @country_spec = {}
+      @tax_ids = {}
       @tax_rates = {}
       @checkout_sessions = {}
       @checkout_session_line_items = {}
@@ -109,7 +111,7 @@ module StripeMock
       @base_strategy = TestStrategies::Base.new
     end
 
-    def mock_request(method, url, api_key: nil, api_base: nil, params: {}, headers: {})
+    def mock_request(method, url, api_key: nil, api_base: nil, usage: [], params: {}, headers: {})
       return {} if method == :xtest
 
       api_key ||= (Stripe.api_key || DUMMY_API_KEY)

data/lib/stripe_mock/request_handlers/charges.rb

@@ -5,7 +5,8 @@ module StripeMock
       def Charges.included(klass)
         klass.add_handler 'post /v1/charges',               :new_charge
         klass.add_handler 'get /v1/charges',                :get_charges
-        klass.add_handler 'get /v1/charges/(.*)',           :get_charge
+        klass.add_handler 'get /v1/charges/search',         :search_charges
+        klass.add_handler 'get /v1/charges/((?!search).*)', :get_charge
         klass.add_handler 'post /v1/charges/(.*)/capture',  :capture_charge
         klass.add_handler 'post /v1/charges/(.*)/refund',   :refund_charge
         klass.add_handler 'post /v1/charges/(.*)/refunds',  :refund_charge
@@ -90,6 +91,24 @@ module StripeMock
         Data.mock_list_object(clone.values, params)
       end
 
+      SEARCH_FIELDS = [
+        "amount",
+        "currency",
+        "customer",
+        "payment_method_details.card.brand",
+        "payment_method_details.card.exp_month",
+        "payment_method_details.card.exp_year",
+        "payment_method_details.card.fingerprint",
+        "payment_method_details.card.last4",
+        "status",
+      ].freeze
+      def search_charges(route, method_url, params, headers)
+        require_param(:query) unless params[:query]
+
+        results = search_results(charges.values, params[:query], fields: SEARCH_FIELDS, resource_name: "charges")
+        Data.mock_list_object(results, params)
+      end
+
       def get_charge(route, method_url, params, headers)
         route =~ method_url
         charge_id = $1 || params[:charge]

data/lib/stripe_mock/request_handlers/checkout_session.rb

@@ -12,16 +12,17 @@ module StripeMock
         def new_session(route, method_url, params, headers)
           id = params[:id] || new_id('cs')
 
-          [:cancel_url, :success_url].each do |p|
-            require_param(p) if params[p].nil? || params[p].empty?
-          end
+          require_param(:success_url) if params[:success_url].nil? || params[:success_url].empty?
 
           line_items = nil
           if params[:line_items]
             line_items = params[:line_items].each_with_index.map do |line_item, i|
-              throw Stripe::InvalidRequestError("Quantity is required. Add `quantity` to `line_items[#{i}]`") unless line_item[:quantity]
+              unless line_item[:quantity]
+                raise Stripe::InvalidRequestError.new("Quantity is required. Add `quantity` to `line_items[#{i}]`", :line_items)
+              end
+
               unless line_item[:price] || line_item[:price_data] || (line_item[:amount] && line_item[:currency] && line_item[:name])
-                throw Stripe::InvalidRequestError("Price or amount and currency is required. Add `price`, `price_data`, or `amount`, `currency` and `name` to `line_items[#{i}]`")
+                raise Stripe::InvalidRequestError.new("Price or amount and currency is required. Add `price`, `price_data`, or `amount`, `currency` and `name` to `line_items[#{i}]`", :line_items)
               end
               {
                 id: new_id("li"),
@@ -48,11 +49,11 @@ module StripeMock
           if line_items
             amount = 0
 
-            line_items.each do |line_item| 
+            line_items.each do |line_item|
               price = prices[line_item[:price]]
 
               if price.nil?
-                raise StripeMock::StripeMockError.new("Price not found for ID: #{line_item[:price]}")
+                raise StripeMock::StripeMockError.new("Price not found for ID: #{line_item[:price]}", :line_items)
               end
 
               amount += (price[:unit_amount] * line_item[:quantity])
@@ -78,7 +79,7 @@ module StripeMock
             checkout_session_line_items[id] = line_items
           when "setup"
             if !params[:line_items].nil? && !params[:line_items].empty?
-              throw Stripe::InvalidRequestError.new("You cannot pass `line_items` in `setup` mode", :line_items, http_status: 400)
+              raise Stripe::InvalidRequestError.new("You cannot pass `line_items` in `setup` mode", :line_items, http_status: 400)
             end
             setup_intent = new_setup_intent(nil, nil, {
               customer: params[:customer],
@@ -91,7 +92,7 @@ module StripeMock
             require_param(:line_items) if params[:line_items].nil? || params[:line_items].empty?
             checkout_session_line_items[id] = line_items
           else
-            throw Stripe::InvalidRequestError.new("Invalid mode: must be one of payment, setup, or subscription", :mode, http_status: 400)
+            raise Stripe::InvalidRequestError.new("Invalid mode: must be one of payment, setup, or subscription", :mode, http_status: 400)
           end
 
           checkout_sessions[id] = {
@@ -156,7 +157,7 @@ module StripeMock
               price = prices[line_item[:price]].clone
 
               if price.nil?
-                raise StripeMock::StripeMockError.new("Price not found for ID: #{line_item[:price]}")
+                raise StripeMock::StripeMockError.new("Price not found for ID: #{line_item[:price]}", :line_items)
               end
 
               {
@@ -170,7 +171,7 @@ module StripeMock
               }
             end
           else
-            throw Stripe::InvalidRequestError("Only payment and subscription sessions have line items")
+            raise Stripe::InvalidRequestError.new("Only payment and subscription sessions have line items", :line_items)
           end
         end
       end

data/lib/stripe_mock/request_handlers/customers.rb

@@ -5,9 +5,10 @@ module StripeMock
       def Customers.included(klass)
         klass.add_handler 'post /v1/customers',                     :new_customer
         klass.add_handler 'post /v1/customers/([^/]*)',             :update_customer
-        klass.add_handler 'get /v1/customers/([^/]*)',              :get_customer
+        klass.add_handler 'get /v1/customers/((?!search)[^/]*)',    :get_customer
         klass.add_handler 'delete /v1/customers/([^/]*)',           :delete_customer
         klass.add_handler 'get /v1/customers',                      :list_customers
+        klass.add_handler 'get /v1/customers/search',               :search_customers
         klass.add_handler 'delete /v1/customers/([^/]*)/discount',  :delete_customer_discount
       end
 
@@ -140,6 +141,16 @@ module StripeMock
         Data.mock_list_object(customers[stripe_account]&.values, params)
       end
 
+      SEARCH_FIELDS = ["email", "name", "phone"].freeze
+      def search_customers(route, method_url, params, headers)
+        require_param(:query) unless params[:query]
+
+        stripe_account = headers && headers[:stripe_account] || Stripe.api_key
+        all_customers = customers[stripe_account]&.values
+        results = search_results(all_customers, params[:query], fields: SEARCH_FIELDS, resource_name: "customers")
+        Data.mock_list_object(results, params)
+      end
+
       def delete_customer_discount(route, method_url, params, headers)
         stripe_account = headers && headers[:stripe_account] || Stripe.api_key
         route =~ method_url

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

@@ -0,0 +1,67 @@
+module StripeMock
+  module RequestHandlers
+    module Helpers
+      # Only supports exact matches on a single field, e.g.
+      # - 'amount:100'
+      # - 'email:"name@domain.com"'
+      # - 'name:"Foo Bar"'
+      # - 'metadata["foo"]:"bar"'
+      QUERYSTRING_PATTERN = /\A(?<field>[\w\.]+)(\[['"](?<metadata_key>[^'"]*)['"]\])?:['"]?(?<value>[^'"]*)['"]?\z/
+      def search_results(all_values, querystring, fields: [], resource_name:)
+        values = all_values.dup
+        query_match = QUERYSTRING_PATTERN.match(querystring)
+        raise Stripe::InvalidRequestError.new(
+          'We were unable to parse your search query.' \
+            ' Try using the format `metadata["key"]:"value"` to query for metadata or key:"value" to query for other fields.',
+          nil,
+          http_status: 400,
+        ) unless query_match
+
+        case query_match[:field]
+        when *fields
+          values = values.select { |resource|
+            exact_match?(actual: field_value(resource, field: query_match[:field]), expected: query_match[:value])
+          }
+        when "metadata"
+          values = values.select { |resource|
+            resource[:metadata] &&
+              exact_match?(actual: resource[:metadata][query_match[:metadata_key].to_sym], expected: query_match[:value])
+          }
+        else
+          raise Stripe::InvalidRequestError.new(
+            "Field `#{query_match[:field]}` is an unsupported search field for resource `#{resource_name}`." \
+              " See http://stripe.com/docs/search#query-fields-for-#{resource_name.gsub('_', '-')} for a list of supported fields.",
+            nil,
+            http_status: 400,
+          )
+        end
+
+        values
+      end
+
+      def exact_match?(actual:, expected:)
+        # allow comparisons of integers
+        if actual.respond_to?(:to_i) && actual.to_i == actual
+          expected = expected.to_i
+        end
+        # allow comparisons of boolean
+        case expected
+        when "true"
+          expected = true
+        when "false"
+          expected = false
+        end
+
+        actual == expected
+      end
+
+      def field_value(resource, field:)
+        value = resource
+        field.split('.').each do |segment|
+          value = value[segment.to_sym]
+        end
+        value
+      end
+    end
+  end
+end

data/lib/stripe_mock/request_handlers/invoices.rb

@@ -6,7 +6,8 @@ module StripeMock
         klass.add_handler 'post /v1/invoices',               :new_invoice
         klass.add_handler 'get /v1/invoices/upcoming',       :upcoming_invoice
         klass.add_handler 'get /v1/invoices/(.*)/lines',     :get_invoice_line_items
-        klass.add_handler 'get /v1/invoices/(.*)',           :get_invoice
+        klass.add_handler 'get /v1/invoices/((?!search).*)', :get_invoice
+        klass.add_handler 'get /v1/invoices/search',         :search_invoices
         klass.add_handler 'get /v1/invoices',                :list_invoices
         klass.add_handler 'post /v1/invoices/(.*)/pay',      :pay_invoice
         klass.add_handler 'post /v1/invoices/(.*)',          :update_invoice
@@ -25,6 +26,14 @@ module StripeMock
         invoices[$1].merge!(params)
       end
 
+      SEARCH_FIELDS = ["currency", "customer", "number", "receipt_number", "subscription", "total"].freeze
+      def search_invoices(route, method_url, params, headers)
+        require_param(:query) unless params[:query]
+
+        results = search_results(invoices.values, params[:query], fields: SEARCH_FIELDS, resource_name: "invoices")
+        Data.mock_list_object(results, params)
+      end
+
       def list_invoices(route, method_url, params, headers)
         params[:offset] ||= 0
         params[:limit] ||= 10
@@ -68,6 +77,9 @@ module StripeMock
         raise Stripe::InvalidRequestError.new('When previewing changes to a subscription, you must specify either `subscription` or `subscription_items`', nil, http_status: 400) if !params[:subscription_proration_date].nil? && params[:subscription].nil? && params[:subscription_plan].nil?
         raise Stripe::InvalidRequestError.new('Cannot specify proration date without specifying a subscription', nil, http_status: 400) if !params[:subscription_proration_date].nil? && params[:subscription].nil?
 
+        if params[:subscription] && params[:customer].nil?
+          params[:customer] = subscriptions[params[:subscription]][:customer]
+        end
         customer = customers[stripe_account][params[:customer]]
         assert_existence :customer, params[:customer], customer
 
@@ -105,8 +117,9 @@ module StripeMock
         invoice_lines = []
 
         if prorating
+          plan_amount = subscription[:plan][:amount] || subscription[:plan][:unit_amount]
           unused_amount = (
-            subscription[:plan][:amount].to_f *
+            plan_amount.to_f *
               subscription[:quantity] *
               (subscription[:current_period_end] - subscription_proration_date.to_i) / (subscription[:current_period_end] - subscription[:current_period_start])
             ).ceil
@@ -160,11 +173,13 @@ module StripeMock
       private
 
       def get_mock_subscription_line_item(subscription)
+        plan_amount = subscription[:plan][:amount] || subscription[:plan][:unit_amount]
+
         Data.mock_line_item(
           id: subscription[:id],
           type: "subscription",
           plan: subscription[:plan],
-          amount: subscription[:status] == 'trialing' ? 0 : subscription[:plan][:amount] * subscription[:quantity],
+          amount: subscription[:status] == 'trialing' ? 0 : plan_amount * subscription[:quantity],
           discountable: true,
           quantity: subscription[:quantity],
           period: {

data/lib/stripe_mock/request_handlers/payment_intents.rb

@@ -6,7 +6,8 @@ module StripeMock
       def PaymentIntents.included(klass)
         klass.add_handler 'post /v1/payment_intents',               :new_payment_intent
         klass.add_handler 'get /v1/payment_intents',                :get_payment_intents
-        klass.add_handler 'get /v1/payment_intents/(.*)',           :get_payment_intent
+        klass.add_handler 'get /v1/payment_intents/((?!search).*)', :get_payment_intent
+        klass.add_handler 'get /v1/payment_intents/search',         :search_payment_intents
         klass.add_handler 'post /v1/payment_intents/(.*)/confirm',  :confirm_payment_intent
         klass.add_handler 'post /v1/payment_intents/(.*)/capture',  :capture_payment_intent
         klass.add_handler 'post /v1/payment_intents/(.*)/cancel',   :cancel_payment_intent
@@ -70,6 +71,14 @@ module StripeMock
         payment_intent
       end
 
+      SEARCH_FIELDS = ["amount", "currency", "customer", "status"].freeze
+      def search_payment_intents(route, method_url, params, headers)
+        require_param(:query) unless params[:query]
+
+        results = search_results(payment_intents.values, params[:query], fields: SEARCH_FIELDS, resource_name: "payment_intents")
+        Data.mock_list_object(results, params)
+      end
+
       def capture_payment_intent(route, method_url, params, headers)
         route =~ method_url
         payment_intent = assert_existence :payment_intent, $1, payment_intents[$1]
@@ -184,7 +193,7 @@ module StripeMock
           payment_method: payment_intent[:payment_method]
         )
 
-        payment_intent[:charges][:data] << charges[charge_id].clone
+        payment_intent[:latest_charge] = charge_id
 
         payment_intent
       end

data/lib/stripe_mock/request_handlers/payment_methods.rb

@@ -116,8 +116,12 @@ module StripeMock
         end
       end
 
+      def valid_types
+        %w(card ideal sepa_debit us_bank_account)
+      end
+
       def invalid_type?(type)
-        !%w(card ideal sepa_debit).include?(type)
+        !valid_types.include?(type)
       end
     end
   end

data/lib/stripe_mock/request_handlers/payouts.rb

@@ -4,18 +4,25 @@ module StripeMock
 
       def Payouts.included(klass)
         klass.add_handler 'post /v1/payouts',            :new_payout
+        klass.add_handler 'post /v1/payouts/(.*)',       :update_payout
         klass.add_handler 'get /v1/payouts',             :list_payouts
         klass.add_handler 'get /v1/payouts/(.*)',        :get_payout
       end
 
       def new_payout(route, method_url, params, headers)
-        id = new_id('po')
+        params[:id] ||= new_id("po")
 
-        unless params[:amount].is_a?(Integer) || (params[:amount].is_a?(String) && /^\d+$/.match(params[:amount]))
+        unless (params[:amount].is_a?(Integer) && params[:amount].positive?) || (params[:amount].is_a?(String) && /^\d+$/.match(params[:amount]))
           raise Stripe::InvalidRequestError.new("Invalid integer: #{params[:amount]}", 'amount', http_status: 400)
         end
 
-        payouts[id] = Data.mock_payout(params.merge :id => id)
+        payouts[params[:id]] = Data.mock_payout(params.merge :id => params[:id])
+      end
+
+      def update_payout(route, method_url, params, headers)
+        route =~ method_url
+        assert_existence :payout, $1, payouts[$1]
+        payouts[$1].merge!(params)
       end
 
       def list_payouts(route, method_url, params, headers)