braintree-rails 1.2.3 → 1.3.0

data/spec/integration/braintree_rails/merchant_account_integration_spec.rb

@@ -0,0 +1,37 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '../integration_spec_helper'))
+
+describe 'MerchantAccount Integration' do
+  it 'should fetch merchant account from Braintree for given id' do
+    braintree_merchant_account = Braintree::MerchantAccount.find(BraintreeRails::Configuration.default_merchant_account_id)
+    merchant_account = BraintreeRails::MerchantAccount.new(BraintreeRails::Configuration.default_merchant_account_id)
+    merchant_account.id.should == braintree_merchant_account.id
+    merchant_account.status.should == braintree_merchant_account.status
+  end
+
+  it 'can create sub merchant account' do
+    merchant_account = BraintreeRails::MerchantAccount.create(merchant_account_hash)
+    merchant_account.should be_persisted
+  end
+
+  it 'does not consider merchant account persisted if rejected by Braintree' do
+    merchant_account = BraintreeRails::MerchantAccount.create(merchant_account_hash.merge(:tos_accepted => 'false'))
+    merchant_account.should_not be_persisted
+  end
+
+  it 'sets validation errors properly to its associations' do
+    merchant_account = BraintreeRails::MerchantAccount.create(merchant_account_hash.merge(:individual => {}, :funding => {}, :business => {:legal_name => "foo"}))
+    merchant_account.should_not be_persisted
+    merchant_account.individual.errors.should_not be_empty
+    merchant_account.funding.errors.should_not be_empty
+    merchant_account.business.errors.should_not be_empty
+  end
+
+  it 'can update the submerchant account' do
+    individual = merchant_account_hash[:individual].merge(:first_name => "foo")
+    merchant_account = BraintreeRails::MerchantAccount.create(merchant_account_hash.merge(:individual => individual))
+    merchant_account.should be_persisted
+    merchant_account.individual.first_name.should == "foo"
+    merchant_account.update_attributes(:individual => {:first_name => "bar"})
+    merchant_account.individual.first_name.should == "bar"
+  end
+end

