stripe 1.22.0 → 1.23.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8bf9ef8e5a7343b1993b9b828ff317326bf78591
+  data.tar.gz: fdae2b4926156adfa71f047dd830f1ff1032c3a8
+SHA512:
+  metadata.gz: 5628f1bdbf7b87c0ed664944d60373923741d286bf26e037224a99039930a542beddd15f86304b081cdfd80619926719bee81302ba8a5b2e4823df763b9024fb
+  data.tar.gz: 20de174deab2c119dd0521cf700354a7d90cdbd948ef2980ef65d50678edccb54b5f9ff7eb62359d857b770671c3f28059aab40eed62ee2e8d1671ff8457e5d0

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.23.0 2015-07-06
+
+* Added request IDs and HTTP headers to errors.
+
 === 1.22.0 2015-06-10
 
 * Added support for bank accounts and debit cards in managed accounts (via the `external_accounts` param)

data/VERSION

@@ -1 +1 @@
-1.22.0
+1.23.0

data/lib/stripe.rb

@@ -139,8 +139,8 @@ module Stripe
         raise
       end
     rescue RestClient::ExceptionWithResponse => e
-      if rcode = e.http_code and rbody = e.http_body
-        handle_api_error(rcode, rbody)
+      if e.response
+        handle_api_error(e.response)
       else
         handle_restclient_error(e, api_base_url)
       end
@@ -241,45 +241,46 @@ module Stripe
                  "(HTTP response code was #{rcode})", rcode, rbody)
   end
 
-  def self.handle_api_error(rcode, rbody)
+  def self.handle_api_error(resp)
     begin
-      error_obj = JSON.parse(rbody)
+      error_obj = JSON.parse(resp.body)
       error_obj = Util.symbolize_names(error_obj)
       error = error_obj[:error] or raise StripeError.new # escape from parsing
 
     rescue JSON::ParserError, StripeError
-      raise general_api_error(rcode, rbody)
+      raise general_api_error(resp.code, resp.body)
     end
 
-    case rcode
+    case resp.code
     when 400, 404
-      raise invalid_request_error error, rcode, rbody, error_obj
+      raise invalid_request_error(error, resp, error_obj)
     when 401
-      raise authentication_error error, rcode, rbody, error_obj
+      raise authentication_error(error, resp, error_obj)
     when 402
-      raise card_error error, rcode, rbody, error_obj
+      raise card_error(error, resp, error_obj)
     else
-      raise api_error error, rcode, rbody, error_obj
+      raise api_error(error, resp, error_obj)
     end
 
   end
 
-  def self.invalid_request_error(error, rcode, rbody, error_obj)
-    InvalidRequestError.new(error[:message], error[:param], rcode,
-                            rbody, error_obj)
+  def self.invalid_request_error(error, resp, error_obj)
+    InvalidRequestError.new(error[:message], error[:param], resp.code,
+                            resp.body, error_obj, resp.headers)
   end
 
-  def self.authentication_error(error, rcode, rbody, error_obj)
-    AuthenticationError.new(error[:message], rcode, rbody, error_obj)
+  def self.authentication_error(error, resp, error_obj)
+    AuthenticationError.new(error[:message], resp.code, resp.body, error_obj,
+                            resp.headers)
   end
 
-  def self.card_error(error, rcode, rbody, error_obj)
+  def self.card_error(error, resp, error_obj)
     CardError.new(error[:message], error[:param], error[:code],
-                  rcode, rbody, error_obj)
+                  resp.code, resp.body, error_obj, resp.headers)
   end
 
-  def self.api_error(error, rcode, rbody, error_obj)
-    APIError.new(error[:message], rcode, rbody, error_obj)
+  def self.api_error(error, resp, error_obj)
+    APIError.new(error[:message], resp.code, resp.body, error_obj, resp.headers)
   end
 
   def self.handle_restclient_error(e, api_base_url=nil)

data/lib/stripe/errors/card_error.rb

