stripe 1.22.0 → 1.23.0

data/test/stripe/list_object_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../../test_helper', __FILE__)
 module Stripe
   class ListObjectTest < Test::Unit::TestCase
     should "be able to retrieve full lists given a listobject" do
-      @mock.expects(:get).twice.returns(test_response(test_charge_array))
+      @mock.expects(:get).twice.returns(make_response(make_charge_array))
       c = Stripe::Charge.all
       assert c.kind_of?(Stripe::ListObject)
       assert_equal('/v1/charges', c.url)
@@ -13,4 +13,4 @@ module Stripe
       assert all.data.kind_of?(Array)
     end
   end
-end
+end

data/test/stripe/metadata_test.rb

@@ -6,23 +6,23 @@ module Stripe
       @metadata_supported = {
         :charge => {
           :new => Stripe::Charge.method(:new),
-          :test => method(:test_charge),
-          :url => "/v1/charges/#{test_charge()[:id]}"
+          :test => method(:make_charge),
+          :url => "/v1/charges/#{make_charge()[:id]}"
         },
         :customer => {
           :new => Stripe::Customer.method(:new),
-          :test => method(:test_customer),
-          :url => "/v1/customers/#{test_customer()[:id]}"
+          :test => method(:make_customer),
+          :url => "/v1/customers/#{make_customer()[:id]}"
         },
         :recipient => {
           :new => Stripe::Recipient.method(:new),
-          :test => method(:test_recipient),
-          :url => "/v1/recipients/#{test_recipient()[:id]}"
+          :test => method(:make_recipient),
+          :url => "/v1/recipients/#{make_recipient()[:id]}"
         },
         :transfer => {
           :new => Stripe::Transfer.method(:new),
-          :test => method(:test_transfer),
-          :url => "/v1/transfers/#{test_transfer()[:id]}"
+          :test => method(:make_transfer),
+          :url => "/v1/transfers/#{make_transfer()[:id]}"
         }
       }
 
@@ -92,11 +92,11 @@ module Stripe
         url = @base_url + methods[:url]
 
         initial_test_obj = test.call(initial_params)
-        @mock.expects(:get).once.returns(test_response(initial_test_obj))
+        @mock.expects(:get).once.returns(make_response(initial_test_obj))
 
         final_test_obj = test.call()
         @mock.expects(:post).once.
-          returns(test_response(final_test_obj)).
+          returns(make_response(final_test_obj)).
           with(url, nil, curl_args)
 
         obj = neu.call("test")

data/test/stripe/recipient_card_test.rb

@@ -5,13 +5,13 @@ module Stripe
     RECIPIENT_CARD_URL = '/v1/recipients/test_recipient/cards/test_card'
 
     def recipient
-      @mock.expects(:get).once.returns(test_response(test_recipient))
+      @mock.expects(:get).once.returns(make_response(make_recipient))
       Stripe::Recipient.retrieve('test_recipient')
     end
 
     should "recipient cards should be listable" do
       c = recipient
-      @mock.expects(:get).once.returns(test_response(test_recipient_card_array(recipient.id)))
+      @mock.expects(:get).once.returns(make_response(make_recipient_card_array(recipient.id)))
       cards = c.cards.all.data
       assert cards.kind_of? Array
       assert cards[0].kind_of? Stripe::Card
@@ -19,7 +19,7 @@ module Stripe
 
     should "recipient cards should have the correct url" do
       c = recipient
