braintree 2.2.0 → 2.3.1

data/spec/integration/braintree/credit_card_spec.rb

@@ -58,7 +58,7 @@ describe Braintree::CreditCard do
       credit_card.expiration_date.should == "05/2009"
     end
 
-    it "verifes the credit card if options[verify_card]=true" do
+    it "verifies the credit card if options[verify_card]=true" do
       customer = Braintree::Customer.create!
       result = Braintree::CreditCard.create(
         :customer_id => customer.id,
@@ -76,6 +76,21 @@ describe Braintree::CreditCard do
       result.credit_card_verification.avs_street_address_response_code.should == "I"
     end
 
+    it "allows user to specify merchant account for verification" do
+      customer = Braintree::Customer.create!
+      result = Braintree::CreditCard.create(
+        :customer_id => customer.id,
+        :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::Visa,
+        :expiration_date => "05/2009",
+        :options => {
+          :verify_card => true,
+          :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId
+        }
+      )
+      result.success?.should == false
+      result.credit_card_verification.merchant_account_id.should == SpecHelper::NonDefaultMerchantAccountId
+    end
+
     it "does not verify the card if options[verify_card]=false" do
       customer = Braintree::Customer.create!
       result = Braintree::CreditCard.create(
@@ -230,7 +245,7 @@ describe Braintree::CreditCard do
         }
       }
       tr_data = Braintree::TransparentRedirect.create_credit_card_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(Braintree::CreditCard.create_credit_card_url, tr_data, params)
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::CreditCard.create_credit_card_url)
       result = Braintree::CreditCard.create_from_transparent_redirect(query_string_response)
       result.success?.should == true
       credit_card = result.credit_card
@@ -267,7 +282,7 @@ describe Braintree::CreditCard do
         }
       }
       tr_data = Braintree::TransparentRedirect.create_credit_card_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(Braintree::CreditCard.create_credit_card_url, tr_data, params)
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::CreditCard.create_credit_card_url)
       result = Braintree::CreditCard.create_from_transparent_redirect(query_string_response)
       result.success?.should == true
       card2 = result.credit_card
@@ -291,7 +306,7 @@ describe Braintree::CreditCard do
         }
       }
       tr_data = Braintree::TransparentRedirect.create_credit_card_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(Braintree::CreditCard.create_credit_card_url, tr_data, params)
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::CreditCard.create_credit_card_url)
       result = Braintree::CreditCard.create_from_transparent_redirect(query_string_response)
       result.success?.should == false
       result.params[:customer_id] == customer.id
@@ -566,7 +581,7 @@ describe Braintree::CreditCard do
         }
       }
       tr_data = Braintree::TransparentRedirect.update_credit_card_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(Braintree::CreditCard.update_credit_card_url, tr_data, params)
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::CreditCard.update_credit_card_url)
       result = Braintree::CreditCard.update_from_transparent_redirect(query_string_response)
       result.success?.should == true
       credit_card = result.credit_card
@@ -604,7 +619,7 @@ describe Braintree::CreditCard do
         :payment_method_token => card2.token
       }
       tr_data = Braintree::TransparentRedirect.update_credit_card_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(Braintree::CreditCard.update_credit_card_url, tr_data, params)
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::CreditCard.update_credit_card_url)
       result = Braintree::CreditCard.update_from_transparent_redirect(query_string_response)
 
       Braintree::CreditCard.find(card1.token).should_not be_default
@@ -919,6 +934,33 @@ describe Braintree::CreditCard do
       update_result.credit_card_verification.status.should == Braintree::Transaction::Status::ProcessorDeclined
     end
 