@@ -2,8 +2,9 @@ module Stripe
   class CardError < StripeError
     attr_reader :param, :code
 
-    def initialize(message, param, code, http_status=nil, http_body=nil, json_body=nil)
-      super(message, http_status, http_body, json_body)
+    def initialize(message, param, code, http_status=nil, http_body=nil, json_body=nil,
+                   http_headers=nil)
+      super(message, http_status, http_body, json_body, http_headers)
       @param = param
       @code = code
     end

data/lib/stripe/errors/invalid_request_error.rb

@@ -2,8 +2,9 @@ module Stripe
   class InvalidRequestError < StripeError
     attr_accessor :param
 
-    def initialize(message, param, http_status=nil, http_body=nil, json_body=nil)
-      super(message, http_status, http_body, json_body)
+    def initialize(message, param, http_status=nil, http_body=nil, json_body=nil,
+                   http_headers=nil)
+      super(message, http_status, http_body, json_body, http_headers)
       @param = param
     end
   end

data/lib/stripe/errors/stripe_error.rb

@@ -3,18 +3,24 @@ module Stripe
     attr_reader :message
     attr_reader :http_status
     attr_reader :http_body
+    attr_reader :http_headers
+    attr_reader :request_id
     attr_reader :json_body
 
-    def initialize(message=nil, http_status=nil, http_body=nil, json_body=nil)
+    def initialize(message=nil, http_status=nil, http_body=nil, json_body=nil,
+                   http_headers=nil)
       @message = message
       @http_status = http_status
       @http_body = http_body
+      @http_headers = http_headers || {}
       @json_body = json_body
+      @request_id = @http_headers[:request_id]
     end
 
     def to_s
       status_string = @http_status.nil? ? "" : "(Status #{@http_status}) "
-      "#{status_string}#{@message}"
+      id_string = @request_id.nil? ? "" : "(Request #{@request_id}) "
+      "#{status_string}#{id_string}#{@message}"
     end
   end
 end

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.22.0'
+  VERSION = '1.23.0'
 end

data/test/stripe/account_test.rb

@@ -7,7 +7,7 @@ module Stripe
       @mock.expects(:get).
         once.
         with('https://api.stripe.com/v1/account', nil, nil).
-        returns(test_response(resp))
+        returns(make_response(resp))
       a = Stripe::Account.retrieve
       assert_equal "test+bindings@stripe.com", a.email
       assert !a.charge_enabled
@@ -19,7 +19,7 @@ module Stripe
       @mock.expects(:get).
         once.
         with('https://api.stripe.com/v1/accounts/acct_foo', nil, nil).
-        returns(test_response(resp))
+        returns(make_response(resp))
       a = Stripe::Account.retrieve('acct_foo')
       assert_equal "test+bindings@stripe.com", a.email
       assert !a.charge_enabled
@@ -45,12 +45,12 @@ module Stripe
       @mock.expects(:get).
         once.
         with('https://api.stripe.com/v1/accounts/acct_foo', nil, nil).
-        returns(test_response(resp))
+        returns(make_response(resp))
 
       @mock.expects(:post).
         once.
         with('https://api.stripe.com/v1/accounts/acct_foo', nil, 'legal_entity[first_name]=Bob&legal_entity[address][line1]=2%20Three%20Four').
-        returns(test_response(resp))
+        returns(make_response(resp))
 
       a = Stripe::Account.retrieve('acct_foo')
       a.legal_entity.first_name = 'Bob'
@@ -60,13 +60,13 @@ module Stripe
 
     should "be able to deauthorize an account" do
       resp = {:id => 'acct_1234', :email => "test+bindings@stripe.com", :charge_enabled => false, :details_submitted => false}
-      @mock.expects(:get).once.returns(test_response(resp))
+      @mock.expects(:get).once.returns(make_response(resp))
       a = Stripe::Account.retrieve
 
 
       @mock.expects(:post).once.with do |url, api_key, params|
         url == "#{Stripe.connect_base}/oauth/deauthorize" && api_key.nil? && CGI.parse(params) == { 'client_id' => [ 'ca_1234' ], 'stripe_user_id' => [ a.id ]}
