fake_braintree 0.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90895aa7f5953a1df73fedda78c56cf804b119f5
-  data.tar.gz: 2f12cc8250442c5f6a6de12a6e40cf22f3f44905
+  metadata.gz: e490dbbce81677c05e0eb73532ea5471db948dd7
+  data.tar.gz: b5090bfd54c5118b61912bacdc9bcf39956c9109
 SHA512:
-  metadata.gz: 86fd2e92a281e532424652cb7d80f2bacaf82fc7d2f75ae120d7cbe3bc1398b63fa18a05987c659e9694cbdde726d893d70c54b0c8f369e457baa09ca37d707f
-  data.tar.gz: 64eb83bd4581fc26e508aad73dca9b60d9a90a1df6465c62ede7495b1ed4d14fc8c9a7262a40e8267f44e60e6a46603ec80fa6fd3182d094c33d139f620f62f9
+  metadata.gz: 3a46b7284f3489ec49d8098f651e83c72f0ce2850f372ce51fcce885b15dced400a5615f5168eabb4974ccde8fb210358a71a8732fc2af25d23c27b184c5bb01
+  data.tar.gz: 968a51beab295415d2098710cebe4f327b3f1847f20d6daa6301284df6adf1c7635b318ae137544a47bf6679d1a06e098e00d4276453ab037f6343f2c9061aa9

data/.travis.yml

@@ -1,6 +1,9 @@
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.1.1
 before_install:
   - gem update --system
 branches:

data/Gemfile

@@ -2,3 +2,12 @@ source 'http://rubygems.org'
 
 # Specify your gem's dependencies in fake_braintree.gemspec
 gemspec
+
+# Capybara 2.1.0 requires 1.9.3+ so we install a version that works with
+# every Ruby version we test against. This can be removed if we stop testing
+# against 1.9.2.
+gem 'capybara', '~> 2.0.3'
+
+if RUBY_VERSION == '1.9.2'
+  gem 'activesupport', '< 4.0'
+end

data/NEWS.md