data/{test/integration/braintree_rails/transaction_integration_test.rb → spec/integration/braintree_rails/transaction_integration_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../integration_test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../integration_spec_helper'))
 
 describe 'Transaction Integration' do
   before do
@@ -11,14 +11,14 @@ describe 'Transaction Integration' do
     customer = BraintreeRails::Customer.new(braintree_customer)
 
     transaction = BraintreeRails::Transaction.create!(:customer => customer, :amount => (1..5).to_a.sample)
-    transaction.persisted?.must_equal true
-    transaction.status.must_equal Braintree::Transaction::Status::Authorized
+    transaction.should be_persisted
+    transaction.status.should == Braintree::Transaction::Status::Authorized
 
     transaction.submit_for_settlement!
-    transaction.status.must_equal Braintree::Transaction::Status::SubmittedForSettlement
+    transaction.status.should == Braintree::Transaction::Status::SubmittedForSettlement
 
     transaction.void!
-    transaction.status.must_equal Braintree::Transaction::Status::Voided
+    transaction.status.should == Braintree::Transaction::Status::Voided
   end
 
   it 'should be able to create, submit, void transactions for a customer with a credit_card' do
@@ -27,14 +27,14 @@ describe 'Transaction Integration' do
     credit_card = customer.credit_cards.first
 
     transaction = BraintreeRails::Transaction.create!(:customer => customer, :amount => (1..5).to_a.sample, :credit_card => credit_card)
-    transaction.persisted?.must_equal true
-    transaction.status.must_equal Braintree::Transaction::Status::Authorized
+    transaction.should be_persisted
+    transaction.status.should == Braintree::Transaction::Status::Authorized
 
     transaction.submit_for_settlement!
-    transaction.status.must_equal Braintree::Transaction::Status::SubmittedForSettlement
+    transaction.status.should == Braintree::Transaction::Status::SubmittedForSettlement
 
     transaction.void!
-    transaction.status.must_equal Braintree::Transaction::Status::Voided
+    transaction.status.should == Braintree::Transaction::Status::Voided
   end
 
 
@@ -44,31 +44,31 @@ describe 'Transaction Integration' do
     credit_card = customer.credit_cards.first
     transaction = BraintreeRails::Transaction.create!(:amount => (1..10).to_a.sample, :customer => customer)
 
-    customer.transactions.length.must_equal 1
+    customer.transactions.length.should == 1
     customer.transactions.each do |t|
-     t.must_equal transaction
+     t.should == transaction
     end
-    credit_card.transactions.count.must_equal 1
+    credit_card.transactions.count.should == 1
   end
 
   it "should be able to load all transactions for a given customer" do
     braintree_customer = Braintree::Customer.create!(customer_hash)
     customer = BraintreeRails::Customer.new(braintree_customer)
-    credit_card1 = customer.credit_cards.create!(credit_card_hash.merge(:token => 'card_1'))
-    credit_card2 = customer.credit_cards.create!(credit_card_hash.merge(:token => 'card_2'))
-    customer.credit_cards.size.must_equal 2
+    credit_card1 = customer.credit_cards.create!(credit_card_hash.merge(:token => nil))
+    credit_card2 = customer.credit_cards.create!(credit_card_hash.merge(:token => nil))
+    customer.credit_cards.size.should == 2
 
     transaction1 = BraintreeRails::Transaction.create!(:amount => (1..10).to_a.sample, :customer => customer, :credit_card => credit_card1)
     transaction2 = BraintreeRails::Transaction.create!(:amount => (1..10).to_a.sample, :customer => customer, :credit_card => credit_card2)
-    customer.transactions.size.must_equal 2
+    customer.transactions.size.should == 2
   end
 
   it 'should be able to create a one time transaction' do
     transaction = BraintreeRails::Transaction.create!(:amount => (1..10).to_a.sample, :billing => address_hash, :customer => customer_hash, :credit_card => credit_card_hash)
-    transaction.persisted?.must_equal true
-    transaction.id.wont_be :blank?
-    transaction.customer.wont_be :blank?
-    transaction.credit_card.wont_be :blank?
+    transaction.should be_persisted
+    transaction.id.should_not be_blank
+    transaction.customer.should_not be_blank
+    transaction.credit_card.should_not be_blank
   end
 
   it 'should be able to capture braintree api errors' do
@@ -78,8 +78,8 @@ describe 'Transaction Integration' do
     transaction = BraintreeRails::Transaction.create!(:amount => (1..10).to_a.sample, :customer => customer)
 
     transaction.void!
-    transaction.submit_for_settlement.must_equal false
-    transaction.errors[:status].wont_be :blank?
+    transaction.submit_for_settlement.should be_false
+    transaction.errors[:status].should_not be_blank
   end
 
   describe BraintreeRails::Transactions do
@@ -90,8 +90,8 @@ describe 'Transaction Integration' do
         credit_card = customer.default_credit_card
 
         transaction = BraintreeRails::Transactions.new(customer).create!(:amount => (1..10).to_a.sample)
-        transaction.customer.must_equal customer
-        transaction.credit_card.must_equal credit_card
+        transaction.customer.should == customer
+        transaction.credit_card.should == credit_card
       end
 
       it 'can use default credit_card to build new record' do
@@ -100,7 +100,7 @@ describe 'Transaction Integration' do
         credit_card = customer.default_credit_card
 
         transaction = BraintreeRails::Transactions.new(credit_card).create!(:amount => (1..10).to_a.sample)
-        transaction.credit_card.must_equal credit_card
+        transaction.credit_card.should == credit_card
       end
     end
 
@@ -109,10 +109,10 @@ describe 'Transaction Integration' do
         customer = BraintreeRails::Customer.create!(customer_hash.merge(:credit_card => credit_card_hash))
         credit_card = customer.credit_cards.create!(credit_card_hash.merge(:token => 'card_1'))
         transactions = customer.transactions
-        transactions.must_be :empty?
+        transactions.should be_empty
 
         transaction = BraintreeRails::Transaction.create!(:amount => (1..10).to_a.sample, :customer => customer, :credit_card => credit_card)
-        transactions.reload.size.must_equal 1
+        transactions.reload.size.should == 1
       end
     end
   end

data/spec/integration/integration_spec_helper.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '../spec_helper'))
+SimpleCov.command_name "spec:integration"
+
+config = File.join(SPEC_PATH, 'config/braintree_auth.yml')
+if File.exist?(config) && auth = YAML.load_file(config)
+  BraintreeRails::Configuration.environment = :sandbox
+  BraintreeRails::Configuration.merchant_id = auth['merchant_id']
+  BraintreeRails::Configuration.public_key = auth['public_key']
+  BraintreeRails::Configuration.private_key = auth['private_key']
+  BraintreeRails::Configuration.default_merchant_account_id = auth['default_merchant_account_id']
+  # BraintreeRails::Configuration.logger = Logger.new('log/braintree.log')
+elsif ENV["TRAVIS_SECURE_ENV_VARS"] == "true" && ENV["TRAVIS_RUBY_VERSION"] == "2.0.0"
+  BraintreeRails::Configuration.environment = :sandbox
+  BraintreeRails::Configuration.merchant_id = ENV['merchant_id']
+  BraintreeRails::Configuration.public_key = ENV['public_key']
+  BraintreeRails::Configuration.private_key = ENV['private_key']
+  BraintreeRails::Configuration.default_merchant_account_id = ENV['default_merchant_account_id']
+else
+  puts '*' * 80
+  puts "You need to provide real credentials in #{config} to run integration tests"
+  puts '*' * 80
+  exit(0)
+end