-      end.returns(test_response({ 'stripe_user_id' => a.id }))
+      end.returns(make_response({ 'stripe_user_id' => a.id }))
       a.deauthorize('ca_1234', 'sk_test_1234')
     end
 
@@ -88,13 +88,13 @@ module Stripe
           :data => [],
         }
       }
-      @mock.expects(:get).once.returns(test_response(resp))
+      @mock.expects(:get).once.returns(make_response(resp))
       a = Stripe::Account.retrieve
 
       @mock.expects(:post).
         once.
         with('https://api.stripe.com/v1/accounts/acct_1234/external_accounts', nil, 'external_account=btok_1234').
-        returns(test_response(resp))
+        returns(make_response(resp))
       a.external_accounts.create({:external_account => 'btok_1234'})
     end
 
@@ -110,7 +110,7 @@ module Stripe
           }],
         }
       }
-      @mock.expects(:get).once.returns(test_response(resp))
+      @mock.expects(:get).once.returns(make_response(resp))
       a = Stripe::Account.retrieve
       assert_equal(BankAccount, a.external_accounts.data[0].class)
     end

data/test/stripe/api_resource_test.rb

@@ -55,7 +55,7 @@ module Stripe
 
     should "specifying invalid api credentials should raise an exception" do
       Stripe.api_key = "invalid"
-      response = test_response(test_invalid_api_key_error, 401)
+      response = make_response(make_invalid_api_key_error, 401)
       assert_raises Stripe::AuthenticationError do
         @mock.expects(:get).once.raises(RestClient::ExceptionWithResponse.new(response, 401))
         Stripe::Customer.retrieve("failing_customer")
@@ -64,7 +64,7 @@ module Stripe
 
     should "AuthenticationErrors should have an http status, http body, and JSON body" do
       Stripe.api_key = "invalid"
-      response = test_response(test_invalid_api_key_error, 401)
+      response = make_response(make_invalid_api_key_error, 401)
       begin
         @mock.expects(:get).once.raises(RestClient::ExceptionWithResponse.new(response, 401))
         Stripe::Customer.retrieve("failing_customer")
@@ -72,14 +72,14 @@ module Stripe
         assert_equal(401, e.http_status)
         assert_equal(true, !!e.http_body)
         assert_equal(true, !!e.json_body[:error][:message])
-        assert_equal(test_invalid_api_key_error[:error][:message], e.json_body[:error][:message])
+        assert_equal(make_invalid_api_key_error[:error][:message], e.json_body[:error][:message])
       end
     end
 
     should "send expand on fetch properly" do
       @mock.expects(:get).once.
         with("#{Stripe.api_base}/v1/charges/ch_test_charge?expand[]=customer", nil, nil).
-        returns(test_response(test_charge))
+        returns(make_response(make_charge))
 
       Stripe::Charge.retrieve({:id => 'ch_test_charge', :expand => [:customer]})
     end
@@ -87,7 +87,7 @@ module Stripe
     should "preserve expand across refreshes" do
       @mock.expects(:get).twice.
         with("#{Stripe.api_base}/v1/charges/ch_test_charge?expand[]=customer", nil, nil).
-        returns(test_response(test_charge))
+        returns(make_response(make_charge))
 
       ch = Stripe::Charge.retrieve({:id => 'ch_test_charge', :expand => [:customer]})
       ch.refresh
@@ -97,7 +97,7 @@ module Stripe
       stripe_account = "acct_0000"
       Stripe.expects(:execute_request).with do |opts|
         opts[:headers][:stripe_account] == stripe_account
-      end.returns(test_response(test_charge))
+      end.returns(make_response(make_charge))
 
       Stripe::Charge.create({:card => {:number => '4242424242424242'}},
                             {:stripe_account => stripe_account, :api_key => 'sk_test_local'})