+    it "allows user to specify merchant account for verification" do
+      customer = Braintree::Customer.create!
+      credit_card = Braintree::CreditCard.create!(
+        :cardholder_name => "Original Holder",
+        :customer_id => customer.id,
+        :cvv => "123",
+        :number => Braintree::Test::CreditCardNumbers::Visa,
+        :expiration_date => "05/2012"
+      )
+      update_result = credit_card.update(
+        :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::Visa,
+        :expiration_date => "05/2009",
+        :options => {
+          :verify_card => true,
+          :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId
+        }
+      )
+      update_result.success?.should == false
+      update_result.credit_card_verification.status.should == Braintree::Transaction::Status::ProcessorDeclined
+      update_result.credit_card_verification.processor_response_code.should == "2000"
+      update_result.credit_card_verification.processor_response_text.should == "Do Not Honor"
+      update_result.credit_card_verification.cvv_response_code.should == "I"
+      update_result.credit_card_verification.avs_error_response_code.should == nil
+      update_result.credit_card_verification.avs_postal_code_response_code.should == "I"
+      update_result.credit_card_verification.avs_street_address_response_code.should == "I"
+    end
+
     it "can update the billing address" do
       customer = Braintree::Customer.create!
       credit_card = Braintree::CreditCard.create!(

data/spec/integration/braintree/customer_spec.rb

@@ -109,6 +109,23 @@ describe Braintree::Customer do
       result.credit_card_verification.status.should == Braintree::Transaction::Status::ProcessorDeclined
     end
 
+    it "allows the user to specify the merchant account for verification" do
+      result = Braintree::Customer.create(
+        :first_name => "Mike",
+        :last_name => "Jones",
+        :credit_card => {
+          :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::MasterCard,
+          :expiration_date => "05/2010",
+          :options => {
+            :verify_card => true,
+            :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId
+          }
+        }
+      )
+      result.success?.should == false
+      result.credit_card_verification.status.should == Braintree::Transaction::Status::ProcessorDeclined
+    end
+
     it "can create a customer, payment method, and billing address at the same time" do
       result = Braintree::Customer.create(
         :first_name => "Mike",
@@ -410,7 +427,7 @@ describe Braintree::Customer do
       }
 
       tr_data = Braintree::TransparentRedirect.create_customer_data({:redirect_url => "http://example.com"}.merge({}))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(Braintree::Customer.create_customer_url, tr_data, params)
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::Customer.create_customer_url)
       result = Braintree::Customer.create_from_transparent_redirect(query_string_response)
 
       result.success?.should == true
@@ -440,7 +457,7 @@ describe Braintree::Customer do
       }
 
       tr_data = Braintree::TransparentRedirect.create_customer_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(Braintree::Customer.create_customer_url, tr_data, {})
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, {}, Braintree::Customer.create_customer_url)
       result = Braintree::Customer.create_from_transparent_redirect(query_string_response)
 
       result.success?.should == true
@@ -554,6 +571,46 @@ describe Braintree::Customer do
       result.customer.custom_fields[:store_me].should == "a value"
     end
 
+    it "can update the customer, credit card, and billing address in one request" do
+      customer = Braintree::Customer.create!(
+        :first_name => "Joe",
+        :credit_card => {
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "12/2009",
+          :billing_address => {
+            :first_name => "Joe",
+            :postal_code => "60622"
+          }
+        }
+      )
+
+      result = Braintree::Customer.update(
+        customer.id,
+        :first_name => "New Joe",
+        :credit_card => {
+          :cardholder_name => "New Joe Cardholder",
+          :options => { :update_existing_token => customer.credit_cards.first.token },
+          :billing_address => {
+            :last_name => "Cool",
+            :postal_code => "60666",
+            :options => { :update_existing => true }
+          }
+        }
+      )
+      result.success?.should == true
+      result.customer.id.should == customer.id
+      result.customer.first_name.should == "New Joe"
+
+      result.customer.credit_cards.size.should == 1
+      credit_card = result.customer.credit_cards.first
+      credit_card.bin.should == Braintree::Test::CreditCardNumbers::Visa.slice(0, 6)
+      credit_card.cardholder_name.should == "New Joe Cardholder"
+
+      credit_card.billing_address.first_name.should == "Joe"
+      credit_card.billing_address.last_name.should == "Cool"
+      credit_card.billing_address.postal_code.should == "60666"
+    end
+
     it "returns an error response if invalid" do
       customer = Braintree::Customer.create!(:email => "valid@email.com")
       result = Braintree::Customer.update(
@@ -672,7 +729,7 @@ describe Braintree::Customer do
       }
 
       tr_data = Braintree::TransparentRedirect.update_customer_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(Braintree::Customer.update_customer_url, tr_data, params)
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::Customer.update_customer_url)
       result = Braintree::Customer.update_from_transparent_redirect(query_string_response)
 
       result.success?.should == true