@@ -1,4 +1,8 @@
-# HEAD (unreleased)
+# 0.4.1
+
+* Add support for `Braintree::Subscription.retry_charge`
+
+# 0.4
 
 * Add support for `Braintree::Address.create`
 * Add support for creating a card with an existing billing address (#45)

data/README.md

@@ -14,34 +14,37 @@ of them (yet).
 
 ## Supported API methods
 
+### Address
+* `Braintree::Address.create`
+
+### CreditCard
+* `Braintree::CreditCard.create`
+* `Braintree::CreditCard.find`
+* `Braintree::CreditCard.sale`
+* `Braintree::CreditCard.update`
+
 ### Customer
-* `Braintree::Customer.find`
 * `Braintree::Customer.create` (including adding add-ons and discounts)
-* `Braintree::Customer.update`
 * `Braintree::Customer.delete`
+* `Braintree::Customer.find`
+* `Braintree::Customer.update`
 
 ### Subscription
-* `Braintree::Subscription.find`
+* `Braintree::Subscription.cancel`
 * `Braintree::Subscription.create`
+* `Braintree::Subscription.find`
 * `Braintree::Subscription.update`
-* `Braintree::Subscription.cancel`
-
-### CreditCard
-* `Braintree::CreditCard.find`
-* `Braintree::CreditCard.sale`
-* `Braintree::CreditCard.update`
+* `Braintree::Subscription.retry_charge`
 
 ### Transaction
-* `Braintree::Transaction.sale`
+* `Braintree::Transaction.find`
 * `Braintree::Transaction.refund`
+* `Braintree::Transaction.sale`
 * `Braintree::Transaction.void`
 
 ### TransparentRedirect
-* `Braintree::TransparentRedirect.url`
 * `Braintree::TransparentRedirect.confirm` (only for creating customers)
-
-### Address
-* `Braintree::Address.create`
+* `Braintree::TransparentRedirect.url`
 
 ## Quick start
 Just require the library and you're good to go:
@@ -77,7 +80,7 @@ To use fake\_braintree with Spork, do this:
 
     # Gemfile
     group :test do
-      gem 'fake_braintree', :require => false
+      gem 'fake_braintree', require: false
     end
 
     # spec/spec_helper.rb
@@ -147,10 +150,10 @@ call it with no arguments.
 
 Full example:
 
-    transaction = FakeBraintree.generate_transaction(:amount => '20.00',
-                                                     :status => Braintree::Transaction::Status::Settled,
-                                                     :subscription_id => 'foobar',
-                                                     :created_at => Time.now + 60)
+    transaction = FakeBraintree.generate_transaction(amount: '20.00',
+                                                     status: Braintree::Transaction::Status::Settled,
+                                                     subscription_id: 'foobar',
+                                                     created_at: Time.now + 60)
     p transaction
     # {
     #   "status_history" =>

data/fake_braintree.gemspec

@@ -25,10 +25,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'thin'
 
   s.add_development_dependency 'rspec', '~> 2.12.0'
-  # Capybara 2.1.0 requires 1.9.3+ so we install a version that works with
-  # every Ruby version we test against. This can be removed if we stop testing
-  # against 1.9.2.
-  s.add_development_dependency 'capybara', '~> 2.0.3'
   s.add_development_dependency 'bourne', '~> 1.3'
   s.add_development_dependency 'timecop', '~> 0.6'
   s.add_development_dependency 'rake'

data/lib/fake_braintree/address.rb

@@ -18,7 +18,7 @@ module FakeBraintree
     end
 
     def response_for_updated_address
-      gzipped_response(200, @hash.to_xml(:root => 'address'))
+      gzipped_response(200, @hash.to_xml(root: 'address'))
     end
 
     def set_up_address(address_hash_from_params, options)

data/lib/fake_braintree/credit_card.rb

@@ -34,7 +34,7 @@ module FakeBraintree
     end
 
     def to_xml
-      @hash.to_xml(:root => 'credit_card')
+      @hash.to_xml(root: 'credit_card')
     end
 
     def valid_number?
@@ -66,7 +66,7 @@ module FakeBraintree
     end
 
     def response_for_updated_card
-      gzipped_response(200, @hash.to_xml(:root => 'credit_card'))
+      gzipped_response(200, @hash.to_xml(root: 'credit_card'))
     end
 
     def credit_card_exists_in_registry?
@@ -78,14 +78,14 @@ module FakeBraintree
     end
 
     def response_for_card_not_found
-      gzipped_response(404, FakeBraintree.failure_response.to_xml(:root => 'api_error_response'))
+      gzipped_response(404, FakeBraintree.failure_response.to_xml(root: 'api_error_response'))
     end
 
     def response_for_invalid_card
       gzipped_response(422, FakeBraintree.failure_response.merge(
-          'params' => {:credit_card => @hash}
+          'params' => {credit_card: @hash}
         ).
-        to_xml(:root => 'api_error_response'))
+        to_xml(root: 'api_error_response'))
     end
 
     def expiration_month

data/lib/fake_braintree/customer.rb

@@ -104,7 +104,7 @@ module FakeBraintree
 
     def set_default_credit_card(credit_card_hash)
       if credit_card_hash
-        CreditCard.new(credit_card_hash, :customer_id => @customer_hash['id'], :make_default => true).update
+        CreditCard.new(credit_card_hash, customer_id: @customer_hash['id'], make_default: true).update
       end
     end
 
@@ -153,11 +153,11 @@ module FakeBraintree
     end
 
     def response_for_created_customer(hash)
-      gzipped_response(201, hash.to_xml(:root => 'customer'))
+      gzipped_response(201, hash.to_xml(root: 'customer'))
     end
 
     def response_for_updated_customer(hash)
-      gzipped_response(200, hash.to_xml(:root => 'customer'))
+      gzipped_response(200, hash.to_xml(root: 'customer'))
     end
 
     def response_for_invalid_card