@@ -106,7 +106,7 @@ module Stripe
     should "not send stripe account as header when not set" do
       Stripe.expects(:execute_request).with do |opts|
         opts[:headers][:stripe_account].nil?
-      end.returns(test_response(test_charge))
+      end.returns(make_response(make_charge))
 
       Stripe::Charge.create({:card => {:number => '4242424242424242'}},
         'sk_test_local')
@@ -117,7 +117,7 @@ module Stripe
         should "use the per-object credential when creating" do
           Stripe.expects(:execute_request).with do |opts|
             opts[:headers][:authorization] == 'Bearer sk_test_local'
-          end.returns(test_response(test_charge))
+          end.returns(make_response(make_charge))
 
           Stripe::Charge.create({:card => {:number => '4242424242424242'}},
             'sk_test_local')
@@ -136,7 +136,7 @@ module Stripe
         should "use the per-object credential when creating" do
           Stripe.expects(:execute_request).with do |opts|
             opts[:headers][:authorization] == 'Bearer local'
-          end.returns(test_response(test_charge))
+          end.returns(make_response(make_charge))
 
           Stripe::Charge.create({:card => {:number => '4242424242424242'}},
             'local')
@@ -146,11 +146,11 @@ module Stripe
           Stripe.expects(:execute_request).with do |opts|
             opts[:url] == "#{Stripe.api_base}/v1/charges/ch_test_charge" &&
               opts[:headers][:authorization] == 'Bearer local'
-          end.returns(test_response(test_charge))
+          end.returns(make_response(make_charge))
           Stripe.expects(:execute_request).with do |opts|
             opts[:url] == "#{Stripe.api_base}/v1/charges/ch_test_charge/refund" &&
               opts[:headers][:authorization] == 'Bearer local'
-          end.returns(test_response(test_charge))
+          end.returns(make_response(make_charge))
 
           ch = Stripe::Charge.retrieve('ch_test_charge', 'local')
           ch.refund
@@ -162,7 +162,7 @@ module Stripe
       should "send along the idempotency-key header" do
         Stripe.expects(:execute_request).with do |opts|
           opts[:headers][:idempotency_key] == 'bar'