data/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/test_env'))
+
+SPEC_PATH = File.expand_path(File.dirname(__FILE__))
+FIXTURE_PATH = File.join(SPEC_PATH, 'fixtures')
+
+BraintreeRails::Configuration.environment = :sandbox
+BraintreeRails::Configuration.merchant_id = 'merchant_id'
+BraintreeRails::Configuration.public_key = 'public_key'
+BraintreeRails::Configuration.private_key = 'private_key'
+BraintreeRails::Configuration.default_merchant_account_id = 'default_merchant_account_id'
+BraintreeRails::Configuration.logger = Logger.new('/dev/null').tap { |logger| logger.level = Logger::INFO }
+BraintreeBaseUri = "https://#{Braintree::Configuration.public_key}:#{Braintree::Configuration.private_key}@api.#{Braintree::Configuration.environment}.braintreegateway.com/merchants/#{Braintree::Configuration.merchant_id}"
+
+Dir[File.join(SPEC_PATH, "support/**/*.rb")].each { |f| require f }
+RSpec.configure do |config|
+  config.include Helper
+end

data/{test/test_helper.rb → spec/support/helper.rb}

@@ -1,16 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/test_env'))
-
-TEST_PATH = File.expand_path(File.dirname(__FILE__))
-FIXTURE_PATH = File.join(TEST_PATH, 'fixtures')
-
-Braintree::Configuration.environment = :sandbox
-Braintree::Configuration.merchant_id = 'merchant_id'
-Braintree::Configuration.public_key = 'public_key'
-Braintree::Configuration.private_key = 'private_key'
-Braintree::Configuration.logger = Logger.new('/dev/null').tap { |logger| logger.level = Logger::INFO }
-BraintreeBaseUri = "https://#{Braintree::Configuration.public_key}:#{Braintree::Configuration.private_key}@#{Braintree::Configuration.environment}.braintreegateway.com/merchants/#{Braintree::Configuration.merchant_id}"
-
-module TestHelper
+module Helper
   def fixture(name)
     File.read(File.join(FIXTURE_PATH, name)).gzip
   end
@@ -28,7 +16,7 @@ module TestHelper
       :street_address => "#{(1000..9999).to_a.sample} Crane Avenue",
       :extended_address => "Suite #{(100..999).to_a.sample}",
       :locality => 'Menlo Park',
-      :region => 'California',
+      :region => 'CA',
       :postal_code => ("00001".."99999").to_a.shuffle.first,
       :country_name => 'United States of America'
     }
