stripe-ruby-mock 3.1.0 → 4.1.0

data/lib/stripe_mock/request_handlers/prices.rb

@@ -3,10 +3,11 @@ module StripeMock
     module Prices
 
       def Prices.included(klass)
-        klass.add_handler 'post /v1/prices',        :new_price
-        klass.add_handler 'post /v1/prices/(.*)',   :update_price
-        klass.add_handler 'get /v1/prices/(.*)',    :get_price
-        klass.add_handler 'get /v1/prices',         :list_prices
+        klass.add_handler 'post /v1/prices',               :new_price
+        klass.add_handler 'post /v1/prices/(.*)',          :update_price
+        klass.add_handler 'get /v1/prices/((?!search).*)', :get_price
+        klass.add_handler 'get /v1/prices/search',         :search_prices
+        klass.add_handler 'get /v1/prices',                :list_prices
       end
 
       def new_price(route, method_url, params, headers)
@@ -57,6 +58,14 @@ module StripeMock
 
         Data.mock_list_object(price_data.first(limit), params.merge!(limit: limit))
       end
+
+      SEARCH_FIELDS = ["active", "currency", "lookup_key", "product", "type"].freeze
+      def search_prices(route, method_url, params, headers)
+        require_param(:query) unless params[:query]
+
+        results = search_results(prices.values, params[:query], fields: SEARCH_FIELDS, resource_name: "prices")
+        Data.mock_list_object(results, params)
+      end
     end
   end
 end

data/lib/stripe_mock/request_handlers/products.rb

@@ -2,11 +2,12 @@ module StripeMock
   module RequestHandlers
     module Products
       def self.included(base)
-        base.add_handler 'post /v1/products',        :create_product
-        base.add_handler 'get /v1/products/(.*)',    :retrieve_product
-        base.add_handler 'post /v1/products/(.*)',   :update_product
-        base.add_handler 'get /v1/products',         :list_products
-        base.add_handler 'delete /v1/products/(.*)', :destroy_product
+        base.add_handler 'post /v1/products',               :create_product
+        base.add_handler 'get /v1/products/((?!search).*)', :retrieve_product
+        base.add_handler 'get /v1/products/search',         :search_products
+        base.add_handler 'post /v1/products/(.*)',          :update_product
+        base.add_handler 'get /v1/products',                :list_products
+        base.add_handler 'delete /v1/products/(.*)',        :destroy_product
       end
 
       def create_product(_route, _method_url, params, _headers)
@@ -32,6 +33,14 @@ module StripeMock
         Data.mock_list_object(products.values.take(limit), params)
       end
 
+      SEARCH_FIELDS = ["active", "description", "name", "shippable", "url"].freeze
+      def search_products(route, method_url, params, headers)
+        require_param(:query) unless params[:query]
+
+        results = search_results(products.values, params[:query], fields: SEARCH_FIELDS, resource_name: "products")
+        Data.mock_list_object(results, params)
+      end
+
       def destroy_product(route, method_url, _params, _headers)
         id = method_url.match(route).captures.first
         assert_existence :product, id, products[id]

data/lib/stripe_mock/request_handlers/subscriptions.rb

@@ -5,8 +5,9 @@ module StripeMock
       def Subscriptions.included(klass)
         klass.add_handler 'get /v1/subscriptions', :retrieve_subscriptions
         klass.add_handler 'post /v1/subscriptions', :create_subscription
-        klass.add_handler 'get /v1/subscriptions/(.*)', :retrieve_subscription
+        klass.add_handler 'get /v1/subscriptions/((?!search).*)', :retrieve_subscription
         klass.add_handler 'post /v1/subscriptions/(.*)', :update_subscription
+        klass.add_handler 'get /v1/subscriptions/search', :search_subscriptions
         klass.add_handler 'delete /v1/subscriptions/(.*)', :cancel_subscription
 
         klass.add_handler 'post /v1/customers/(.*)/subscription(?:s)?', :create_customer_subscription
@@ -166,7 +167,7 @@ module StripeMock
         end
 
         if params[:transfer_data] && !params[:transfer_data].empty?