-        end.returns(test_response(test_charge))
+        end.returns(make_response(make_charge))
 
         Stripe::Charge.create({:card => {:number => '4242424242424242'}}, {
           :idempotency_key => 'bar',
@@ -171,14 +171,14 @@ module Stripe
       end
 
       should "urlencode values in GET params" do
-        response = test_response(test_charge_array)
+        response = make_response(make_charge_array)
         @mock.expects(:get).with("#{Stripe.api_base}/v1/charges?customer=test%20customer", nil, nil).returns(response)
         charges = Stripe::Charge.all(:customer => 'test customer').data
         assert charges.kind_of? Array
       end
 
       should "construct URL properly with base query parameters" do
-        response = test_response(test_invoice_customer_array)
+        response = make_response(make_invoice_customer_array)
         @mock.expects(:get).with("#{Stripe.api_base}/v1/invoices?customer=test_customer", nil, nil).returns(response)
         invoices = Stripe::Invoice.all(:customer => 'test_customer')
 
@@ -187,7 +187,7 @@ module Stripe
       end
 
       should "a 400 should give an InvalidRequestError with http status, body, and JSON body" do
-        response = test_response(test_missing_id_error, 400)
+        response = make_response(make_missing_id_error, 400)
         @mock.expects(:get).once.raises(RestClient::ExceptionWithResponse.new(response, 404))
         begin
           Stripe::Customer.retrieve("foo")
@@ -199,7 +199,7 @@ module Stripe
       end
 
       should "a 401 should give an AuthenticationError with http status, body, and JSON body" do
-        response = test_response(test_missing_id_error, 401)
+        response = make_response(make_missing_id_error, 401)
         @mock.expects(:get).once.raises(RestClient::ExceptionWithResponse.new(response, 404))
         begin
           Stripe::Customer.retrieve("foo")
@@ -211,7 +211,7 @@ module Stripe
       end
 
       should "a 402 should give a CardError with http status, body, and JSON body" do
-        response = test_response(test_missing_id_error, 402)
+        response = make_response(make_missing_id_error, 402)
         @mock.expects(:get).once.raises(RestClient::ExceptionWithResponse.new(response, 404))
         begin
           Stripe::Customer.retrieve("foo")
@@ -223,7 +223,7 @@ module Stripe
       end
 
       should "a 404 should give an InvalidRequestError with http status, body, and JSON body" do
-        response = test_response(test_missing_id_error, 404)
+        response = make_response(make_missing_id_error, 404)
         @mock.expects(:get).once.raises(RestClient::ExceptionWithResponse.new(response, 404))
         begin
           Stripe::Customer.retrieve("foo")
@@ -240,19 +240,19 @@ module Stripe
           query = CGI.parse(uri.query)
           (url =~ %r{^#{Stripe.api_base}/v1/charges?} &&
            query.keys.sort == ['offset', 'sad'])
-        end.returns(test_response({ :count => 1, :data => [test_charge] }))
+        end.returns(make_response({ :count => 1, :data => [make_charge] }))
         Stripe::Charge.all(:count => nil, :offset => 5, :sad => false)
 
         @mock.expects(:post).with do |url, api_key, params|
           url == "#{Stripe.api_base}/v1/charges" &&
             api_key.nil? &&
             CGI.parse(params) == { 'amount' => ['50'], 'currency' => ['usd'] }
-        end.returns(test_response({ :count => 1, :data => [test_charge] }))
+        end.returns(make_response({ :count => 1, :data => [make_charge] }))
         Stripe::Charge.create(:amount => 50, :currency => 'usd', :card => { :number => nil })
       end
 
       should "requesting with a unicode ID should result in a request" do
-        response = test_response(test_missing_id_error, 404)
+        response = make_response(make_missing_id_error, 404)
         @mock.expects(:get).once.with("#{Stripe.api_base}/v1/customers/%E2%98%83", nil, nil).raises(RestClient::ExceptionWithResponse.new(response, 404))
         c = Stripe::Customer.new("☃")
         assert_raises(Stripe::InvalidRequestError) { c.refresh }
@@ -265,7 +265,7 @@ module Stripe
 
       should "making a GET request with parameters should have a query string and no body" do
         params = { :limit => 1 }
-        @mock.expects(:get).once.with("#{Stripe.api_base}/v1/charges?limit=1", nil, nil).returns(test_response([test_charge]))
+        @mock.expects(:get).once.with("#{Stripe.api_base}/v1/charges?limit=1", nil, nil).returns(make_response([make_charge]))
         Stripe::Charge.all(params)
       end
 
@@ -273,18 +273,18 @@ module Stripe
         params = { :amount => 100, :currency => 'usd', :card => 'sc_token' }
         @mock.expects(:post).once.with do |url, get, post|
           get.nil? && CGI.parse(post) == {'amount' => ['100'], 'currency' => ['usd'], 'card' => ['sc_token']}
-        end.returns(test_response(test_charge))
+        end.returns(make_response(make_charge))
         Stripe::Charge.create(params)
       end
 
       should "loading an object should issue a GET request" do
-        @mock.expects(:get).once.returns(test_response(test_customer))
+        @mock.expects(:get).once.returns(make_response(make_customer))
         c = Stripe::Customer.new("test_customer")
         c.refresh
       end
 
       should "using array accessors should be the same as the method interface" do
-        @mock.expects(:get).once.returns(test_response(test_customer))
+        @mock.expects(:get).once.returns(make_response(make_customer))
         c = Stripe::Customer.new("test_customer")
         c.refresh
         assert_equal c.created, c[:created]
@@ -294,7 +294,7 @@ module Stripe
       end
 
       should "accessing a property other than id or parent on an unfetched object should fetch it" do
-        @mock.expects(:get).once.returns(test_response(test_customer))
+        @mock.expects(:get).once.returns(make_response(make_customer))
         c = Stripe::Customer.new("test_customer")
         c.charges
       end
@@ -302,14 +302,14 @@ module Stripe
       should "updating an object should issue a POST request with only the changed properties" do
         @mock.expects(:post).with do |url, api_key, params|
           url == "#{Stripe.api_base}/v1/customers/c_test_customer" && api_key.nil? && CGI.parse(params) == {'description' => ['another_mn']}
-        end.once.returns(test_response(test_customer))
-        c = Stripe::Customer.construct_from(test_customer)
+        end.once.returns(make_response(make_customer))
+        c = Stripe::Customer.construct_from(make_customer)
         c.description = "another_mn"
         c.save
       end
 
       should "updating should merge in returned properties" do
-        @mock.expects(:post).once.returns(test_response(test_customer))
+        @mock.expects(:post).once.returns(make_response(make_customer))
         c = Stripe::Customer.new("c_test_customer")
         c.description = "another_mn"
         c.save
@@ -319,8 +319,8 @@ module Stripe
       should "deleting should send no props and result in an object that has no props other deleted" do
         @mock.expects(:get).never
         @mock.expects(:post).never
-        @mock.expects(:delete).with("#{Stripe.api_base}/v1/customers/c_test_customer", nil, nil).once.returns(test_response({ "id" => "test_customer", "deleted" => true }))
-        c = Stripe::Customer.construct_from(test_customer)
+        @mock.expects(:delete).with("#{Stripe.api_base}/v1/customers/c_test_customer", nil, nil).once.returns(make_response({ "id" => "test_customer", "deleted" => true }))
+        c = Stripe::Customer.construct_from(make_customer)
         c.delete
         assert_equal true, c.deleted
 
@@ -330,13 +330,13 @@ module Stripe
       end
 
       should "loading an object with properties that have specific types should instantiate those classes" do
-        @mock.expects(:get).once.returns(test_response(test_charge))
+        @mock.expects(:get).once.returns(make_response(make_charge))
         c = Stripe::Charge.retrieve("test_charge")
         assert c.card.kind_of?(Stripe::StripeObject) && c.card.object == 'card'
       end
 
       should "loading all of an APIResource should return an array of recursively instantiated objects" do
-        @mock.expects(:get).once.returns(test_response(test_charge_array))
+        @mock.expects(:get).once.returns(make_response(make_charge_array))
         c = Stripe::Charge.all.data
         assert c.kind_of? Array
         assert c[0].kind_of? Stripe::Charge
@@ -348,7 +348,7 @@ module Stripe
           opts[:method] == :get &&
           opts[:url] == "#{Stripe.api_base}/v1/customers/c_test_customer" &&
           opts[:headers][:stripe_account] == 'acct_abc'
-        end.once.returns(test_response(test_customer))
+        end.once.returns(make_response(make_customer))
         c = Stripe::Customer.retrieve("c_test_customer", {:stripe_account => 'acct_abc'})
       end
 
@@ -357,7 +357,7 @@ module Stripe
           opts[:method] == :get &&
           opts[:url] == "#{Stripe.api_base}/v1/customers/c_test_customer" &&
           opts[:headers][:stripe_account] == 'acct_abc'
-        end.once.returns(test_response(test_customer))
+        end.once.returns(make_response(make_customer))
         c = Stripe::Customer.retrieve("c_test_customer", {:stripe_account => 'acct_abc'})
 
         Stripe.expects(:execute_request).with do |opts|
@@ -365,7 +365,7 @@ module Stripe
           opts[:url] == "#{Stripe.api_base}/v1/customers/c_test_customer" &&
           opts[:headers][:stripe_account] == 'acct_abc' &&
           opts[:payload] == 'description=FOO'
-        end.once.returns(test_response(test_customer))
+        end.once.returns(make_response(make_customer))
         c.description = 'FOO'
         c.save
       end
@@ -373,7 +373,7 @@ module Stripe
       context "error checking" do
 
         should "404s should raise an InvalidRequestError" do
-          response = test_response(test_missing_id_error, 404)
+          response = make_response(make_missing_id_error, 404)
           @mock.expects(:get).once.raises(RestClient::ExceptionWithResponse.new(response, 404))
 
           rescued = false
@@ -391,7 +391,7 @@ module Stripe
         end
 
         should "5XXs should raise an APIError" do
-          response = test_response(test_api_error, 500)
+          response = make_response(make_api_error, 500)
           @mock.expects(:get).once.raises(RestClient::ExceptionWithResponse.new(response, 500))
 
           rescued = false
@@ -407,7 +407,7 @@ module Stripe
         end
 
         should "402s should raise a CardError" do
-          response = test_response(test_invalid_exp_year_error, 402)
+          response = make_response(make_invalid_exp_year_error, 402)
           @mock.expects(:get).once.raises(RestClient::ExceptionWithResponse.new(response, 402))
 
           rescued = false
@@ -436,7 +436,7 @@ module Stripe
           }
         })
 