@@ -169,7 +169,7 @@ module FakeBraintree
     end
 
     def failure_response(code)
-      gzipped_response(code, FakeBraintree.failure_response(credit_card_number).to_xml(:root => 'api_error_response'))
+      gzipped_response(code, FakeBraintree.failure_response(credit_card_number).to_xml(root: 'api_error_response'))
     end
 
     def customer_id

data/lib/fake_braintree/redirect.rb

@@ -19,9 +19,9 @@ module FakeBraintree
 
     def confirm
       if @kind == 'create_customer'
-        Customer.new(@params['customer'], {:merchant_id => @merchant_id}).create
+        Customer.new(@params['customer'], {merchant_id: @merchant_id}).create
       elsif @kind == 'create_payment_method'
-        credit_card_options = {:merchant_id => @merchant_id}
+        credit_card_options = {merchant_id: @merchant_id}
         credit_card_options.merge!(@transparent_data['credit_card'].fetch('options', {}))
 
         credit_card_options.symbolize_keys!

data/lib/fake_braintree/server.rb

@@ -16,7 +16,7 @@ class FakeBraintree::Server
   def with_thin_runner
     default_server_process = Capybara.server
     Capybara.server do |app, port|
-      Rack::Handler::Thin.run(app, :Port => port)
+      Rack::Handler::Thin.run(app, Port: port)
     end
     yield
   ensure

data/lib/fake_braintree/sinatra_app.rb

@@ -23,7 +23,7 @@ module FakeBraintree
     # Braintree::Customer.create
     post '/merchants/:merchant_id/customers' do
       customer_hash = hash_from_request_body_with_key('customer')
-      options = {:merchant_id => params[:merchant_id]}
+      options = {merchant_id: params[:merchant_id]}
       Customer.new(customer_hash, options).create
     end
 
@@ -31,7 +31,7 @@ module FakeBraintree
     get '/merchants/:merchant_id/customers/:id' do
       customer = FakeBraintree.registry.customers[params[:id]]
       if customer
-        gzipped_response(200, customer.to_xml(:root => 'customer'))
+        gzipped_response(200, customer.to_xml(root: 'customer'))
       else
         gzipped_response(404, {})
       end
@@ -40,28 +40,28 @@ module FakeBraintree
     # Braintree::Customer.update
     put '/merchants/:merchant_id/customers/:id' do
       customer_hash = hash_from_request_body_with_key('customer')
-      options = {:id => params[:id], :merchant_id => params[:merchant_id]}
+      options = {id: params[:id], merchant_id: params[:merchant_id]}
       Customer.new(customer_hash, options).update
     end
 
     # Braintree::Customer.delete
     delete '/merchants/:merchant_id/customers/:id' do
       customer_hash = {}
-      options = {:id => params[:id], :merchant_id => params[:merchant_id]}
+      options = {id: params[:id], merchant_id: params[:merchant_id]}
       Customer.new(customer_hash, options).delete
     end
 
     # Braintree::Address.create
     post "/merchants/:merchant_id/customers/:customer_id/addresses" do
       address_hash = hash_from_request_body_with_key('address')
-      options = {:customer_id => params[:customer_id], :merchant_id => params[:merchant_id]}
+      options = {customer_id: params[:customer_id], merchant_id: params[:merchant_id]}
       Address.new(address_hash, options).create
     end
 
     # Braintree::Subscription.create
     post '/merchants/:merchant_id/subscriptions' do
       subscription_hash = hash_from_request_body_with_key('subscription')
-      options = {:merchant_id => params[:merchant_id]}
+      options = {merchant_id: params[:merchant_id]}
       Subscription.new(subscription_hash, options).create
     end
 
@@ -69,7 +69,7 @@ module FakeBraintree
     get '/merchants/:merchant_id/subscriptions/:id' do
       subscription = FakeBraintree.registry.subscriptions[params[:id]]
       if subscription
-        gzipped_response(200, subscription.to_xml(:root => 'subscription'))
+        gzipped_response(200, subscription.to_xml(root: 'subscription'))
       else
         gzipped_response(404, {})
       end