@@ -62,15 +50,48 @@ module TestHelper
       :price => ''
     }
   end
-end
 
+  def merchant_account_hash
+    {
+      :master_merchant_account_id => BraintreeRails::Configuration.default_merchant_account_id,
+      :tos_accepted => true,
+      :individual => individual_details_hash,
+      :funding => funding_details_hash,
+      :business => business_details_hash,
+    }
+  end
+
+  def individual_details_hash
+    {
+      :first_name => "Brain",
+      :last_name => "Tree",
+      :email => "braintree-rails@exameple.com",
+      :date_of_birth => "2014-01-01",
+      :address => address_details_hash
+    }
+  end
 
-MiniTest::Unit::TestCase.class_eval do
-  include TestHelper
-end
+  def business_details_hash
+    {
+      :legal_name => "braintree-rails",
+      :dba_name => "braintree-rails",
+      :tax_id => "98-7654321"
+    }
+  end
+
+  def funding_details_hash
+    {
+      :destination => Braintree::MerchantAccount::FundingDestination::Email,
+      :email => "braintree-rails@exameple.com"
+    }
+  end
 
-String.class_eval do
-  def gzip
-    Zlib::GzipWriter.wrap(StringIO.new(gzipped = '')) { |gz| gz.write(self); gzipped }
+  def address_details_hash
+    {
+      :street_address => "#{(1000..9999).to_a.sample} Crane Avenue",
+      :locality => 'Menlo Park',
+      :region => 'CA',
+      :postal_code => ("00001".."99999").to_a.shuffle.first,
+    }
   end
 end

data/spec/support/string_ext.rb

@@ -0,0 +1,5 @@
+String.class_eval do
+  def gzip
+    Zlib::GzipWriter.wrap(StringIO.new(gzipped = '')) { |gz| gz.write(self); gzipped }
+  end
+end