-        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, 'legal_entity[first_name]=Bob').returns(test_response({"id" => "myid"}))
+        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, 'legal_entity[first_name]=Bob').returns(make_response({"id" => "myid"}))
 
         acct.legal_entity.first_name = 'Bob'
         acct.save
@@ -450,7 +450,7 @@ module Stripe
           }
         })
 
-        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, '').returns(test_response({"id" => "myid"}))
+        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, '').returns(make_response({"id" => "myid"}))
 
         acct.save
       end
@@ -464,7 +464,7 @@ module Stripe
           }
         })
 
-        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/charges/charge_id", nil, '').returns(test_response({"id" => "charge_id"}))
+        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/charges/charge_id", nil, '').returns(make_response({"id" => "charge_id"}))
 
         ch.customer.description = 'Bob'
         ch.save
@@ -485,7 +485,7 @@ module Stripe
             'legal_entity[first_name]=Bob&legal_entity[last_name]=',
             'legal_entity[last_name]=&legal_entity[first_name]=Bob'
           )
-        ).returns(test_response({"id" => "myid"}))
+        ).returns(make_response({"id" => "myid"}))
 
         acct.legal_entity = {:first_name => 'Bob'}
         acct.save
@@ -497,7 +497,7 @@ module Stripe
           :legal_entity => {}
         })
 