@@ -78,14 +78,14 @@ module FakeBraintree
     # Braintree::Subscription.update
     put '/merchants/:merchant_id/subscriptions/:id' do
       subscription_hash = hash_from_request_body_with_key('subscription')
-      options = {:id => params[:id], :merchant_id => params[:merchant_id]}
+      options = {id: params[:id], merchant_id: params[:merchant_id]}
       Subscription.new(subscription_hash, options).update
     end
 
     # Braintree::Subscription.cancel
     put '/merchants/:merchant_id/subscriptions/:id/cancel' do
       updates = {'status' => Braintree::Subscription::Status::Canceled}
-      options = {:id => params[:id], :merchant_id => params[:merchant_id]}
+      options = {id: params[:id], merchant_id: params[:merchant_id]}
       Subscription.new(updates, options).update
     end
 
@@ -93,7 +93,7 @@ module FakeBraintree
     get '/merchants/:merchant_id/payment_methods/:credit_card_token' do
       credit_card = FakeBraintree.registry.credit_cards[params[:credit_card_token]]
       if credit_card
-        gzipped_response(200, credit_card.to_xml(:root => 'credit_card'))
+        gzipped_response(200, credit_card.to_xml(root: 'credit_card'))
       else
         gzipped_response(404, {})
       end
@@ -103,14 +103,14 @@ module FakeBraintree
     put '/merchants/:merchant_id/payment_methods/:credit_card_token' do
       credit_card = FakeBraintree.registry.credit_cards[params[:credit_card_token]]
       updates     = hash_from_request_body_with_key('credit_card')
-      options     = {:token => params[:credit_card_token], :merchant_id => params[:merchant_id]}
+      options     = {token: params[:credit_card_token], merchant_id: params[:merchant_id]}
       CreditCard.new(updates, options).update
     end
 
     # Braintree::CreditCard.create
     post '/merchants/:merchant_id/payment_methods' do
       credit_card_hash = hash_from_request_body_with_key('credit_card')
-      options = {:merchant_id => params[:merchant_id]}
+      options = {merchant_id: params[:merchant_id]}
 
       if credit_card_hash['options']
         options.merge!(credit_card_hash.delete('options')).symbolize_keys!
@@ -123,7 +123,7 @@ module FakeBraintree
     # Braintree::CreditCard.sale
     post '/merchants/:merchant_id/transactions' do
       if FakeBraintree.decline_all_cards?
-        gzipped_response(422, FakeBraintree.create_failure.to_xml(:root => 'api_error_response'))
+        gzipped_response(422, FakeBraintree.create_failure.to_xml(root: 'api_error_response'))
       else
         transaction = hash_from_request_body_with_key('transaction')
         transaction_id = md5("#{params[:merchant_id]}#{Time.now.to_f}")
@@ -134,7 +134,7 @@ module FakeBraintree
         end
         transaction_response = {'id' => transaction_id, 'amount' => transaction['amount'], 'status' => status, 'type' => 'sale'}
         FakeBraintree.registry.transactions[transaction_id] = transaction_response
-        gzipped_response(200, transaction_response.to_xml(:root => 'transaction'))
+        gzipped_response(200, transaction_response.to_xml(root: 'transaction'))
       end
     end
 
@@ -142,7 +142,7 @@ module FakeBraintree
     get '/merchants/:merchant_id/transactions/:transaction_id' do
       transaction = FakeBraintree.registry.transactions[params[:transaction_id]]
       if transaction
-        gzipped_response(200, transaction.to_xml(:root => 'transaction'))
+        gzipped_response(200, transaction.to_xml(root: 'transaction'))
       else
         gzipped_response(404, {})
       end
@@ -154,7 +154,18 @@ module FakeBraintree
       transaction_id       = md5('#{params[:merchant_id]}#{Time.now.to_f}')
       transaction_response = {'id' => transaction_id, 'amount' => transaction['amount'], 'type' => 'credit'}
       FakeBraintree.registry.transactions[transaction_id] = transaction_response