@@ -687,6 +744,73 @@ describe Braintree::Customer do
       customer.website.should == "new.website.com"
     end
 
+    it "returns a successful result when updating an existing credit card" do
+      result = Braintree::Customer.create(
+        :first_name => "Old First",
+        :last_name => "Old Last",
+        :company => "Old Company",
+        :email => "old@email.com",
+        :phone => "000.111.2222",
+        :fax => "000.222.3333",
+        :website => "old.website.com",
+        :credit_card => {
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "12/2009",
+          :billing_address => {
+            :first_name => "Joe",
+            :postal_code => "60622"
+          }
+        }
+      )
+      result.success?.should == true
+      original_customer = result.customer
+
+      tr_data_params = {
+        :customer_id => original_customer.id,
+        :customer => {
+          :first_name => "New First",
+          :last_name => "New Last",
+          :company => "New Company",
+          :email => "new@email.com",
+          :phone => "888.111.2222",
+          :fax => "999.222.3333",
+          :website => "new.website.com",
+          :credit_card => {
+            :cardholder_name => "New Joe Cardholder",
+            :options => { :update_existing_token => original_customer.credit_cards.first.token },
+            :billing_address => {
+              :last_name => "Cool",
+              :postal_code => "60666",
+              :options => { :update_existing => true }
+            }
+          }
+        }
+      }
+
+      tr_data = Braintree::TransparentRedirect.update_customer_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, {}, Braintree::Customer.update_customer_url)
+      result = Braintree::Customer.update_from_transparent_redirect(query_string_response)
+
+      result.success?.should == true
+      customer = result.customer
+      customer.id.should == original_customer.id
+      customer.first_name.should == "New First"
+      customer.last_name.should == "New Last"
+      customer.company.should == "New Company"
+      customer.email.should == "new@email.com"
+      customer.phone.should == "888.111.2222"
+      customer.fax.should == "999.222.3333"
+      customer.website.should == "new.website.com"
+
+      credit_card = customer.credit_cards.first
+      credit_card.bin.should == Braintree::Test::CreditCardNumbers::Visa.slice(0, 6)
+      credit_card.cardholder_name.should == "New Joe Cardholder"
+
+      credit_card.billing_address.first_name.should == "Joe"
+      credit_card.billing_address.last_name.should == "Cool"
+      credit_card.billing_address.postal_code.should == "60666"
+    end
+
     it "can pass any attribute through tr_data" do
       original_customer = Braintree::Customer.create!(
         :first_name => "Old First",
@@ -713,7 +837,7 @@ describe Braintree::Customer do
       }
 
       tr_data = Braintree::TransparentRedirect.update_customer_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(Braintree::Customer.update_customer_url, tr_data, {})
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, {}, Braintree::Customer.update_customer_url)
       result = Braintree::Customer.update_from_transparent_redirect(query_string_response)
 
       result.success?.should == true

data/spec/{unit → integration}/braintree/ssl_expiration_check_spec.rb

@@ -10,7 +10,6 @@ end
 
 describe Braintree::SSLExpirationCheck do
   SANDBOX = "sandbox.braintreegateway.com"
-  QA = "qa.braintreegateway.com"
   PRODUCTION = "www.braintreegateway.com"
 
   describe "check_dates" do
@@ -18,9 +17,9 @@ describe Braintree::SSLExpirationCheck do
       Braintree::SSLExpirationCheck.ssl_expiration_dates_checked.should == true
     end
 