data/{test/unit/braintree_rails/add_on_test.rb → spec/unit/braintree_rails/add_on_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../unit_test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../unit_spec_helper'))
 
 describe BraintreeRails::AddOn do
   before do
@@ -10,10 +10,10 @@ describe BraintreeRails::AddOn do
       braintree_add_on = Braintree::AddOn.all.find { |a| a.id == 'add_on_id' }
       add_on = BraintreeRails::AddOn.new(braintree_add_on)
 
-      add_on.persisted?.must_equal true
-      add_on.never_expires?.must_equal braintree_add_on.never_expires?
+      add_on.should be_persisted
+      add_on.never_expires?.should == braintree_add_on.never_expires?
       BraintreeRails::AddOn.attributes.each do |attribute|
-        add_on.send(attribute).must_equal braintree_add_on.send(attribute)
+        add_on.send(attribute).should == braintree_add_on.send(attribute)
       end
     end
 
@@ -21,9 +21,9 @@ describe BraintreeRails::AddOn do
       braintree_add_on = Braintree::AddOn.all.find { |a| a.id == 'add_on_id' }
       add_on = BraintreeRails::AddOn.new('add_on_id')
 
-      add_on.persisted?.must_equal true
+      add_on.should be_persisted
       BraintreeRails::AddOn.attributes.each do |attribute|
-        add_on.send(attribute).must_equal braintree_add_on.send(attribute)
+        add_on.send(attribute).should == braintree_add_on.send(attribute)
       end
     end
 
@@ -31,9 +31,9 @@ describe BraintreeRails::AddOn do
       braintree_add_on = Braintree::AddOn.all.find { |a| a.id == 'add_on_id' }
       add_on = BraintreeRails::AddOn.find('add_on_id')
 
-      add_on.persisted?.must_equal true
+      add_on.should be_persisted
       BraintreeRails::AddOn.attributes.each do |attribute|
-        add_on.send(attribute).must_equal braintree_add_on.send(attribute)
+        add_on.send(attribute).should == braintree_add_on.send(attribute)
       end
     end
   end
@@ -43,8 +43,8 @@ describe BraintreeRails::AddOn do
       braintree_add_ons = Braintree::AddOn.all
       add_ons = BraintreeRails::AddOn.all
 
-      add_ons.must_be_kind_of(Enumerable)
-      add_ons.size.must_equal braintree_add_ons.size
+      add_ons.should respond_to(:each)
+      add_ons.size.should == braintree_add_ons.size
     end
   end
 end

data/{test/unit/braintree_rails/add_ons_test.rb → spec/unit/braintree_rails/add_ons_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../unit_test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../unit_spec_helper'))
 
 describe BraintreeRails::AddOns do
   before do
@@ -11,12 +11,12 @@ describe BraintreeRails::AddOns do
       braintree_add_ons = braintree_plan.add_ons
       add_ons = BraintreeRails::AddOns.new(BraintreeRails::Plan.find('plan_id'))
 
-      add_ons.size.must_equal braintree_add_ons.size
+      add_ons.size.should == braintree_add_ons.size
 
       braintree_add_ons.each do |braintree_add_on|
         add_on = add_ons.find(braintree_add_on.id)
         BraintreeRails::AddOn.attributes.each do |attribute|
-          add_on.send(attribute).must_equal braintree_add_on.send(attribute)
+          add_on.send(attribute).should == braintree_add_on.send(attribute)
         end
       end
     end
@@ -27,7 +27,7 @@ describe BraintreeRails::AddOns do
       braintree_plan = Braintree::Plan.all.find { |p| p.id == 'plan_id' }
       braintree_add_ons = braintree_plan.add_ons
       add_ons = BraintreeRails::AddOns.new(BraintreeRails::Plan.find('plan_id'))
-      lambda { add_ons.create }.must_raise BraintreeRails::NotSupportedApiException
+      expect { add_ons.create }.to raise_error(BraintreeRails::NotSupportedApiException)
     end
   end
 end

data/spec/unit/braintree_rails/address_details_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '../unit_spec_helper'))
+
+describe BraintreeRails::AddressDetails do
+  describe 'validations' do
+    [:street_address, :locality, :region, :postal_code].each do |attribute|
+      it "requires #{attribute}" do
+        address = BraintreeRails::AddressDetails.new(address_details_hash.merge(attribute => nil))
+        address.should be_invalid
+        address.errors[attribute].should == ["can't be blank"]
+      end
+    end
+  end
+end

data/{test/unit/braintree_rails/address_test.rb → spec/unit/braintree_rails/address_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '../unit_test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../unit_spec_helper'))
 
 describe BraintreeRails::Address do
   describe '#initialize' do
@@ -10,9 +10,9 @@ describe BraintreeRails::Address do
       braintree_address = Braintree::Customer.find('customer_id').addresses.first
       address = BraintreeRails::Address.new(braintree_address)
 
-      address.persisted?.must_equal true
+      address.should be_persisted
       BraintreeRails::Address.attributes.each do |attribute|
-        address.send(attribute).must_equal braintree_address.send(attribute)
+        address.send(attribute).should == braintree_address.send(attribute)
       end
     end
 
@@ -22,29 +22,29 @@ describe BraintreeRails::Address do
       braintree_address = braintree_customer.addresses.first
       address = BraintreeRails::Address.find('customer_id', braintree_address.id)
 
-      address.persisted?.must_equal true
+      address.should be_persisted
       BraintreeRails::Address.attributes.each do |attribute|
-        address.send(attribute).must_equal braintree_address.send(attribute)
+        address.send(attribute).should == braintree_address.send(attribute)
       end
     end
 
     it 'should extract values from hash' do
       address = BraintreeRails::Address.new(:id => 'new_id')
 
-      address.persisted?.must_equal false
-      address.id.must_equal 'new_id'
+      address.should_not be_persisted
+      address.id.should == 'new_id'
     end
 
     it 'should try to extract value from other types' do
       address = BraintreeRails::Address.new(OpenStruct.new(:id => 'foobar', :first_name => 'Foo', :last_name => 'Bar', :persisted? => true))
 