-      gzipped_response(200, transaction_response.to_xml(:root => 'transaction'))
+      gzipped_response(200, transaction_response.to_xml(root: 'transaction'))
+    end
+
+
+    put '/merchants/:merchant_id/transactions/:transaction_id/submit_for_settlement' do
+      transaction = FakeBraintree.registry.transactions[params[:transaction_id]]
+      transaction_response = {'id' => transaction['id'],
+                              'type' => transaction['sale'],
+                              'amount' => transaction['amount'],
+                              'status' => Braintree::Transaction::Status::SubmittedForSettlement}
+      FakeBraintree.registry.transactions[transaction['id']] = transaction_response
+      gzipped_response(200, transaction_response.to_xml(root: 'transaction'))
     end
 
     # Braintree::Transaction.void
@@ -165,7 +176,7 @@ module FakeBraintree
                               'amount' => transaction['amount'],
                               'status' => Braintree::Transaction::Status::Voided}
       FakeBraintree.registry.transactions[transaction['id']] = transaction_response
-      gzipped_response(200, transaction_response.to_xml(:root => 'transaction'))
+      gzipped_response(200, transaction_response.to_xml(root: 'transaction'))
     end
 
     # Braintree::TransparentRedirect.url

data/lib/fake_braintree/subscription.rb

@@ -3,9 +3,10 @@ module FakeBraintree
     include Helpers
 
     def initialize(subscription_hash_from_params, options)
+      id = subscription_hash_from_params['id'] || options[:id]
       @subscription_hash = subscription_hash_from_params.merge(
         'merchant_id' => options[:merchant_id],
-        'id' => options[:id]
+        'id' => id
       )
       set_subscription_id
       set_subscription_status
@@ -98,7 +99,7 @@ module FakeBraintree
     end
 
     def response_for_created_subscription(hash)
-      gzipped_response(201, hash.to_xml(:root => 'subscription'))
+      gzipped_response(201, hash.to_xml(root: 'subscription'))
     end
 
     def response_for_subscription_not_found
@@ -106,7 +107,7 @@ module FakeBraintree
     end
 
     def response_for_created_subscription(hash)
-      gzipped_response(201, hash.to_xml(:root => 'subscription'))
+      gzipped_response(201, hash.to_xml(root: 'subscription'))
     end
   end
 end

data/lib/fake_braintree/version.rb

@@ -1,3 +1,3 @@
 module FakeBraintree
-  VERSION = '0.4'
+  VERSION = '0.4.1'
 end

data/spec/fake_braintree/address_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Braintree::Address.create" do
   it "successfully creates address with valid data" do
     result = create_customer
-    result = Braintree::Address.create(:customer_id => result.customer.id, :postal_code => 30339)
+    result = Braintree::Address.create(customer_id: result.customer.id, postal_code: 30339)
     result.should be_success
   end
 end

data/spec/fake_braintree/credit_card_spec.rb

@@ -2,21 +2,23 @@ require 'spec_helper'
 
 describe 'Braintree::CreditCard.find' do
   it 'gets the correct credit card' do
-    credit_card = Braintree::CreditCard.find(token)
+    month = '04'
+    year = '2016'
+    credit_card = Braintree::CreditCard.find(token_for(month, year))
 
     credit_card.last_4.should == TEST_CC_NUMBER[-4,4]
     credit_card.expiration_month.should == month
     credit_card.expiration_year.should ==  year
   end
 
-  let(:month) { '04' }
-  let(:year)  { '2016' }
-  let(:token) { braintree_credit_card_token(TEST_CC_NUMBER, [month, year].join('/')) }
+  def token_for(month, year)
+    braintree_credit_card_token(TEST_CC_NUMBER, [month, year].join('/'))
+  end
 end
 
 describe 'Braintree::CreditCard.sale' do
   it 'successfully creates a sale' do