-        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, 'legal_entity[additional_owners][0][first_name]=Bob').returns(test_response({"id" => "myid"}))
+        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, 'legal_entity[additional_owners][0][first_name]=Bob').returns(make_response({"id" => "myid"}))
 
         acct.legal_entity.additional_owners = [{:first_name => 'Bob'}]
         acct.save
@@ -511,7 +511,7 @@ module Stripe
           }
         })
 
-        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, 'legal_entity[additional_owners][0][first_name]=Bob').returns(test_response({"id" => "myid"}))
+        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, 'legal_entity[additional_owners][0][first_name]=Bob').returns(make_response({"id" => "myid"}))
 
         acct.legal_entity.additional_owners << {:first_name => 'Bob'}
         acct.save
@@ -525,7 +525,7 @@ module Stripe
           }
         })
 
-        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, 'legal_entity[additional_owners][1][first_name]=Janet').returns(test_response({"id" => "myid"}))
+        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, 'legal_entity[additional_owners][1][first_name]=Janet').returns(make_response({"id" => "myid"}))
 
         acct.legal_entity.additional_owners[1].first_name = 'Janet'
         acct.save
@@ -540,7 +540,7 @@ module Stripe
           :currencies_supported => ['usd', 'cad']
         })
 
-        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, '').returns(test_response({"id" => "myid"}))
+        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, '').returns(make_response({"id" => "myid"}))
 
         acct.save
       end
@@ -553,7 +553,7 @@ module Stripe
           }
         })
 
-        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, '').returns(test_response({"id" => "myid"}))
+        @mock.expects(:post).once.with("#{Stripe.api_base}/v1/accounts/myid", nil, '').returns(make_response({"id" => "myid"}))
 
         acct.save
       end