-      address.persisted?.must_equal true
-      address.id.must_equal 'foobar'
-      address.first_name.must_equal 'Foo'
-      address.last_name.must_equal 'Bar'
+      address.should be_persisted
+      address.id.should == 'foobar'
+      address.first_name.should == 'Foo'
+      address.last_name.should == 'Bar'
 
       address = BraintreeRails::Address.new(Object.new)
-      address.persisted?.must_equal false
+      address.should_not be_persisted
     end
   end
 
@@ -52,7 +52,7 @@ describe BraintreeRails::Address do
     it 'should auto set country_name' do
       {:country_code_alpha2 => 'US', :country_code_alpha3 => 'USA', :country_code_numeric => '840'}.each_pair do |key, value|
         address = BraintreeRails::Address.new(key => value)
-        address.country_name.must_equal 'United States of America'
+        address.country_name.should == 'United States of America'
       end
     end
   end
@@ -61,19 +61,19 @@ describe BraintreeRails::Address do
     it 'should load customer for persisted address' do
       stub_braintree_request(:get, '/customers/customer_id', :body => fixture('customer.xml'))
       address = BraintreeRails::Customer.new('customer_id').addresses.first
-      address.customer.persisted?.must_equal true
-      address.customer.id.must_equal 'customer_id'
+      address.customer.should be_persisted
+      address.customer.id.should == 'customer_id'
     end
   end
 
   describe 'full_name' do
     it 'should combine first_name and last_name to form full_name' do
-      BraintreeRails::Address.new(:first_name => "Foo", :last_name => 'Bar').full_name.must_equal "Foo Bar"
+      BraintreeRails::Address.new(:first_name => "Foo", :last_name => 'Bar').full_name.should == "Foo Bar"
     end
 
     it 'should not have extra spaces when first_name or last_name is missing' do
-      BraintreeRails::Address.new(:first_name => "Foo").full_name.must_equal 'Foo'
-      BraintreeRails::Address.new(:last_name => 'Bar').full_name.must_equal 'Bar'
+      BraintreeRails::Address.new(:first_name => "Foo").full_name.should == 'Foo'
+      BraintreeRails::Address.new(:last_name => 'Bar').full_name.should == 'Bar'
     end
   end
 
@@ -82,15 +82,15 @@ describe BraintreeRails::Address do
       it "should validate length of #{attribute}" do
         address = BraintreeRails::Address.new(attribute => 'f')
         address.valid?
-        address.errors[attribute].must_be :blank?
+        address.errors[attribute].should be_blank
 
         address = BraintreeRails::Address.new(attribute => 'f' * 255)
         address.valid?
-        address.errors[attribute].must_be :blank?
+        address.errors[attribute].should be_blank
 
         address = BraintreeRails::Address.new(attribute => 'foo' * 256)
         address.valid?
-        address.errors[attribute].wont_be :blank?
+        address.errors[attribute].should_not be_blank
       end
     end
 
@@ -98,29 +98,29 @@ describe BraintreeRails::Address do
       it "should validate presence of #{attribute}" do
         address = BraintreeRails::Address.new(attribute => 'foo')
         address.valid?
-        address.errors[attribute].must_be :blank?
+        address.errors[attribute].should be_blank
 
         address = BraintreeRails::Address.new
         address.valid?
-        address.errors[attribute].wont_be :blank?
+        address.errors[attribute].should_not be_blank
       end
     end
 
     it 'should validate format of postal_code' do
       address = BraintreeRails::Address.new({:postal_code => 'CA 94025'})
       address.valid?
-      address.errors[:postal_code].must_be :blank?
+      address.errors[:postal_code].should be_blank
 
       address = BraintreeRails::Address.new({:postal_code => '%$'})
       address.valid?
-      address.errors[:postal_code].wont_be :blank?
+      address.errors[:postal_code].should_not be_blank
     end
   end
 
   [BraintreeRails::BillingAddress, BraintreeRails::ShippingAddress].each do |subclass|
     describe subclass do
       it 'should have braintree_model_class to be Braintree::Address' do
-        subclass.braintree_model_class.must_equal Braintree::Address
+        subclass.braintree_model_class.should == Braintree::Address
       end
     end
   end