-    result = Braintree::CreditCard.sale(cc_token, :amount => 10.00)
+    result = Braintree::CreditCard.sale(cc_token, amount: 10.00)
     result.should be_success
     Braintree::Transaction.find(result.transaction.id).should be
   end
@@ -24,22 +26,6 @@ end
 
 
 describe 'Braintree::CreditCard.create' do
-  def build_credit_card_hash
-    {
-      :customer_id => @customer && @customer.id,
-      :number => '4111111111111111',
-      :cvv => '123',
-      :token => 'token',
-      :expiration_date => '07/2020',
-      :billing_address => {
-        :postal_code => '94110'
-      },
-      :options => {
-        :make_default => true
-      }
-    }
-  end
-
   it 'allows creating a credit card without a customer' do
     result = Braintree::CreditCard.create(build_credit_card_hash)
     result.should be_success
@@ -55,15 +41,15 @@ describe 'Braintree::CreditCard.create' do
       FakeBraintree.decline_all_cards!
       result = Braintree::CreditCard.create(build_credit_card_hash)
       result.should_not be_success
-      expect { Braintree::CreditCard.find('token') }.to raise_exception Braintree::NotFoundError
+      expect { Braintree::CreditCard.find('token') }.to raise_error Braintree::NotFoundError
       FakeBraintree.clear!
     end
 
     it 'fails to create a credit card if verify_all_cards is set and card is invalid' do
       FakeBraintree.verify_all_cards!
-      result = Braintree::CreditCard.create(build_credit_card_hash.merge(:number => '12345'))
+      result = Braintree::CreditCard.create(build_credit_card_hash.merge(number: '12345'))
       result.should_not be_success
-      expect { Braintree::CreditCard.find('token') }.to raise_exception Braintree::NotFoundError
+      expect { Braintree::CreditCard.find('token') }.to raise_error Braintree::NotFoundError
       FakeBraintree.verify_all_cards = false
     end
 
@@ -71,7 +57,7 @@ describe 'Braintree::CreditCard.create' do
       result = Braintree::CreditCard.create(build_credit_card_hash)
       result.should be_success
       Braintree::Customer.find(@customer.id).credit_cards.last.token.should == 'token'
-      Braintree::Customer.find(@customer.id).credit_cards.last.default?.should be_true
+      Braintree::Customer.find(@customer.id).credit_cards.last.should be_default
       Braintree::Customer.find(@customer.id).credit_cards.last.billing_address.postal_code.should == "94110"
     end
 
@@ -82,10 +68,26 @@ describe 'Braintree::CreditCard.create' do
       result.should be_success
       # Reload the customer
       @customer = Braintree::Customer.find(@customer.id)
-      @customer.credit_cards.select {|c| c.default?}.length.should == 1
+      @customer.credit_cards.select(&:default?).length.should == 1
       @customer.credit_cards.length.should == 2
     end
   end
+
+  def build_credit_card_hash
+    {
+      customer_id: @customer && @customer.id,
+      number: '4111111111111111',
+      cvv: '123',
+      token: 'token',
+      expiration_date: '07/2020',
+      billing_address: {
+        postal_code: '94110'
+      },
+      options: {
+        make_default: true
+      }
+    }
+  end
 end
 
 describe 'Braintree::CreditCard.update' do
@@ -93,12 +95,12 @@ describe 'Braintree::CreditCard.update' do
     new_expiration_date = '08/2012'
     token = cc_token
 
-    result = Braintree::CreditCard.update(token, :expiration_date => new_expiration_date)
+    result = Braintree::CreditCard.update(token, expiration_date: new_expiration_date)
     result.should be_success
     Braintree::CreditCard.find(token).expiration_date.should == new_expiration_date
   end
 
   it 'raises an error for a nonexistent credit card' do
-    lambda { Braintree::CreditCard.update('foo', {:number => TEST_CC_NUMBER}) }.should raise_error(Braintree::NotFoundError)
+    expect { Braintree::CreditCard.update('foo', number: TEST_CC_NUMBER) }.to raise_error(Braintree::NotFoundError)
   end
 end