-    describe "QA Cert" do
+    describe "Sandbox Cert" do
       it "logs when the cert is expired" do
-        Braintree::SSLExpirationCheck.stub(:qa_expiration_date).and_return(Date.today - 1)
+        Braintree::SSLExpirationCheck.stub(:sandbox_expiration_date).and_return(Date.today - 1)
 
         output = StringIO.new
         Braintree::Configuration.logger = Logger.new(output)
@@ -28,22 +27,22 @@ describe Braintree::SSLExpirationCheck do
 
         Braintree::SSLExpirationCheck.check_dates
 
-        output.string.should match(/\[Braintree\] The SSL Certificate for the QA environment will expire on \d{4}-\d{2}-\d{2}\. Please check for an updated client library\./)
+        output.string.should match(/\[Braintree\] The SSL Certificate for the Sandbox environment will expire on \d{4}-\d{2}-\d{2}\. Please check for an updated client library\./)
       end
 
       it "logs when the cert is close to expiring" do
-        Braintree::SSLExpirationCheck.stub(:qa_expiration_date).and_return(Date.today)
+        Braintree::SSLExpirationCheck.stub(:sandbox_expiration_date).and_return(Date.today)
         output = StringIO.new
         Braintree::Configuration.logger = Logger.new(output)
         Braintree::Configuration.logger.level = Logger::WARN
 
         Braintree::SSLExpirationCheck.check_dates
 
-        output.string.should match(/\[Braintree\] The SSL Certificate for the QA environment will expire on \d{4}-\d{2}-\d{2}\. Please check for an updated client library\./)
+        output.string.should match(/\[Braintree\] The SSL Certificate for the Sandbox environment will expire on \d{4}-\d{2}-\d{2}\. Please check for an updated client library\./)
       end
 
       it "doesn't log when the cert is not expired" do
-        Braintree::SSLExpirationCheck.stub(:qa_expiration_date).and_return(Date.today + 365)
+        Braintree::SSLExpirationCheck.stub(:sandbox_expiration_date).and_return(Date.today + 365)
         output = StringIO.new
         Braintree::Configuration.logger = Logger.new(output)
         Braintree::Configuration.logger.level = Logger::WARN
@@ -85,13 +84,6 @@ describe Braintree::SSLExpirationCheck do
     end
   end
 
-  describe "qa_expiration_date" do
-    it "is the date the QA cert expires" do
-      Braintree::SSLExpirationCheck.qa_expiration_date.should be_a(Date)
-      Braintree::SSLExpirationCheck.qa_expiration_date.should == fetch_expiration_date(QA)
-    end
-  end
-
   describe "sandbox_expiration_date" do
     it "is the date the Sandbox cert expires" do
       Braintree::SSLExpirationCheck.sandbox_expiration_date.should be_a(Date)

data/spec/integration/braintree/subscription_spec.rb

@@ -20,9 +20,9 @@ describe Braintree::Subscription do
   before(:each) do
     @credit_card = Braintree::Customer.create!(
       :credit_card => {
-      :number => Braintree::Test::CreditCardNumbers::Visa,
-      :expiration_date => "05/2010"
-    }
+        :number => Braintree::Test::CreditCardNumbers::Visa,
+        :expiration_date => "05/2010"
+      }
     ).credit_cards[0]
   end
 
@@ -141,6 +141,7 @@ describe Braintree::Subscription do
           result.subscription.transactions.first.should be_a(Braintree::Transaction)
           result.subscription.transactions.first.amount.should == TriallessPlan[:price]
           result.subscription.transactions.first.type.should == Braintree::Transaction::Type::Sale
+          result.subscription.transactions.first.subscription_id.should == result.subscription.id
         end
 
         it "doesn't create a transaction if there's a trial period" do
@@ -257,15 +258,27 @@ describe Braintree::Subscription do
       ).subscription
     end
 