-          throw Stripe::InvalidRequestError.new(missing_param_message("transfer_data[destination]")) unless params[:transfer_data][:destination]
+          raise Stripe::InvalidRequestError.new(missing_param_message("transfer_data[destination]")) unless params[:transfer_data][:destination]
           subscription[:transfer_data] = params[:transfer_data].dup
           subscription[:transfer_data][:amount_percent] ||= 100
         end
@@ -343,6 +344,14 @@ module StripeMock
         subscription
       end
 
+      SEARCH_FIELDS = ["status"].freeze
+      def search_subscriptions(route, method_url, params, headers)
+        require_param(:query) unless params[:query]
+
+        results = search_results(subscriptions.values, params[:query], fields: SEARCH_FIELDS, resource_name: "subscriptions")
+        Data.mock_list_object(results, params)
+      end
+
       private
 
       def get_subscription_plans_from_params(params)

data/lib/stripe_mock/request_handlers/tax_ids.rb

@@ -0,0 +1,66 @@
+module StripeMock
+  module RequestHandlers
+    module TaxIds
+      def TaxIds.included(klass)
+        klass.add_handler 'post /v1/tax_ids', :new_tax_id
+        klass.add_handler 'post /v1/customers/(.*)/tax_ids', :new_customer_tax_id
+        klass.add_handler 'get /v1/tax_ids/([^/]*)', :get_tax_id
+        klass.add_handler 'get /v1/customers/(.*)/tax_ids/([^/]*)', :get_customer_tax_id
+        klass.add_handler 'get /v1/tax_ids', :list_tax_ids
+        klass.add_handler 'get /v1/customers/(.*)/tax_ids', :list_customer_tax_ids
+        klass.add_handler 'delete /v1/tax_ids/([^/]*)', :delete_tax_id
+        klass.add_handler 'delete /v1/customers/(.*)/tax_ids/([^/]*)', :delete_customer_tax_id
+      end
+
+      def new_tax_id(route, method_url, params, headers)
+        params[:id] ||= new_id('txi')
+        tax_ids[ params[:id] ] = Data.mock_tax_id(params)
+        tax_ids[ params[:id] ]
+      end
+      def new_customer_tax_id(route, method_url, params, headers)
+        new_tax_id(route, method_url, params.merge(customer: $1))
+      end
+
+      def get_tax_id(route, method_url, params, headers)
+        route =~ method_url
+        tax_id = assert_existence :tax_id, $1, tax_ids[$1]
+        tax_id.clone
+      end
+      def get_customer_tax_id(route, method_url, params, headers)
+        route =~ method_url
+        tax_id = tax_ids[$2]
+        tax_id = nil if tax_id[:customer] != $1
+        tax_id = assert_existence :tax_id, $2, tax_id
+        tax_id.clone
+      end
+
+      def list_tax_ids(route, method_url, params, headers)
+        Data.mock_list_object(tax_ids.values, params)
+      end
+      def list_customer_tax_ids(route, method_url, params, headers)
+        Data.mock_list_object(tax_ids.values.select { |t| t[:customer] == $1 }, params)
+      end
+
+      def delete_tax_id(route, method_url, params, headers)
+        route =~ method_url
+        assert_existence :tax_id, $1, tax_ids[$1]
+
+        tax_ids[$1] = {
+          id: tax_ids[$1][:id],
+          deleted: true
+        }
+      end
+      def delete_customer_tax_id(route, method_url, params, headers)
+        route =~ method_url
+        tax_id = tax_ids[$2]
+        tax_id = nil if tax_id[:customer] != $1
+        tax_id = assert_existence :tax_id, $2, tax_id
+
+        tax_ids[$2] = {
+          id: tax_ids[$2][:id],
+          deleted: true
+        }
+      end
+    end
+  end
+end

data/lib/stripe_mock/server.rb

@@ -3,10 +3,16 @@ require 'drb/drb'
 module StripeMock
   class Server
     def self.start_new(opts)
-      puts "Starting StripeMock server on port #{opts[:port] || 4999}"
+      host = opts.fetch(:host, "0.0.0.0")
+      port = opts.fetch(:port, 4999)
+      extra_requires = opts.fetch(:require, [])
 