-      @mock.expects(:get).once.returns(test_response(test_card(
+      @mock.expects(:get).once.returns(make_response(make_card(
         :id => 'test_card',
         :recipient => 'test_recipient'
       )))
@@ -29,8 +29,8 @@ module Stripe
 
     should "recipient cards should be deletable" do
       c = recipient
-      @mock.expects(:get).once.returns(test_response(test_card))
-      @mock.expects(:delete).once.returns(test_response(test_card(:deleted => true)))
+      @mock.expects(:get).once.returns(make_response(make_card))
+      @mock.expects(:delete).once.returns(make_response(make_card(:deleted => true)))
       card = c.cards.retrieve('card')
       card.delete
       assert card.deleted
@@ -38,8 +38,8 @@ module Stripe
 
     should "recipient cards should be updateable" do
       c = recipient
-      @mock.expects(:get).once.returns(test_response(test_card(:exp_year => "2000")))
-      @mock.expects(:post).once.returns(test_response(test_card(:exp_year => "2100")))
+      @mock.expects(:get).once.returns(make_response(make_card(:exp_year => "2000")))
+      @mock.expects(:post).once.returns(make_response(make_card(:exp_year => "2100")))
       card = c.cards.retrieve('card')
       assert_equal "2000", card.exp_year
       card.exp_year = "2100"
@@ -49,7 +49,7 @@ module Stripe
 
     should "create should return a new recipient card" do
       c = recipient
-      @mock.expects(:post).once.returns(test_response(test_card(:id => "test_card")))
+      @mock.expects(:post).once.returns(make_response(make_card(:id => "test_card")))
       card = c.cards.create(:card => "tok_41YJ05ijAaWaFS")
       assert_equal "test_card", card.id
     end

data/test/stripe/refund_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../../test_helper', __FILE__)
 module Stripe
   class RefundTest < Test::Unit::TestCase
     should "refunds should be listable" do
-      @mock.expects(:get).once.returns(test_response(test_charge))
+      @mock.expects(:get).once.returns(make_response(make_charge))
 
       charge = Stripe::Charge.retrieve('test_charge')
 
@@ -11,7 +11,7 @@ module Stripe
     end
 
     should "refunds should be refreshable" do
-      @mock.expects(:get).twice.returns(test_response(test_charge), test_response(test_refund(:id => 'refreshed_refund')))
+      @mock.expects(:get).twice.returns(make_response(make_charge), make_response(make_refund(:id => 'refreshed_refund')))
 
       charge = Stripe::Charge.retrieve('test_charge')
       refund = charge.refunds.first
@@ -21,8 +21,8 @@ module Stripe
     end
 
     should "refunds should be updateable" do
-      @mock.expects(:get).once.returns(test_response(test_charge))
-      @mock.expects(:post).once.returns(test_response(test_refund(:metadata => {'key' => 'value'})))
+      @mock.expects(:get).once.returns(make_response(make_charge))
+      @mock.expects(:post).once.returns(make_response(make_refund(:metadata => {'key' => 'value'})))
 
       charge = Stripe::Charge.retrieve('test_charge')
       refund = charge.refunds.first
@@ -36,8 +36,8 @@ module Stripe
     end
 
     should "create should return a new refund" do
-      @mock.expects(:get).once.returns(test_response(test_charge))
-      @mock.expects(:post).once.returns(test_response(test_refund(:id => 'test_new_refund')))
+      @mock.expects(:get).once.returns(make_response(make_charge))
+      @mock.expects(:post).once.returns(make_response(make_refund(:id => 'test_new_refund')))
 
       charge = Stripe::Charge.retrieve('test_charge')
       refund = charge.refunds.create(:amount => 20)

data/test/stripe/reversal_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../../test_helper', __FILE__)
 module Stripe
   class ReversalTest < Test::Unit::TestCase
     should "reversals should be listable" do
-      @mock.expects(:get).once.returns(test_response(test_transfer))
+      @mock.expects(:get).once.returns(make_response(make_transfer))
 
       transfer = Stripe::Transfer.retrieve('test_transfer')
 
@@ -11,7 +11,7 @@ module Stripe
     end
 
     should "reversals should be refreshable" do
-      @mock.expects(:get).twice.returns(test_response(test_transfer), test_response(test_reversal(:id => 'refreshed_reversal')))
+      @mock.expects(:get).twice.returns(make_response(make_transfer), make_response(make_reversal(:id => 'refreshed_reversal')))
 
       transfer = Stripe::Transfer.retrieve('test_transfer')
       reversal = transfer.reversals.first
@@ -21,8 +21,8 @@ module Stripe
     end
 
     should "reversals should be updateable" do
-      @mock.expects(:get).once.returns(test_response(test_transfer))
-      @mock.expects(:post).once.returns(test_response(test_reversal(:metadata => {'key' => 'value'})))
+      @mock.expects(:get).once.returns(make_response(make_transfer))
+      @mock.expects(:post).once.returns(make_response(make_reversal(:metadata => {'key' => 'value'})))
 
       transfer = Stripe::Transfer.retrieve('test_transfer')
       reversal = transfer.reversals.first
@@ -36,8 +36,8 @@ module Stripe
     end
 
     should "create should return a new reversal" do
-      @mock.expects(:get).once.returns(test_response(test_transfer))
-      @mock.expects(:post).once.returns(test_response(test_reversal(:id => 'test_new_reversal')))
+      @mock.expects(:get).once.returns(make_response(make_transfer))
+      @mock.expects(:post).once.returns(make_response(make_reversal(:id => 'test_new_reversal')))
 
       transfer = Stripe::Transfer.retrieve('test_transfer')
       reversals = transfer.reversals.create(:amount => 20)

data/test/stripe/subscription_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../../test_helper', __FILE__)
 module Stripe
   class SubscriptionTest < Test::Unit::TestCase
     should "subscriptions should be listable" do
-      @mock.expects(:get).once.returns(test_response(test_customer))
+      @mock.expects(:get).once.returns(make_response(make_customer))
 
       customer = Stripe::Customer.retrieve('test_customer')
 
@@ -11,7 +11,7 @@ module Stripe
     end
 
     should "subscriptions should be refreshable" do
-      @mock.expects(:get).twice.returns(test_response(test_customer), test_response(test_subscription(:id => 'refreshed_subscription')))
+      @mock.expects(:get).twice.returns(make_response(make_customer), make_response(make_subscription(:id => 'refreshed_subscription')))
 
       customer = Stripe::Customer.retrieve('test_customer')
       subscription = customer.subscriptions.first
@@ -21,20 +21,20 @@ module Stripe
     end
 
     should "subscriptions should be deletable" do
-      @mock.expects(:get).once.returns(test_response(test_customer))
+      @mock.expects(:get).once.returns(make_response(make_customer))
       customer = Stripe::Customer.retrieve('test_customer')
       subscription = customer.subscriptions.first
 
-      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/#{subscription.id}?at_period_end=true", nil, nil).returns(test_response(test_subscription))
+      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/#{subscription.id}?at_period_end=true", nil, nil).returns(make_response(make_subscription))
       subscription.delete :at_period_end => true
 
-      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/#{subscription.id}", nil, nil).returns(test_response(test_subscription))
+      @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/#{subscription.id}", nil, nil).returns(make_response(make_subscription))
       subscription.delete
     end
 
     should "subscriptions should be updateable" do
-      @mock.expects(:get).once.returns(test_response(test_customer))
-      @mock.expects(:post).once.returns(test_response(test_subscription({:status => 'active'})))
+      @mock.expects(:get).once.returns(make_response(make_customer))
+      @mock.expects(:post).once.returns(make_response(make_subscription({:status => 'active'})))
 
       customer = Stripe::Customer.retrieve('test_customer')
       subscription = customer.subscriptions.first
@@ -47,8 +47,8 @@ module Stripe
     end
 
     should "create should return a new subscription" do
-      @mock.expects(:get).once.returns(test_response(test_customer))
-      @mock.expects(:post).once.returns(test_response(test_subscription(:id => 'test_new_subscription')))
+      @mock.expects(:get).once.returns(make_response(make_customer))
+      @mock.expects(:post).once.returns(make_response(make_subscription(:id => 'test_new_subscription')))
 
       customer = Stripe::Customer.retrieve('test_customer')
       subscription = customer.subscriptions.create(:plan => 'silver')
@@ -56,15 +56,15 @@ module Stripe
     end
 
     should "be able to delete a subscriptions's discount" do
-      @mock.expects(:get).once.returns(test_response(test_customer))
-      @mock.expects(:post).once.returns(test_response(test_subscription(:id => 'test_new_subscription')))
+      @mock.expects(:get).once.returns(make_response(make_customer))
+      @mock.expects(:post).once.returns(make_response(make_subscription(:id => 'test_new_subscription')))
 
 
-      customer = Stripe::Customer.retrieve("test_customer")
+      customer = Stripe::Customer.retrieve('test_customer')
       subscription = customer.subscriptions.create(:plan => 'silver')
 
       url = "#{Stripe.api_base}/v1/customers/c_test_customer/subscriptions/test_new_subscription/discount"
-      @mock.expects(:delete).once.with(url, nil, nil).returns(test_response(test_delete_discount_response))
+      @mock.expects(:delete).once.with(url, nil, nil).returns(make_response(make_delete_discount_response))
       subscription.delete_discount
       assert_equal nil, subscription.discount
     end

data/test/stripe/transfer_test.rb

@@ -3,22 +3,22 @@ require File.expand_path('../../test_helper', __FILE__)
 module Stripe
   class TransferTest < Test::Unit::TestCase
     should "retrieve should retrieve transfer" do
-      @mock.expects(:get).once.returns(test_response(test_transfer))
+      @mock.expects(:get).once.returns(make_response(make_transfer))
       transfer = Stripe::Transfer.retrieve('tr_test_transfer')
       assert_equal 'tr_test_transfer', transfer.id
     end
 
     should "create should create a transfer" do
-      @mock.expects(:post).once.returns(test_response(test_transfer))
+      @mock.expects(:post).once.returns(make_response(make_transfer))
       transfer = Stripe::Transfer.create
       assert_equal "tr_test_transfer", transfer.id
     end
 
     should "cancel should cancel a transfer" do
-      @mock.expects(:get).once.returns(test_response(test_transfer))
+      @mock.expects(:get).once.returns(make_response(make_transfer))
       transfer = Stripe::Transfer.retrieve('tr_test_transfer')
 
-      @mock.expects(:post).once.with('https://api.stripe.com/v1/transfers/tr_test_transfer/cancel', nil, '').returns(test_response(test_canceled_transfer))
+      @mock.expects(:post).once.with('https://api.stripe.com/v1/transfers/tr_test_transfer/cancel', nil, '').returns(make_response(make_canceled_transfer))
       transfer.cancel
     end
   end

data/test/test_data.rb

@@ -1,17 +1,22 @@
 module Stripe
   module TestData
-    def test_response(body, code=200)
+    def make_response(body, code=200)
       # When an exception is raised, restclient clobbers method_missing.  Hence we
       # can't just use the stubs interface.
       body = JSON.generate(body) if !(body.kind_of? String)
       m = mock
-      m.instance_variable_set('@stripe_values', { :body => body, :code => code })
+      m.instance_variable_set('@stripe_values', {
+        :body => body,
+        :code => code,
+        :headers => {},
+      })
       def m.body; @stripe_values[:body]; end
       def m.code; @stripe_values[:code]; end
+      def m.headers; @stripe_values[:headers]; end
       m
     end
 
-    def test_balance(params={})
+    def make_balance(params={})
       {
         :pending => [
           {:amount => 12345, :currency => "usd"}
@@ -24,7 +29,7 @@ module Stripe
       }.merge(params)
     end
 
-    def test_balance_transaction(params={})
+    def make_balance_transaction(params={})
       {
         :amount => 100,
         :net => 41,
@@ -39,15 +44,15 @@ module Stripe
       }.merge(params)
     end
 
-    def test_balance_transaction_array
+    def make_balance_transaction_array
       {
-        :data => [test_balance_transaction, test_balance_transaction, test_balance_transaction],
+        :data => [make_balance_transaction, make_balance_transaction, make_balance_transaction],
         :object => "list",
         :url => "/v1/balance/history"
       }
     end
 
-    def test_application_fee(params={})
+    def make_application_fee(params={})
       id = params[:id] || 'fee_test_fee'
       {
         :refunded => false,
@@ -59,12 +64,12 @@ module Stripe
         :livemode => false,
         :currency => "usd",
         :object => "application_fee",
-        :refunds => test_application_fee_refund_array(id),
+        :refunds => make_application_fee_refund_array(id),
         :created => 1304114826
       }.merge(params)
     end
 
-    def test_application_fee_refund(params = {})
+    def make_application_fee_refund(params = {})
       {
         :object => 'fee_refund',
         :amount => 30,
@@ -76,23 +81,23 @@ module Stripe
       }.merge(params)
     end
 
-    def test_application_fee_array
+    def make_application_fee_array
       {
-        :data => [test_application_fee, test_application_fee, test_application_fee],
+        :data => [make_application_fee, make_application_fee, make_application_fee],
         :object => 'list',
         :url => '/v1/application_fees'
       }
     end
 
-    def test_application_fee_refund_array(fee_id)
+    def make_application_fee_refund_array(fee_id)
       {
-        :data => [test_application_fee_refund, test_application_fee_refund, test_application_fee_refund],
+        :data => [make_application_fee_refund, make_application_fee_refund, make_application_fee_refund],
         :object => 'list',
         :url => '/v1/application_fees/' + fee_id + '/refunds'
       }
     end
 
-    def test_customer(params={})
+    def make_customer(params={})
       id = params[:id] || 'c_test_customer'
       {
         :subscription_history => [],
@@ -103,21 +108,21 @@ module Stripe
         :id => id,
         :default_card => "cc_test_card",
         :created => 1304114758,
-        :sources => test_customer_card_array(id),
+        :sources => make_customer_card_array(id),
         :metadata => {},
-        :subscriptions => test_subscription_array(id)
+        :subscriptions => make_subscription_array(id)
       }.merge(params)
     end
 
-    def test_customer_array
+    def make_customer_array
       {
-        :data => [test_customer, test_customer, test_customer],
+        :data => [make_customer, make_customer, make_customer],
         :object => 'list',
         :url => '/v1/customers'
       }
     end
 
-    def test_charge(params={})
+    def make_charge(params={})
       id = params[:id] || 'ch_test_charge'
       {
         :refunded => false,
@@ -138,36 +143,36 @@ module Stripe
         :currency => "usd",
         :object => "charge",
         :created => 1304114826,
-        :refunds => test_refund_array(id),
+        :refunds => make_refund_array(id),
         :metadata => {}
       }.merge(params)
     end
 
-    def test_charge_array
+    def make_charge_array
       {
-        :data => [test_charge, test_charge, test_charge],
+        :data => [make_charge, make_charge, make_charge],
         :object => 'list',
         :url => '/v1/charges'
       }
     end
 
-    def test_recipient_card_array(recipient_id)
+    def make_recipient_card_array(recipient_id)
       {
-        :data => [test_card, test_card, test_card],
+        :data => [make_card, make_card, make_card],
         :object => 'list',
         :url => '/v1/recipients/' + recipient_id + '/cards'
       }
     end
 
-    def test_customer_card_array(customer_id)
+    def make_customer_card_array(customer_id)
       {
-        :data => [test_card, test_card, test_card],
+        :data => [make_card, make_card, make_card],
         :object => 'list',
         :url => '/v1/customers/' + customer_id + '/sources'
       }
     end
 
-    def test_card(params={})
+    def make_card(params={})
       {
         :type => "Visa",
         :last4 => "4242",
@@ -180,7 +185,7 @@ module Stripe
       }.merge(params)
     end
 
-    def test_coupon(params={})
+    def make_coupon(params={})
       {
         :duration => 'repeating',
         :duration_in_months => 3,
@@ -191,7 +196,7 @@ module Stripe
       }.merge(params)
     end
 
-    def test_file(params={})
+    def make_file(params={})
       {
         :object => "file_upload",
         :id => "fil_test_file",
@@ -203,16 +208,16 @@ module Stripe
       }
     end
 
-    def test_file_array
+    def make_file_array
       {
-        :data => [test_file, test_file, test_file],
+        :data => [make_file, make_file, make_file],
         :object => 'list',
         :url => '/v1/files'
       }
     end
 
     #FIXME nested overrides would be better than hardcoding plan_id
-    def test_subscription(params = {})
+    def make_subscription(params = {})
       plan = params.delete(:plan) || 'gold'
       {
         :current_period_end => 1308681468,
@@ -234,7 +239,7 @@ module Stripe
       }.merge(params)
     end
 
-    def test_refund(params = {})
+    def make_refund(params = {})
       {
         :object => 'refund',
         :amount => 30,
@@ -246,31 +251,31 @@ module Stripe
       }.merge(params)
     end
 
-    def test_subscription_array(customer_id)
+    def make_subscription_array(customer_id)
       {
-        :data => [test_subscription, test_subscription, test_subscription],
+        :data => [make_subscription, make_subscription, make_subscription],
         :object => 'list',
         :url => '/v1/customers/' + customer_id + '/subscriptions'
       }
     end
 
-    def test_refund_array(charge_id)
+    def make_refund_array(charge_id)
       {
-        :data => [test_refund, test_refund, test_refund],
+        :data => [make_refund, make_refund, make_refund],
         :object => 'list',
         :url => '/v1/charges/' + charge_id + '/refunds'
       }
     end
 
-    def test_reversal_array(transfer_id)
+    def make_reversal_array(transfer_id)
       {
-        :data => [test_reversal, test_reversal, test_reversal],
+        :data => [make_reversal, make_reversal, make_reversal],
         :object => 'list',
         :url => '/v1/transfers/' + transfer_id + '/reversals'
       }
     end
 
-    def test_invoice
+    def make_invoice
       {
         :id => 'in_test_invoice',
         :object => 'invoice',
@@ -310,8 +315,8 @@ module Stripe
       }
     end
 
-    def test_paid_invoice
-      test_invoice.merge({
+    def make_paid_invoice
+      make_invoice.merge({
           :attempt_count => 1,
           :attempted => true,
           :closed => true,
@@ -322,15 +327,15 @@ module Stripe
         })
     end
 
-    def test_invoice_customer_array
+    def make_invoice_customer_array
       {
-        :data => [test_invoice],
+        :data => [make_invoice],
         :object => 'list',
         :url => '/v1/invoices?customer=test_customer'
       }
     end
 
-    def test_recipient(params={})
+    def make_recipient(params={})
       id = params[:id] || 'rp_test_recipient'
       {
         :name => "Stripe User",
@@ -338,7 +343,7 @@ module Stripe
         :livemode => false,
         :object => "recipient",
         :id => "rp_test_recipient",
-        :cards => test_recipient_card_array(id),
+        :cards => make_recipient_card_array(id),
         :default_card => "debit_test_card",
         :active_account => {
           :last4 => "6789",
@@ -352,15 +357,15 @@ module Stripe
       }.merge(params)
     end
 
-    def test_recipient_array
+    def make_recipient_array
       {
-        :data => [test_recipient, test_recipient, test_recipient],
+        :data => [make_recipient, make_recipient, make_recipient],
         :object => 'list',
         :url => '/v1/recipients'
       }
     end
 
-    def test_transfer(params={})
+    def make_transfer(params={})
       {
         :status => 'pending',
         :amount => 100,
@@ -374,7 +379,7 @@ module Stripe
         :fee => 0,
         :fee_details => [],
         :id => "tr_test_transfer",
-        :reversals => test_reversal_array('tr_test_transfer'),
+        :reversals => make_reversal_array('tr_test_transfer'),
         :livemode => false,
         :currency => "usd",
         :object => "transfer",
@@ -383,21 +388,21 @@ module Stripe
       }.merge(params)
     end
 
-    def test_transfer_array
+    def make_transfer_array
       {
-        :data => [test_transfer, test_transfer, test_transfer],
+        :data => [make_transfer, make_transfer, make_transfer],
         :object => 'list',
         :url => '/v1/transfers'
       }
     end
 
-    def test_canceled_transfer
-      test_transfer.merge({
+    def make_canceled_transfer
+      make_transfer.merge({
         :status => 'canceled'
       })
     end
 
-    def test_reversal(params={})
+    def make_reversal(params={})
       {
         :object => 'transfer_reversal',
         :amount => 30,
@@ -409,7 +414,7 @@ module Stripe
       }.merge(params)
     end
 
-    def test_bitcoin_receiver(params={})
+    def make_bitcoin_receiver(params={})
       {
         :id => 'btcrcv_test_receiver',
         :amount => 100,
@@ -417,19 +422,19 @@ module Stripe
         :description => 'some details',
         :metadata => {},
         :object => 'bitcoin_receiver',
-        :transactions => test_bitcoin_transaction_array
+        :transactions => make_bitcoin_transaction_array
       }.merge(params)
     end
 
-    def test_bitcoin_receiver_array
+    def make_bitcoin_receiver_array
       {
-        :data => [test_bitcoin_receiver, test_bitcoin_receiver, test_bitcoin_receiver],
+        :data => [make_bitcoin_receiver, make_bitcoin_receiver, make_bitcoin_receiver],
         :object => 'list',
         :url => '/v1/bitcoin/receivers'
       }
     end
 
-    def test_bitcoin_transaction(params={})
+    def make_bitcoin_transaction(params={})
       {
         :id => 'btctxn_test_transaction',
         :object => 'bitcoin_transaction',
@@ -440,15 +445,15 @@ module Stripe
       }.merge(params)
     end
 
-    def test_bitcoin_transaction_array
+    def make_bitcoin_transaction_array
       {
-        :data => [test_bitcoin_transaction, test_bitcoin_transaction, test_bitcoin_transaction],
+        :data => [make_bitcoin_transaction, make_bitcoin_transaction, make_bitcoin_transaction],
         :object => 'list',
         :url => "/v1/bitcoin/receivers/btcrcv_test_receiver/transactions"
       }
     end
 
-    def test_invalid_api_key_error
+    def make_invalid_api_key_error
       {
         :error => {
           :type => "invalid_request_error",
@@ -457,7 +462,7 @@ module Stripe
       }
     end
 
-    def test_invalid_exp_year_error
+    def make_invalid_exp_year_error
       {
         :error => {
           :code => "invalid_expiry_year",
@@ -468,7 +473,7 @@ module Stripe
       }
     end
 
-    def test_missing_id_error
+    def make_missing_id_error
       {
         :error => {
           :param => "id",
@@ -478,7 +483,7 @@ module Stripe
       }
     end
 
-    def test_api_error
+    def make_api_error
       {
         :error => {
           :type => "api_error"
@@ -486,7 +491,7 @@ module Stripe
       }
     end
 
-    def test_delete_discount_response
+    def make_delete_discount_response
       {
         :deleted => true,
         :id => "di_test_coupon"