-    context "merchant_account_id" do
-      it "allows changing the merchant_account_id" do
-        result = Braintree::Subscription.update(@subscription.id,
-          :merchant_account_id => SpecHelper::NonDefaultMerchantAccountId
-        )
+    it "allows changing the merchant_account_id" do
+      result = Braintree::Subscription.update(@subscription.id,
+        :merchant_account_id => SpecHelper::NonDefaultMerchantAccountId
+      )
 
-        result.success?.should == true
-        result.subscription.merchant_account_id.should == SpecHelper::NonDefaultMerchantAccountId
-      end
+      result.success?.should == true
+      result.subscription.merchant_account_id.should == SpecHelper::NonDefaultMerchantAccountId
+    end
+
+    it "allows changing the payment_method_token" do
+      new_credit_card = Braintree::CreditCard.create!(
+        :customer_id => @credit_card.customer_id,
+        :number => Braintree::Test::CreditCardNumbers::Visa,
+        :expiration_date => "05/2010"
+      )
+
+      result = Braintree::Subscription.update(@subscription.id,
+        :payment_method_token => new_credit_card.token
+      )
+
+      result.subscription.payment_method_token.should == new_credit_card.token
     end
 
     context "when successful" do

data/spec/integration/braintree/transaction_spec.rb

@@ -344,6 +344,7 @@ describe Braintree::Transaction do
       transaction.type.should == "sale"
       transaction.status.should == Braintree::Transaction::Status::Authorized
       transaction.amount.should == BigDecimal.new("100.00")
+      transaction.currency_iso_code.should == "USD"
       transaction.order_id.should == "123"
       transaction.processor_response_code.should == "1000"
       transaction.created_at.between?(Time.now - 60, Time.now).should == true
@@ -804,7 +805,7 @@ describe Braintree::Transaction do
         }
       }
       tr_data = Braintree::TransparentRedirect.transaction_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(Braintree::Transaction.create_transaction_url, tr_data, params)
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::Transaction.create_transaction_url)
       result = Braintree::Transaction.create_from_transparent_redirect(query_string_response)
 
       result.success?.should == true
@@ -833,7 +834,7 @@ describe Braintree::Transaction do
         }
       }
       tr_data = Braintree::TransparentRedirect.transaction_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(Braintree::Transaction.create_transaction_url, tr_data, params)
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::Transaction.create_transaction_url)
 
       expect do
         Braintree::Transaction.create_from_transparent_redirect(query_string_response)
@@ -889,7 +890,7 @@ describe Braintree::Transaction do
         }
       }
       tr_data = Braintree::TransparentRedirect.transaction_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(Braintree::Transaction.create_transaction_url, tr_data, params)
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::Transaction.create_transaction_url)
       result = Braintree::Transaction.create_from_transparent_redirect(query_string_response)
 
       transaction = result.transaction
@@ -953,7 +954,7 @@ describe Braintree::Transaction do
         }
       }
       tr_data = Braintree::TransparentRedirect.transaction_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(Braintree::Transaction.create_transaction_url, tr_data, params)
+      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::Transaction.create_transaction_url)
       result = Braintree::Transaction.create_from_transparent_redirect(query_string_response)
 
       result.success?.should == false
@@ -1068,6 +1069,21 @@ describe Braintree::Transaction do
       result.new_transaction.type.should == "credit"
     end
 
+    it "assigns the refund_id on the original transaction" do
+      transaction = create_transaction_to_refund
+      refund_transaction = transaction.refund.new_transaction
+      transaction = Braintree::Transaction.find(transaction.id)
+
+      transaction.refund_id.should == refund_transaction.id
+    end
+
+    it "assigns the refunded_transaction_id to the original transaction" do
+      transaction = create_transaction_to_refund
+      refund_transaction = transaction.refund.new_transaction
+
+      refund_transaction.refunded_transaction_id.should == transaction.id
+    end
+
     it "returns an error if already refunded" do
       transaction = create_transaction_to_refund
       result = transaction.refund