-      host = opts.fetch :host,'0.0.0.0'
-      port = opts.fetch :port, 4999
+      extra_requires.each do |path|
+        puts "Requiring additional path: #{path}"
+        require(path)
+      end
+
+      puts "Starting StripeMock server on port #{port}"
 
       DRb.start_service "druby://#{host}:#{port}", Server.new
       DRb.thread.join
@@ -88,6 +94,5 @@ module StripeMock
     def upsert_stripe_object(object, attributes)
       @instance.upsert_stripe_object(object, attributes)
     end
-
   end
 end

data/lib/stripe_mock/test_strategies/base.rb

@@ -121,7 +121,6 @@ module StripeMock
             amount: 500,
             currency: 'usd',
           }],
-          cancel_url: "https://example.com/cancel",
           success_url: "https://example.com/success",
         }.merge(params)
       end

data/lib/stripe_mock/version.rb

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

data/lib/stripe_mock.rb

@@ -42,6 +42,7 @@ require 'stripe_mock/request_handlers/helpers/external_account_helpers.rb'
 require 'stripe_mock/request_handlers/helpers/card_helpers.rb'
 require 'stripe_mock/request_handlers/helpers/charge_helpers.rb'
 require 'stripe_mock/request_handlers/helpers/coupon_helpers.rb'
+require 'stripe_mock/request_handlers/helpers/search_helpers.rb'
 require 'stripe_mock/request_handlers/helpers/subscription_helpers.rb'
 require 'stripe_mock/request_handlers/helpers/token_helpers.rb'
 
@@ -79,6 +80,7 @@ require 'stripe_mock/request_handlers/tokens.rb'
 require 'stripe_mock/request_handlers/country_spec.rb'
 require 'stripe_mock/request_handlers/ephemeral_key.rb'
 require 'stripe_mock/request_handlers/products.rb'
+require 'stripe_mock/request_handlers/tax_ids.rb'
 require 'stripe_mock/request_handlers/tax_rates.rb'
 require 'stripe_mock/request_handlers/checkout_session.rb'
 require 'stripe_mock/instance'

data/spec/shared_stripe_examples/bank_token_examples.rb

@@ -28,20 +28,19 @@ shared_examples 'Bank Account Token Mocking' do
     expect(bank_token).to match /^test_btok/
   end
 
-  it "assigns the generated bank account to a new recipient" do
+  it "assigns the generated bank account to a new customer" do
     bank_token = StripeMock.generate_bank_token(
       :bank_name => "Bank Token Mocking",
       :last4 => "7777"
     )
 
-    recipient = Stripe::Recipient.create({
+    customer = Stripe::Customer.create({
       name: "Fred Flinstone",
-      type: "individual",
       email: 'blah@domain.co',
-      bank_account: bank_token
+      source: bank_token
     })
-    expect(recipient.active_account.last4).to eq("7777")
-    expect(recipient.active_account.bank_name).to eq("Bank Token Mocking")
+    expect(customer.sources.first.last4).to eq("7777")
+    expect(customer.sources.first.bank_name).to eq("Bank Token Mocking")
   end
 
   it "retrieves a created token" do
@@ -55,5 +54,4 @@ shared_examples 'Bank Account Token Mocking' do
     expect(token.bank_account.last4).to eq("3939")
     expect(token.bank_account.bank_name).to eq("Cha-ching Banking")
   end
-
 end

data/spec/shared_stripe_examples/charge_examples.rb

@@ -494,4 +494,101 @@ shared_examples 'Charge API' do
     end
   end
 
+  context "search" do
+    # the Search API requires about a minute between writes and reads, so add sleeps accordingly when running live
+    it "searches charges for exact matches", :aggregate_failures do
+      response = Stripe::Charge.search({query: 'amount:100'}, stripe_version: '2020-08-27')
+      expect(response.data.size).to eq(0)
+
+      customer = Stripe::Customer.create(email: 'johnny@appleseed.com')
+      one = Stripe::Charge.create(
+        customer: customer.id,
+        amount: 100,
+        currency: "usd",
+        payment_method_details: {
+          card: StripeMock::Data.mock_charge[:payment_method_details][:card].merge(
+            brand: "mastercard",
+            exp_month: 1,
+            exp_year: 2111,
+            fingerprint: "un",
+            last4: "1111",
+          ),
+        },
+        status: "succeeded",
+        metadata: {key: 'uno'},
+      )
+      two = Stripe::Charge.create(
+        customer: customer.id,
+        amount: 200,
+        currency: "gbp",
+        payment_method_details: {
+          card: StripeMock::Data.mock_charge[:payment_method_details][:card].merge(
+            brand: "visa",
+            exp_month: 2,
+            exp_year: 2222,
+            fingerprint: "deux",
+            last4: "2222",
+          ),
+        },
+        status: "pending",
+        metadata: {key: 'dos'},
+      )
+
+      response = Stripe::Charge.search({query: 'amount:100'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id])
+
+      response = Stripe::Charge.search({query: 'currency:"gbp"'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([two.id])
+
+      response = Stripe::Charge.search({query: %(customer:"#{customer.id}")}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id, two.id])
+
+      response = Stripe::Charge.search({query: 'payment_method_details.card.brand:mastercard'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id])
+
+      response = Stripe::Charge.search({query: 'payment_method_details.card.exp_month:2'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([two.id])
+
+      response = Stripe::Charge.search({query: 'payment_method_details.card.exp_year:2111'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id])
+
+      response = Stripe::Charge.search({query: 'payment_method_details.card.fingerprint:un'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id])
+
+      response = Stripe::Charge.search({query: 'payment_method_details.card.last4:2222'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([two.id])
+
+      response = Stripe::Charge.search({query: 'status:"succeeded"'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id])
+
+      response = Stripe::Charge.search({query: 'metadata["key"]:"uno"'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id])
+    end
+
+    it "respects limit", :aggregate_failures do
+      customer = Stripe::Customer.create(email: 'johnny@appleseed.com')
+      11.times do
+        Stripe::Charge.create(customer: customer.id, amount: 100, currency: "usd")
+      end
+
+      response = Stripe::Charge.search({query: %(customer:"#{customer.id}")}, stripe_version: '2020-08-27')
+      expect(response.data.size).to eq(10)
+      response = Stripe::Charge.search({query: %(customer:"#{customer.id}"), limit: 1}, stripe_version: '2020-08-27')
+      expect(response.data.size).to eq(1)
+    end
+
+    it "reports search errors", :aggregate_failures do
+      expect {
+        Stripe::Charge.search({limit: 1}, stripe_version: '2020-08-27')
+      }.to raise_error(Stripe::InvalidRequestError, /Missing required param: query./)
+
+      expect {
+        Stripe::Charge.search({query: 'asdf'}, stripe_version: '2020-08-27')
+      }.to raise_error(Stripe::InvalidRequestError, /We were unable to parse your search query./)
+
+      expect {
+        Stripe::Charge.search({query: 'foo:"bar"'}, stripe_version: '2020-08-27')
+      }.to raise_error(Stripe::InvalidRequestError, /Field `foo` is an unsupported search field for resource `charges`./)
+    end
+  end
 end

data/spec/shared_stripe_examples/checkout_session_examples.rb

@@ -11,7 +11,6 @@ shared_examples "Checkout Session API" do
     session = Stripe::Checkout::Session.create(
       payment_method_types: ["card"],
       line_items: line_items,
-      cancel_url: "https://example.com/cancel",
       success_url: "https://example.com/success"
     )
 
@@ -28,7 +27,6 @@ shared_examples "Checkout Session API" do
         session = Stripe::Checkout::Session.create(
           customer: "customer_id",
           success_url: "localhost/nada",
-          cancel_url: "localhost/nada",
           payment_method_types: ["card"],
         )
       end.to raise_error(Stripe::InvalidRequestError, /line_items/i)
@@ -40,7 +38,6 @@ shared_examples "Checkout Session API" do
     session = Stripe::Checkout::Session.create(
       mode: "setup",
       payment_method_types: ["card"],
-      cancel_url: "https://example.com/cancel",
       success_url: "https://example.com/success"
     )
 
@@ -55,7 +52,6 @@ shared_examples "Checkout Session API" do
         session = Stripe::Checkout::Session.create(
           customer: "customer_id",
           success_url: "localhost/nada",
-          cancel_url: "localhost/nada",
           payment_method_types: ["card"],
           mode: "subscription",
         )
@@ -86,7 +82,6 @@ shared_examples "Checkout Session API" do
     it "can expand setup_intent" do
       initial_session = Stripe::Checkout::Session.create(
         mode: "setup",
-        cancel_url: "https://example.com",
         success_url: "https://example.com",
         payment_method_types: ["card"]
       )

data/spec/shared_stripe_examples/customer_examples.rb

@@ -349,6 +349,62 @@ shared_examples 'Customer API' do
     expect(all.data.map &:email).to include('one@one.com', 'two@two.com')
   end
 
+  context "search" do
+    # the Search API requires about a minute between writes and reads, so add sleeps accordingly when running live
+    it "searches customers for exact matches", :aggregate_failures do
+      response = Stripe::Customer.search({query: 'email:"one@one.com"'}, stripe_version: '2020-08-27')
+      expect(response.data.size).to eq(0)
+
+      one = Stripe::Customer.create(email: 'one@one.com', name: 'one', phone: '1111111111', metadata: {key: 'uno'})
+      two = Stripe::Customer.create(email: 'two@two.com', name: 'two', phone: '2222222222', metadata: {key: 'dos'})
+
+      response = Stripe::Customer.search({query: 'email:"one@one.com"'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id])
+
+      response = Stripe::Customer.search({query: 'name:"two"'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([two.id])
+
+      response = Stripe::Customer.search({query: 'phone:"2222222222"'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([two.id])
+
+      response = Stripe::Customer.search({query: 'metadata["key"]:"uno"'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id])
+    end
+
+    it "respects limit", :aggregate_failures do
+      one = Stripe::Customer.create(email: 'one@one.com', name: 'one')
+      two = Stripe::Customer.create(email: 'two@two.com', name: 'one')
+      three = Stripe::Customer.create(email: 'three@three.com', name: 'one')
+      four = Stripe::Customer.create(email: 'four@four.com', name: 'one')
+      five = Stripe::Customer.create(email: 'five@five.com', name: 'one')
+      six = Stripe::Customer.create(email: 'six@six.com', name: 'one')
+      seven = Stripe::Customer.create(email: 'seven@seven.com', name: 'one')
+      eight = Stripe::Customer.create(email: 'eight@eight.com', name: 'one')
+      nine = Stripe::Customer.create(email: 'nine@nine.com', name: 'one')
+      ten = Stripe::Customer.create(email: 'ten@ten.com', name: 'one')
+      eleven = Stripe::Customer.create(email: 'eleven@eleven.com', name: 'one')
+
+      response = Stripe::Customer.search({query: 'name:"one"'}, stripe_version: '2020-08-27')
+      expect(response.data.size).to eq(10)
+      response = Stripe::Customer.search({query: 'name:"one"', limit: 1}, stripe_version: '2020-08-27')
+      expect(response.data.size).to eq(1)
+    end
+
+    it "reports search errors", :aggregate_failures do
+      expect {
+        Stripe::Customer.search({limit: 1}, stripe_version: '2020-08-27')
+      }.to raise_error(Stripe::InvalidRequestError, /Missing required param: query./)
+
+      expect {
+        Stripe::Customer.search({query: 'asdf'}, stripe_version: '2020-08-27')
+      }.to raise_error(Stripe::InvalidRequestError, /We were unable to parse your search query./)
+
+      expect {
+        Stripe::Customer.search({query: 'foo:"bar"'}, stripe_version: '2020-08-27')
+      }.to raise_error(Stripe::InvalidRequestError, /Field `foo` is an unsupported search field for resource `customers`./)
+    end
+  end
+
   it "updates a stripe customer" do
     original = Stripe::Customer.create(id: 'test_customer_update')
     email = original.email

data/spec/shared_stripe_examples/invoice_examples.rb

@@ -79,6 +79,88 @@ shared_examples 'Invoice API' do
     end
   end
 
+  context "searching invoices" do
+    # the Search API requires about a minute between writes and reads, so add sleeps accordingly when running live
+    it "searches invoices for exact matches", :aggregate_failures do
+      response = Stripe::Invoice.search({query: 'currency:"usd"'}, stripe_version: '2020-08-27')
+      expect(response.data.size).to eq(0)
+
+      product = stripe_helper.create_product
+      stripe_helper.create_plan(
+        amount: 500,
+        interval: 'month',
+        product: product.id,
+        currency: 'usd',
+        id: 'Sample5',
+      )
+      customer = Stripe::Customer.create(email: 'johnny@appleseed.com', source: stripe_helper.generate_card_token)
+      subscription = Stripe::Subscription.create(customer: customer.id, items: [{plan: 'Sample5'}])
+      one = Stripe::Invoice.create(
+        customer: customer.id,
+        currency: 'usd',
+        subscription: subscription.id,
+        metadata: {key: 'uno'},
+        number: 'one-1',
+        receipt_number: '111',
+      )
+      two = Stripe::Invoice.create(
+        customer: customer.id,
+        currency: 'gbp',
+        subscription: subscription.id,
+        metadata: {key: 'dos'},
+        number: 'two-2',
+        receipt_number: '222',
+      )
+
+      response = Stripe::Invoice.search({query: 'currency:"gbp"'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([two.id])
+
+      response = Stripe::Invoice.search({query: %(customer:"#{customer.id}")}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id, two.id])
+
+      response = Stripe::Invoice.search({query: 'number:"one-1"'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id])
+
+      response = Stripe::Invoice.search({query: 'receipt_number:"222"'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([two.id])
+
+      response = Stripe::Invoice.search({query: %(subscription:"#{subscription.id}")}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id, two.id])
+
+      response = Stripe::Invoice.search({query: 'total:1000'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id, two.id])
+
+      response = Stripe::Invoice.search({query: 'metadata["key"]:"uno"'}, stripe_version: '2020-08-27')
+      expect(response.data.map(&:id)).to match_array([one.id])
+    end
+
+    it "respects limit", :aggregate_failures do
+      customer = Stripe::Customer.create(email: 'one@one.com', name: 'one', phone: '1111111111', metadata: {key: 'uno'})
+      11.times do
+        Stripe::Invoice.create(customer: customer.id, currency: 'usd')
+      end
+
+      response = Stripe::Invoice.search({query: %(customer:"#{customer.id}")}, stripe_version: '2020-08-27')
+      expect(response.data.size).to eq(10)
+      response = Stripe::Invoice.search({query: %(customer:"#{customer.id}"), limit: 1}, stripe_version: '2020-08-27')
+      expect(response.data.size).to eq(1)
+    end
+
+    it "reports search errors", :aggregate_failures do
+      expect {
+        Stripe::Invoice.search({limit: 1}, stripe_version: '2020-08-27')
+      }.to raise_error(Stripe::InvalidRequestError, /Missing required param: query./)
+
+      expect {
+        Stripe::Invoice.search({query: 'asdf'}, stripe_version: '2020-08-27')
+      }.to raise_error(Stripe::InvalidRequestError, /We were unable to parse your search query./)
+
+      expect {
+        Stripe::Invoice.search({query: 'foo:"bar"'}, stripe_version: '2020-08-27')
+      }.to raise_error(Stripe::InvalidRequestError, /Field `foo` is an unsupported search field for resource `invoices`./)
+    end
+  end
+
   context "paying an invoice" do
     before do
       @invoice = Stripe::Invoice.create
@@ -154,7 +236,10 @@ shared_examples 'Invoice API' do
     describe 'parameter validation' do
       it 'fails without parameters' do
         expect { Stripe::Invoice.upcoming() }.to raise_error {|e|
-          expect(e).to be_a(ArgumentError) }
+        expect(e).to be_a(Stripe::InvalidRequestError)
+        expect(e.http_status).to eq(400)
+        expect(e.message).to eq('Missing required param: customer if subscription is not provided') 
+      }
       end
 
       it 'fails without a valid customer' do