braintree 2.74.0 → 4.12.0

data/spec/integration/braintree/payment_method_spec.rb

@@ -1,6 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require File.expand_path(File.dirname(__FILE__) + "/client_api/spec_helper")
 
+def make_token
+ SecureRandom.uuid
+end
+
 describe Braintree::PaymentMethod do
   describe "self.create" do
     it "creates a payment method from a vaulted credit card nonce" do
@@ -13,20 +17,20 @@ describe Braintree::PaymentMethod do
         config,
         :authorization_fingerprint => authorization_fingerprint,
         :shared_customer_identifier => "fake_identifier",
-        :shared_customer_identifier_type => "testing"
+        :shared_customer_identifier_type => "testing",
       )
 
       response = http.create_credit_card(
         :number => 4111111111111111,
         :expirationMonth => 12,
-        :expirationYear => 2020
+        :expirationYear => 2020,
       )
       response.code.should == "201"
 
       nonce = JSON.parse(response.body)["creditCards"].first["nonce"]
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
 
       result.should be_success
@@ -47,21 +51,21 @@ describe Braintree::PaymentMethod do
         config,
         :authorization_fingerprint => authorization_fingerprint,
         :shared_customer_identifier => "fake_identifier",
-        :shared_customer_identifier_type => "testing"
+        :shared_customer_identifier_type => "testing",
       )
 
       response = http.create_credit_card(
         :number => "4111111111111111",
         :expirationMonth => "12",
         :expirationYear => "2020",
-        :options => {:validate => false}
+        :options => {:validate => false},
       )
       response.code.should == "202"
 
       nonce = JSON.parse(response.body)["creditCards"].first["nonce"]
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
 
       result.should be_success
@@ -78,13 +82,14 @@ describe Braintree::PaymentMethod do
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => Braintree::Test::Nonce::ApplePayAmEx,
         :customer_id => customer.id,
-        :token => token
+        :token => token,
       )
 
       result.should be_success
       apple_pay_card = result.payment_method
       apple_pay_card.should be_a(Braintree::ApplePayCard)
       apple_pay_card.should_not be_nil
+      apple_pay_card.bin.should_not be_nil
       apple_pay_card.token.should == token
       apple_pay_card.card_type.should == Braintree::ApplePayCard::CardType::AmEx
       apple_pay_card.payment_instrument_name.should == "AmEx 41002"
@@ -94,87 +99,89 @@ describe Braintree::PaymentMethod do
       apple_pay_card.expiration_month.to_i.should > 0
       apple_pay_card.expiration_year.to_i.should > 0
       apple_pay_card.customer_id.should == customer.id
+      apple_pay_card.commercial.should_not be_nil
+      apple_pay_card.country_of_issuance.should_not be_nil
+      apple_pay_card.debit.should_not be_nil
+      apple_pay_card.durbin_regulated.should_not be_nil
+      apple_pay_card.healthcare.should_not be_nil
+      apple_pay_card.issuing_bank.should_not be_nil
+      apple_pay_card.payroll.should_not be_nil
+      apple_pay_card.prepaid.should_not be_nil
+      apple_pay_card.product_id.should_not be_nil
     end
 
-    it "creates a payment method from a fake android pay proxy card nonce" do
-      customer = Braintree::Customer.create.customer
-      token = SecureRandom.hex(16)
-      result = Braintree::PaymentMethod.create(
-        :payment_method_nonce => Braintree::Test::Nonce::AndroidPayDiscover,
-        :customer_id => customer.id,
-        :token => token
-      )
-
-      result.should be_success
-      android_pay_card = result.payment_method
-      android_pay_card.should be_a(Braintree::AndroidPayCard)
-      android_pay_card.should_not be_nil
-      android_pay_card.token.should == token
-      android_pay_card.card_type.should == Braintree::CreditCard::CardType::Discover
-      android_pay_card.virtual_card_type.should == Braintree::CreditCard::CardType::Discover
-      android_pay_card.expiration_month.to_i.should > 0
-      android_pay_card.expiration_year.to_i.should > 0
-      android_pay_card.default.should == true
-      android_pay_card.image_url.should =~ /android_pay/
-      android_pay_card.source_card_type.should == Braintree::CreditCard::CardType::Visa
-      android_pay_card.source_card_last_4.should == "1111"
-      android_pay_card.google_transaction_id.should == "google_transaction_id"
-      android_pay_card.source_description.should == "Visa 1111"
-      android_pay_card.customer_id.should == customer.id
-    end
-
-    it "creates a payment method from a android pay network token nonce" do
+    it "creates a payment method from a fake google pay proxy card nonce" do
       customer = Braintree::Customer.create.customer
       token = SecureRandom.hex(16)
       result = Braintree::PaymentMethod.create(
-        :payment_method_nonce => Braintree::Test::Nonce::AndroidPayMasterCard,
+        :payment_method_nonce => Braintree::Test::Nonce::GooglePayDiscover,
         :customer_id => customer.id,
-        :token => token
+        :token => token,
       )
 
       result.should be_success
-      android_pay_card = result.payment_method
-      android_pay_card.should be_a(Braintree::AndroidPayCard)
-      android_pay_card.should_not be_nil
-      android_pay_card.token.should == token
-      android_pay_card.card_type.should == Braintree::CreditCard::CardType::MasterCard
-      android_pay_card.virtual_card_type.should == Braintree::CreditCard::CardType::MasterCard
-      android_pay_card.expiration_month.to_i.should > 0
-      android_pay_card.expiration_year.to_i.should > 0
-      android_pay_card.default.should == true
-      android_pay_card.image_url.should =~ /android_pay/
-      android_pay_card.source_card_type.should == Braintree::CreditCard::CardType::MasterCard
-      android_pay_card.source_card_last_4.should == "4444"
-      android_pay_card.google_transaction_id.should == "google_transaction_id"
-      android_pay_card.source_description.should == "MasterCard 4444"
-      android_pay_card.customer_id.should == customer.id
+      google_pay_card = result.payment_method
+      google_pay_card.should be_a(Braintree::GooglePayCard)
+      google_pay_card.should_not be_nil
+      google_pay_card.token.should == token
+      google_pay_card.card_type.should == Braintree::CreditCard::CardType::Discover
+      google_pay_card.virtual_card_type.should == Braintree::CreditCard::CardType::Discover
+      google_pay_card.expiration_month.to_i.should > 0
+      google_pay_card.expiration_year.to_i.should > 0
+      google_pay_card.default.should == true
+      google_pay_card.image_url.should =~ /android_pay/
+      google_pay_card.is_network_tokenized?.should == false
+      google_pay_card.source_card_type.should == Braintree::CreditCard::CardType::Discover
+      google_pay_card.source_card_last_4.should == "1111"
+      google_pay_card.google_transaction_id.should == "google_transaction_id"
+      google_pay_card.source_description.should == "Discover 1111"
+      google_pay_card.customer_id.should == customer.id
+      google_pay_card.commercial.should_not be_nil
+      google_pay_card.country_of_issuance.should_not be_nil
+      google_pay_card.debit.should_not be_nil
+      google_pay_card.durbin_regulated.should_not be_nil
+      google_pay_card.healthcare.should_not be_nil
+      google_pay_card.issuing_bank.should_not be_nil
+      google_pay_card.payroll.should_not be_nil
+      google_pay_card.prepaid.should_not be_nil
+      google_pay_card.product_id.should_not be_nil
     end
 
-    it "creates a payment method from an amex express checkout card nonce" do
+    it "creates a payment method from a google pay network token nonce" do
       customer = Braintree::Customer.create.customer
       token = SecureRandom.hex(16)
       result = Braintree::PaymentMethod.create(
-        :payment_method_nonce => Braintree::Test::Nonce::AmexExpressCheckout,
+        :payment_method_nonce => Braintree::Test::Nonce::GooglePayMasterCard,
         :customer_id => customer.id,
-        :token => token
+        :token => token,
       )
 
       result.should be_success
-      amex_express_checkout_card = result.payment_method
-      amex_express_checkout_card.should be_a(Braintree::AmexExpressCheckoutCard)
-      amex_express_checkout_card.should_not be_nil
-
-      amex_express_checkout_card.default.should == true
-      amex_express_checkout_card.card_type.should == "American Express"
-      amex_express_checkout_card.token.should == token
-      amex_express_checkout_card.bin.should =~ /\A\d{6}\z/
-      amex_express_checkout_card.expiration_month.should =~ /\A\d{2}\z/
-      amex_express_checkout_card.expiration_year.should =~ /\A\d{4}\z/
-      amex_express_checkout_card.card_member_number.should =~ /\A\d{4}\z/
-      amex_express_checkout_card.card_member_expiry_date.should =~ /\A\d{2}\/\d{2}\z/
-      amex_express_checkout_card.image_url.should include(".png")
-      amex_express_checkout_card.source_description.should =~ /\AAmEx \d{4}\z/
-      amex_express_checkout_card.customer_id.should == customer.id
+      google_pay_card = result.payment_method
+      google_pay_card.should be_a(Braintree::GooglePayCard)
+      google_pay_card.should_not be_nil
+      google_pay_card.token.should == token
+      google_pay_card.card_type.should == Braintree::CreditCard::CardType::MasterCard
+      google_pay_card.virtual_card_type.should == Braintree::CreditCard::CardType::MasterCard
+      google_pay_card.expiration_month.to_i.should > 0
+      google_pay_card.expiration_year.to_i.should > 0
+      google_pay_card.default.should == true
+      google_pay_card.image_url.should =~ /android_pay/
+      google_pay_card.is_network_tokenized?.should == true
+      google_pay_card.source_card_type.should == Braintree::CreditCard::CardType::MasterCard
+      google_pay_card.source_card_last_4.should == "4444"
+      google_pay_card.google_transaction_id.should == "google_transaction_id"
+      google_pay_card.source_description.should == "MasterCard 4444"
+      google_pay_card.customer_id.should == customer.id
+      google_pay_card.commercial.should_not be_nil
+      google_pay_card.country_of_issuance.should_not be_nil
+      google_pay_card.debit.should_not be_nil
+      google_pay_card.durbin_regulated.should_not be_nil
+      google_pay_card.healthcare.should_not be_nil
+      google_pay_card.issuing_bank.should_not be_nil
+      google_pay_card.payroll.should_not be_nil
+      google_pay_card.prepaid.should_not be_nil
+      google_pay_card.product_id.should_not be_nil
     end
 
     it "creates a payment method from venmo account nonce" do
@@ -183,7 +190,7 @@ describe Braintree::PaymentMethod do
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => Braintree::Test::Nonce::VenmoAccount,
         :customer_id => customer.id,
-        :token => token
+        :token => token,
       )
 
       result.should be_success
@@ -193,7 +200,7 @@ describe Braintree::PaymentMethod do
       venmo_account.default.should == true
       venmo_account.token.should == token
       venmo_account.username.should == "venmojoe"
-      venmo_account.venmo_user_id.should == "Venmo-Joe-1"
+      venmo_account.venmo_user_id.should == "1234567891234567891"
       venmo_account.image_url.should include(".png")
       venmo_account.source_description.should == "Venmo Account: venmojoe"
       venmo_account.customer_id.should == customer.id
@@ -205,7 +212,7 @@ describe Braintree::PaymentMethod do
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::Visa,
         :expiration_date => "05/2009",
-        :cvv => "100"
+        :cvv => "100",
       )
       result.success?.should == true
       original_payment_method = result.credit_card
@@ -215,7 +222,7 @@ describe Braintree::PaymentMethod do
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
         :customer_id => customer.id,
-        :options => {:make_default => true}
+        :options => {:make_default => true},
       )
 
       result.should be_success
@@ -226,16 +233,16 @@ describe Braintree::PaymentMethod do
     it "overrides the token in the nonce" do
       customer = Braintree::Customer.create!
 
-      first_token = "FIRST_TOKEN_#{rand(36**3).to_s(36)}"
-      second_token = "SECOND_TOKEN_#{rand(36**3).to_s(36)}"
+      first_token = make_token
+      second_token = make_token
       nonce = nonce_for_paypal_account(
         :consent_code => "PAYPAL_CONSENT_CODE",
-        :token => first_token
+        :token => first_token,
       )
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
         :customer_id => customer.id,
-        :token => second_token
+        :token => second_token,
       )
 
       result.should be_success
@@ -249,7 +256,7 @@ describe Braintree::PaymentMethod do
           :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::Visa,
           :expiration_month => "11",
           :expiration_year => "2099",
-        }
+        },
       )
       customer = Braintree::Customer.create!
       result = Braintree::PaymentMethod.create(
@@ -258,7 +265,7 @@ describe Braintree::PaymentMethod do
         :options => {
           :verify_card => true,
           :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId
-        }
+        },
       )
 
       result.should_not be_success
@@ -274,7 +281,7 @@ describe Braintree::PaymentMethod do
           :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::Visa,
           :expiration_month => "11",
           :expiration_year => "2099",
-        }
+        },
       )
       customer = Braintree::Customer.create!
       result = Braintree::PaymentMethod.create(
@@ -283,14 +290,79 @@ describe Braintree::PaymentMethod do
         :options => {
           :verify_card => true,
           :verification_amount => "100.00"
-        }
+        },
       )
 
       result.should_not be_success
       result.credit_card_verification.status.should == Braintree::Transaction::Status::ProcessorDeclined
       result.credit_card_verification.processor_response_code.should == "2000"
       result.credit_card_verification.processor_response_text.should == "Do Not Honor"
-      result.credit_card_verification.amount.should == BigDecimal.new("100.00")
+      result.credit_card_verification.amount.should == BigDecimal("100.00")
+    end
+
+    it "validates presence of three_d_secure_version in 3ds pass thru params" do
+      customer = Braintree::Customer.create!
+      result = Braintree::PaymentMethod.create(
+        :customer_id => customer.id,
+        :payment_method_nonce => Braintree::Test::Nonce::Transactable,
+        :three_d_secure_pass_thru => {
+          :eci_flag => "02",
+          :cavv => "some_cavv",
+          :xid => "some_xid",
+          :three_d_secure_version => "xx",
+          :authentication_response => "Y",
+          :directory_response => "Y",
+          :cavv_algorithm => "2",
+          :ds_transaction_id => "some_ds_transaction_id",
+        },
+        :options => {:verify_card => true},
+      )
+      expect(result).not_to be_success
+      error = result.errors.for(:verification).first
+      expect(error.code).to eq(Braintree::ErrorCodes::Verification::ThreeDSecurePassThru::ThreeDSecureVersionIsInvalid)
+      expect(error.message).to eq("The version of 3D Secure authentication must be composed only of digits and separated by periods (e.g. `1.0.2`).")
+    end
+
+    it "accepts three_d_secure pass thru params in the request" do
+      customer = Braintree::Customer.create!
+      result = Braintree::PaymentMethod.create(
+        :customer_id => customer.id,
+        :payment_method_nonce => Braintree::Test::Nonce::Transactable,
+        :three_d_secure_pass_thru => {
+          :eci_flag => "02",
+          :cavv => "some_cavv",
+          :xid => "some_xid",
+          :three_d_secure_version => "1.0.2",
+          :authentication_response => "Y",
+          :directory_response => "Y",
+          :cavv_algorithm => "2",
+          :ds_transaction_id => "some_ds_transaction_id",
+        },
+        :options => {:verify_card => true},
+      )
+
+      expect(result).to be_success
+    end
+
+    it "returns 3DS info on cc verification" do
+      customer = Braintree::Customer.create.customer
+      result = Braintree::PaymentMethod.create(
+        :payment_method_nonce => Braintree::Test::Nonce::ThreeDSecureVisaFullAuthentication,
+        :options => {:verify_card => true},
+        :customer_id => customer.id,
+      )
+      result.success?.should == true
+
+      three_d_secure_info = result.payment_method.verification.three_d_secure_info
+      three_d_secure_info.enrolled.should == "Y"
+      three_d_secure_info.should be_liability_shifted
+      three_d_secure_info.should be_liability_shift_possible
+      three_d_secure_info.status.should == "authenticate_successful"
+      three_d_secure_info.cavv.should == "cavv_value"
+      three_d_secure_info.xid.should == "xid_value"
+      three_d_secure_info.eci_flag.should == "05"
+      three_d_secure_info.three_d_secure_version.should == "1.0.2"
+      three_d_secure_info.ds_transaction_id.should == nil
     end
 
     it "respects fail_on_duplicate_payment_method when included outside of the nonce" do
@@ -298,7 +370,7 @@ describe Braintree::PaymentMethod do
       result = Braintree::CreditCard.create(
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
+        :expiration_date => "05/2012",
       )
       result.should be_success
 
@@ -306,14 +378,14 @@ describe Braintree::PaymentMethod do
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2012"
-        }
+        },
       )
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
         :customer_id => customer.id,
         :options => {
           :fail_on_duplicate_payment_method => true
-        }
+        },
       )
 
       result.should_not be_success
@@ -330,14 +402,14 @@ describe Braintree::PaymentMethod do
         config,
         :authorization_fingerprint => authorization_fingerprint,
         :shared_customer_identifier => "fake_identifier",
-        :shared_customer_identifier_type => "testing"
+        :shared_customer_identifier_type => "testing",
       )
 
       response = http.create_credit_card(
         :number => "4111111111111111",
         :expirationMonth => "12",
         :expirationYear => "2020",
-        :options => {:validate => false}
+        :options => {:validate => false},
       )
       response.code.should == "202"
 
@@ -347,7 +419,7 @@ describe Braintree::PaymentMethod do
         :customer_id => customer.id,
         :billing_address => {
           :street_address => "123 Abc Way"
-        }
+        },
       )
 
       result.should be_success
@@ -369,14 +441,14 @@ describe Braintree::PaymentMethod do
         config,
         :authorization_fingerprint => authorization_fingerprint,
         :shared_customer_identifier => "fake_identifier",
-        :shared_customer_identifier_type => "testing"
+        :shared_customer_identifier_type => "testing",
       )
 
       response = http.create_credit_card(
         :number => "4111111111111111",
         :expirationMonth => "12",
         :expirationYear => "2020",
-        :options => {:validate => false}
+        :options => {:validate => false},
       )
       response.code.should == "202"
 
@@ -386,7 +458,7 @@ describe Braintree::PaymentMethod do
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
         :customer_id => customer.id,
-        :billing_address_id => address.id
+        :billing_address_id => address.id,
       )
 
       result.should be_success
@@ -409,7 +481,7 @@ describe Braintree::PaymentMethod do
         config,
         :authorization_fingerprint => authorization_fingerprint,
         :shared_customer_identifier => "fake_identifier",
-        :shared_customer_identifier_type => "testing"
+        :shared_customer_identifier_type => "testing",
       )
 
       response = http.create_credit_card(
@@ -419,7 +491,7 @@ describe Braintree::PaymentMethod do
         :options => {:validate => false},
         :billing_address => {
           :street_address => "456 Xyz Way"
-        }
+        },
       )
       response.code.should == "202"
 
@@ -429,7 +501,7 @@ describe Braintree::PaymentMethod do
         :customer_id => customer.id,
         :billing_address => {
           :street_address => "123 Abc Way"
-        }
+        },
       )
 
       result.should be_success
@@ -451,7 +523,7 @@ describe Braintree::PaymentMethod do
         config,
         :authorization_fingerprint => authorization_fingerprint,
         :shared_customer_identifier => "fake_identifier",
-        :shared_customer_identifier_type => "testing"
+        :shared_customer_identifier_type => "testing",
       )
 
       response = http.create_credit_card(
@@ -460,7 +532,7 @@ describe Braintree::PaymentMethod do
         :expirationYear => 2020,
         :billing_address => {
           :street_address => "456 Xyz Way"
-        }
+        },
       )
       response.code.should == "201"
 
@@ -470,7 +542,7 @@ describe Braintree::PaymentMethod do
         :customer_id => customer.id,
         :billing_address => {
           :street_address => "123 Abc Way"
-        }
+        },
       )
 
       result.should be_success
@@ -482,38 +554,196 @@ describe Braintree::PaymentMethod do
       found_credit_card.billing_address.street_address.should == "456 Xyz Way"
     end
 
-    context "us bank account" do
-      it "creates a payment method from a us bank account nonce" do
-        customer = Braintree::Customer.create.customer
+    it "includes risk data when skip_advanced_fraud_checking is false" do
+      with_fraud_protection_enterprise_merchant do
+        customer = Braintree::Customer.create!
+
+        nonce = nonce_for_new_payment_method(
+          :credit_card => {
+            :cvv => "123",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "05/2009",
+          },
+        )
+        result = Braintree::PaymentMethod.create(
+          :payment_method_nonce => nonce,
+          :customer_id => customer.id,
+          :options => {
+            :verify_card => true,
+            :skip_advanced_fraud_checking => false,
+          },
+        )
+
+        expect(result).to be_success
+        verification = result.payment_method.verification
+        expect(verification.risk_data).not_to be_nil
+      end
+    end
+
+    it "does not include risk data when skip_advanced_fraud_checking is true" do
+      with_fraud_protection_enterprise_merchant do
+        customer = Braintree::Customer.create!
+
+        nonce = nonce_for_new_payment_method(
+          :credit_card => {
+            :cvv => "123",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "05/2009",
+          },
+        )
+        result = Braintree::PaymentMethod.create(
+          :payment_method_nonce => nonce,
+          :customer_id => customer.id,
+          :options => {
+            :verify_card => true,
+            :skip_advanced_fraud_checking => true,
+          },
+        )
+
+        expect(result).to be_success
+        verification = result.payment_method.verification
+        expect(verification.risk_data).to be_nil
+      end
+    end
+
+    context "account_type" do
+      it "verifies card with account_type debit" do
+        nonce = nonce_for_new_payment_method(
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Hiper,
+            :expiration_month => "11",
+            :expiration_year => "2099",
+          },
+        )
+        customer = Braintree::Customer.create!
         result = Braintree::PaymentMethod.create(
-          :payment_method_nonce => generate_valid_us_bank_account_nonce,
-          :customer_id => customer.id
+          :payment_method_nonce => nonce,
+          :customer_id => customer.id,
+          :options => {
+            :verify_card => true,
+            :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
+            :verification_account_type => "debit",
+          },
         )
 
         result.should be_success
-        us_bank_account = result.payment_method
-        us_bank_account.should be_a(Braintree::UsBankAccount)
-        us_bank_account.routing_number.should == "021000021"
-        us_bank_account.last_4.should == "1234"
-        us_bank_account.account_type.should == "checking"
-        us_bank_account.account_holder_name.should == "Dan Schulman"
-        us_bank_account.bank_name.should =~ /CHASE/
-        us_bank_account.default.should == true
-        us_bank_account.ach_mandate.text.should == "cl mandate text"
-        us_bank_account.ach_mandate.accepted_at.should be_a Time
-
-        Braintree::PaymentMethod.find(us_bank_account.token).should be_a(Braintree::UsBankAccount)
+        result.payment_method.verification.credit_card[:account_type].should == "debit"
       end
 
-      it "does not creates a payment method from an invalid us bank account nonce" do
-        customer = Braintree::Customer.create.customer
+      it "verifies card with account_type credit" do
+        nonce = nonce_for_new_payment_method(
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Hiper,
+            :expiration_month => "11",
+            :expiration_year => "2099",
+          },
+        )
+        customer = Braintree::Customer.create!
         result = Braintree::PaymentMethod.create(
-          :payment_method_nonce => generate_invalid_us_bank_account_nonce,
-          :customer_id => customer.id
+          :payment_method_nonce => nonce,
+          :customer_id => customer.id,
+          :options => {
+            :verify_card => true,
+            :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
+            :verification_account_type => "credit",
+          },
+        )
+
+        result.should be_success
+        result.payment_method.verification.credit_card[:account_type].should == "credit"
+      end
+
+      it "errors with invalid account_type" do
+        nonce = nonce_for_new_payment_method(
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Hiper,
+            :expiration_month => "11",
+            :expiration_year => "2099",
+          },
+        )
+        customer = Braintree::Customer.create!
+        result = Braintree::PaymentMethod.create(
+          :payment_method_nonce => nonce,
+          :customer_id => customer.id,
+          :options => {
+            :verify_card => true,
+            :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
+            :verification_account_type => "ach",
+          },
         )
 
         result.should_not be_success
-        result.errors.for(:payment_method).on(:payment_method_nonce)[0].code.should == Braintree::ErrorCodes::PaymentMethod::PaymentMethodNonceUnknown
+        result.errors.for(:credit_card).for(:options).on(:verification_account_type)[0].code.should == Braintree::ErrorCodes::CreditCard::VerificationAccountTypeIsInvalid
+      end
+
+      it "errors when account_type not supported by merchant" do
+        nonce = nonce_for_new_payment_method(
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_month => "11",
+            :expiration_year => "2099",
+          },
+        )
+        customer = Braintree::Customer.create!
+        result = Braintree::PaymentMethod.create(
+          :payment_method_nonce => nonce,
+          :customer_id => customer.id,
+          :options => {
+            :verify_card => true,
+            :verification_account_type => "credit",
+          },
+        )
+
+        result.should_not be_success
+        result.errors.for(:credit_card).for(:options).on(:verification_account_type)[0].code.should == Braintree::ErrorCodes::CreditCard::VerificationAccountTypeNotSupported
+      end
+
+      it "updates the credit card with account_type credit" 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 = Braintree::PaymentMethod.update(credit_card.token,
+          :cardholder_name => "New Holder",
+          :cvv => "456",
+          :number => Braintree::Test::CreditCardNumbers::Hiper,
+          :expiration_date => "06/2013",
+          :options => {
+            :verify_card => true,
+            :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
+            :verification_account_type => "credit",
+          },
+        )
+        update_result.success?.should == true
+        update_result.payment_method.verification.credit_card[:account_type].should == "credit"
+      end
+
+      it "updates the credit card with account_type debit" 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 = Braintree::PaymentMethod.update(credit_card.token,
+          :cardholder_name => "New Holder",
+          :cvv => "456",
+          :number => Braintree::Test::CreditCardNumbers::Hiper,
+          :expiration_date => "06/2013",
+          :options => {
+            :verify_card => true,
+            :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
+            :verification_account_type => "debit",
+          },
+        )
+        update_result.success?.should == true
+        update_result.payment_method.verification.credit_card[:account_type].should == "debit"
       end
     end
 
@@ -523,7 +753,7 @@ describe Braintree::PaymentMethod do
         customer = Braintree::Customer.create.customer
         result = Braintree::PaymentMethod.create(
           :payment_method_nonce => nonce,
-          :customer_id => customer.id
+          :customer_id => customer.id,
         )
 
         result.should be_success
@@ -548,6 +778,19 @@ describe Braintree::PaymentMethod do
           :options => {
             :paypal => {
               :payee_email => "payee@example.com",
+              :order_id => "merchant-order-id",
+              :custom_field => "custom merchant field",
+              :description => "merchant description",
+              :amount => "1.23",
+              :shipping => {
+                :first_name => "first",
+                :last_name => "last",
+                :locality => "Austin",
+                :postal_code => "78729",
+                :street_address => "7700 W Parmer Ln",
+                :country_name => "US",
+                :region => "TX",
+              },
             },
           },
         )
@@ -555,10 +798,31 @@ describe Braintree::PaymentMethod do
         result.should be_success
         result.payment_method.should be_a(Braintree::PayPalAccount)
         result.payment_method.image_url.should_not be_nil
+        result.payment_method.payer_id.should_not be_nil
         token = result.payment_method.token
 
         found_paypal_account = Braintree::PayPalAccount.find(token)
         found_paypal_account.should_not be_nil
+        found_paypal_account.payer_id.should_not be_nil
+      end
+
+      it "creates a billing agreement payment method from a refresh token" do
+        customer = Braintree::Customer.create.customer
+        result = Braintree::PaymentMethod.create(
+          :customer_id => customer.id,
+          :paypal_refresh_token => "some_future_payment_token",
+        )
+
+        result.should be_success
+        result.payment_method.should be_a(Braintree::PayPalAccount)
+        result.payment_method.billing_agreement_id.should eq("B_FAKE_ID")
+        result.payment_method.payer_id.should_not be_nil
+        token = result.payment_method.token
+
+        found_paypal_account = Braintree::PayPalAccount.find(token)
+        found_paypal_account.should_not be_nil
+        found_paypal_account.billing_agreement_id.should eq("B_FAKE_ID")
+        found_paypal_account.payer_id.should_not be_nil
       end
 
       it "does not create a payment method from an unvalidated onetime paypal account nonce" do
@@ -566,7 +830,7 @@ describe Braintree::PaymentMethod do
         nonce = nonce_for_paypal_account(:access_token => "PAYPAL_ACCESS_TOKEN")
         result = Braintree::PaymentMethod.create(
           :payment_method_nonce => nonce,
-          :customer_id => customer.id
+          :customer_id => customer.id,
         )
 
         result.should_not be_success
@@ -581,7 +845,7 @@ describe Braintree::PaymentMethod do
           :customer_id => customer.id,
           :billing_address => {
             :street_address => "123 Abc Way"
-          }
+          },
         )
 
         result.should be_success
@@ -599,7 +863,7 @@ describe Braintree::PaymentMethod do
         result = Braintree::PaymentMethod.create(
           :payment_method_nonce => nonce,
           :customer_id => customer.id,
-          :billing_address_id => "address_id"
+          :billing_address_id => "address_id",
         )
 
         result.should be_success
@@ -616,7 +880,7 @@ describe Braintree::PaymentMethod do
         nonce = nonce_for_paypal_account(:token => "PAYPAL_TOKEN")
         result = Braintree::PaymentMethod.create(
           :payment_method_nonce => nonce,
-          :customer_id => customer.id
+          :customer_id => customer.id,
         )
 
         result.should_not be_success
@@ -630,7 +894,7 @@ describe Braintree::PaymentMethod do
         original_token = random_payment_method_token
         nonce = nonce_for_paypal_account(
           :consent_code => "consent-code",
-          :token => original_token
+          :token => original_token,
         )
 
         result = Braintree::PaymentMethod.create(
@@ -640,45 +904,10 @@ describe Braintree::PaymentMethod do
             :verify_card => true,
             :fail_on_duplicate_payment_method => true,
             :verification_merchant_account_id => "not_a_real_merchant_account_id"
-          }
-        )
-
-        result.should be_success
-      end
-    end
-
-    context "SEPA" do
-      it "returns the SEPA bank account behind the nonce" do
-        config = Braintree::Configuration.instantiate
-        customer = Braintree::Customer.create.customer
-        raw_client_token = Braintree::ClientToken.generate(:customer_id => customer.id, :sepa_mandate_type => Braintree::EuropeBankAccount::MandateType::Business)
-        client_token = decode_client_token(raw_client_token)
-        authorization_fingerprint = client_token["authorizationFingerprint"]
-        http = ClientApiHttp.new(
-          config,
-          :authorization_fingerprint => authorization_fingerprint
-        )
-
-        nonce = http.create_europe_bank_account_nonce(
-          :accountHolderName => "Bob Holder",
-          :iban => "DE89370400440532013000",
-          :bic => "DEUTDEFF",
-          :locale => "en-US",
-          :billingAddress =>  {
-            :region => "Hesse",
-            :country_name => "Germany"
-          }
-        )
-        nonce.should_not == nil
-        result = Braintree::PaymentMethod.create(
-          :payment_method_nonce => nonce,
-          :customer_id => customer.id
+          },
         )
 
         result.should be_success
-        result.payment_method.token.should_not == nil
-        result.payment_method.image_url.should_not be_nil
-        result.payment_method.customer_id.should == customer.id
       end
     end
 
@@ -689,7 +918,7 @@ describe Braintree::PaymentMethod do
         result = Braintree::PaymentMethod.create(
           :payment_method_nonce => Braintree::Test::Nonce::AbstractTransactable,
           :customer_id => customer.id,
-          :token => token
+          :token => token,
         )
 
         result.should be_success
@@ -699,6 +928,134 @@ describe Braintree::PaymentMethod do
         payment_method.should be_a Braintree::UnknownPaymentMethod
       end
     end
+
+    context "verification_currency_iso_code" do
+      it "validates verification_currency_iso_code against currency configured in default merchant account" do
+        nonce = nonce_for_new_payment_method(
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_month => "11",
+            :expiration_year => "2099",
+          },
+        )
+        customer = Braintree::Customer.create!
+        result = Braintree::PaymentMethod.create(
+          :payment_method_nonce => nonce,
+          :customer_id => customer.id,
+          :options => {
+            :verify_card => true,
+            :verification_currency_iso_code => "USD"
+          },
+        )
+
+        result.should be_success
+        result.payment_method.verification.currency_iso_code  == "USD"
+      end
+
+      it "validates verification_currency_iso_code against currency configured in verification_merchant_account_id" do
+        nonce = nonce_for_new_payment_method(
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_month => "11",
+            :expiration_year => "2099",
+          },
+        )
+        customer = Braintree::Customer.create!
+        result = Braintree::PaymentMethod.create(
+          :payment_method_nonce => nonce,
+          :customer_id => customer.id,
+          :options => {
+            :verify_card => true,
+            :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId,
+            :verification_currency_iso_code => "USD"
+          },
+        )
+
+        result.should be_success
+        result.payment_method.verification.currency_iso_code  == "USD"
+        result.payment_method.verification.merchant_account_id == SpecHelper::NonDefaultMerchantAccountId
+      end
+
+
+      it "errors with invalid presentment currency due to verification_currency_iso_code not matching with currency configured in default merchant account" do
+        nonce = nonce_for_new_payment_method(
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_month => "11",
+            :expiration_year => "2099",
+          },
+        )
+        customer = Braintree::Customer.create!
+        result = Braintree::PaymentMethod.create(
+          :payment_method_nonce => nonce,
+          :customer_id => customer.id,
+          :options => {
+            :verify_card => true,
+            :verification_currency_iso_code => "GBP"
+          },
+        )
+        result.should_not be_success
+        result.errors.for(:credit_card).for(:options).on(:verification_currency_iso_code)[0].code.should == Braintree::ErrorCodes::CreditCard::CurrencyCodeNotSupportedByMerchantAccount
+      end
+
+      it "errors with invalid presentment currency due to verification_currency_iso_code not matching with currency configured in verification_merchant_account_id" do
+        nonce = nonce_for_new_payment_method(
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_month => "11",
+            :expiration_year => "2099",
+          },
+        )
+        customer = Braintree::Customer.create!
+        result = Braintree::PaymentMethod.create(
+          :payment_method_nonce => nonce,
+          :customer_id => customer.id,
+          :options => {
+            :verify_card => true,
+            :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId,
+            :verification_currency_iso_code => "GBP"
+          },
+        )
+
+        result.should_not be_success
+        result.errors.for(:credit_card).for(:options).on(:verification_currency_iso_code)[0].code.should == Braintree::ErrorCodes::CreditCard::CurrencyCodeNotSupportedByMerchantAccount
+      end
+    end
+  end
+
+  describe "self.create!" do
+    it "creates a payment method from a vaulted credit card nonce" do
+      config = Braintree::Configuration.instantiate
+      customer = Braintree::Customer.create.customer
+      raw_client_token = Braintree::ClientToken.generate(:customer_id => customer.id)
+      client_token = decode_client_token(raw_client_token)
+      authorization_fingerprint = client_token["authorizationFingerprint"]
+      http = ClientApiHttp.new(
+        config,
+        :authorization_fingerprint => authorization_fingerprint,
+        :shared_customer_identifier => "fake_identifier",
+        :shared_customer_identifier_type => "testing",
+      )
+
+      response = http.create_credit_card(
+        :number => 4111111111111111,
+        :expirationMonth => 12,
+        :expirationYear => 2020,
+      )
+      response.code.should == "201"
+
+      nonce = JSON.parse(response.body)["creditCards"].first["nonce"]
+      payment_method = Braintree::PaymentMethod.create!(
+        :payment_method_nonce => nonce,
+        :customer_id => customer.id,
+      )
+
+      payment_method.should be_a(Braintree::CreditCard)
+      token = payment_method.token
+
+      found_credit_card = Braintree::CreditCard.find(token)
+      found_credit_card.should_not be_nil
+    end
   end
 
   describe "self.find" do
@@ -708,7 +1065,7 @@ describe Braintree::PaymentMethod do
         result = Braintree::CreditCard.create(
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2012"
+          :expiration_date => "05/2012",
         )
         result.success?.should == true
 
@@ -724,34 +1081,34 @@ describe Braintree::PaymentMethod do
         credit_card = Braintree::CreditCard.create(
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2012"
+          :expiration_date => "05/2012",
         ).credit_card
 
         subscription = Braintree::Subscription.create(
           :payment_method_token => credit_card.token,
           :plan_id => "integration_trialless_plan",
-          :price => "1.00"
+          :price => "1.00",
         ).subscription
 
         found_card = Braintree::PaymentMethod.find(credit_card.token)
         found_card.subscriptions.first.id.should == subscription.id
         found_card.subscriptions.first.plan_id.should == "integration_trialless_plan"
         found_card.subscriptions.first.payment_method_token.should == credit_card.token
-        found_card.subscriptions.first.price.should == BigDecimal.new("1.00")
+        found_card.subscriptions.first.price.should == BigDecimal("1.00")
       end
     end
 
     context "paypal accounts" do
       it "finds the payment method with the given token" do
         customer = Braintree::Customer.create!
-        payment_method_token = "PAYMENT_METHOD_TOKEN_#{rand(36**3).to_s(36)}"
+        payment_method_token = make_token
         nonce = nonce_for_paypal_account(
           :consent_code => "consent-code",
-          :token => payment_method_token
+          :token => payment_method_token,
         )
         result = Braintree::PaymentMethod.create(
           :payment_method_nonce => nonce,
-          :customer_id => customer.id
+          :customer_id => customer.id,
         )
         result.should be_success
 
@@ -766,11 +1123,11 @@ describe Braintree::PaymentMethod do
     context "apple pay cards" do
       it "finds the payment method with the given token" do
         customer = Braintree::Customer.create!
-        payment_method_token = "PAYMENT_METHOD_TOKEN_#{rand(36**3).to_s(36)}"
+        payment_method_token = make_token
         result = Braintree::PaymentMethod.create(
           :payment_method_nonce => Braintree::Test::Nonce::ApplePayAmEx,
           :customer_id => customer.id,
-          :token => payment_method_token
+          :token => payment_method_token,
         )
         result.should be_success
 
@@ -788,70 +1145,96 @@ describe Braintree::PaymentMethod do
       end
     end
 
-    context "android pay cards" do
+    context "venmo accounts" do
+      it "finds the payment method with the given token" do
+        customer = Braintree::Customer.create!
+        payment_method_token = make_token
+        result = Braintree::PaymentMethod.create(
+          :payment_method_nonce => Braintree::Test::Nonce::VenmoAccount,
+          :customer_id => customer.id,
+          :token => payment_method_token,
+        )
+        result.should be_success
+
+        venmo_account = Braintree::PaymentMethod.find(payment_method_token)
+        venmo_account.should be_a(Braintree::VenmoAccount)
+        venmo_account.should_not be_nil
+        venmo_account.token.should == payment_method_token
+        venmo_account.default.should == true
+        venmo_account.image_url.should =~ /venmo/
+        venmo_account.username.should == "venmojoe"
+        venmo_account.venmo_user_id.should == "1234567891234567891"
+        venmo_account.source_description.should == "Venmo Account: venmojoe"
+        venmo_account.customer_id.should == customer.id
+      end
+    end
+
+    context "google pay cards" do
       it "finds the proxy card payment method with the given token" do
         customer = Braintree::Customer.create!
-        payment_method_token = "PAYMENT_METHOD_TOKEN_#{rand(36**3).to_s(36)}"
+        payment_method_token = make_token
         result = Braintree::PaymentMethod.create(
-          :payment_method_nonce => Braintree::Test::Nonce::AndroidPayDiscover,
+          :payment_method_nonce => Braintree::Test::Nonce::GooglePayDiscover,
           :customer_id => customer.id,
-          :token => payment_method_token
+          :token => payment_method_token,
         )
         result.should be_success
 
-        android_pay_card = Braintree::PaymentMethod.find(payment_method_token)
-        android_pay_card.should be_a(Braintree::AndroidPayCard)
-        android_pay_card.should_not be_nil
-        android_pay_card.token.should == payment_method_token
-        android_pay_card.card_type.should == Braintree::CreditCard::CardType::Discover
-        android_pay_card.virtual_card_type.should == Braintree::CreditCard::CardType::Discover
-        android_pay_card.expiration_month.to_i.should > 0
-        android_pay_card.expiration_year.to_i.should > 0
-        android_pay_card.default.should == true
-        android_pay_card.image_url.should =~ /android_pay/
-        android_pay_card.source_card_type.should == Braintree::CreditCard::CardType::Visa
-        android_pay_card.source_card_last_4.should == "1111"
-        android_pay_card.google_transaction_id.should == "google_transaction_id"
-        android_pay_card.source_description.should == "Visa 1111"
-        android_pay_card.customer_id.should == customer.id
+        google_pay_card = Braintree::PaymentMethod.find(payment_method_token)
+        google_pay_card.should be_a(Braintree::GooglePayCard)
+        google_pay_card.should_not be_nil
+        google_pay_card.token.should == payment_method_token
+        google_pay_card.card_type.should == Braintree::CreditCard::CardType::Discover
+        google_pay_card.virtual_card_type.should == Braintree::CreditCard::CardType::Discover
+        google_pay_card.expiration_month.to_i.should > 0
+        google_pay_card.expiration_year.to_i.should > 0
+        google_pay_card.default.should == true
+        google_pay_card.image_url.should =~ /android_pay/
+        google_pay_card.is_network_tokenized?.should == false
+        google_pay_card.source_card_type.should == Braintree::CreditCard::CardType::Discover
+        google_pay_card.source_card_last_4.should == "1111"
+        google_pay_card.google_transaction_id.should == "google_transaction_id"
+        google_pay_card.source_description.should == "Discover 1111"
+        google_pay_card.customer_id.should == customer.id
       end
 
       it "finds the network token payment method with the given token" do
         customer = Braintree::Customer.create!
-        payment_method_token = "PAYMENT_METHOD_TOKEN_#{rand(36**3).to_s(36)}"
+        payment_method_token = make_token
         result = Braintree::PaymentMethod.create(
-          :payment_method_nonce => Braintree::Test::Nonce::AndroidPayMasterCard,
+          :payment_method_nonce => Braintree::Test::Nonce::GooglePayMasterCard,
           :customer_id => customer.id,
-          :token => payment_method_token
+          :token => payment_method_token,
         )
         result.should be_success
 
-        android_pay_card = Braintree::PaymentMethod.find(payment_method_token)
-        android_pay_card.should be_a(Braintree::AndroidPayCard)
-        android_pay_card.should_not be_nil
-        android_pay_card.token.should == payment_method_token
-        android_pay_card.card_type.should == Braintree::CreditCard::CardType::MasterCard
-        android_pay_card.virtual_card_type.should == Braintree::CreditCard::CardType::MasterCard
-        android_pay_card.expiration_month.to_i.should > 0
-        android_pay_card.expiration_year.to_i.should > 0
-        android_pay_card.default.should == true
-        android_pay_card.image_url.should =~ /android_pay/
-        android_pay_card.source_card_type.should == Braintree::CreditCard::CardType::MasterCard
-        android_pay_card.source_card_last_4.should == "4444"
-        android_pay_card.google_transaction_id.should == "google_transaction_id"
-        android_pay_card.source_description.should == "MasterCard 4444"
-        android_pay_card.customer_id.should == customer.id
+        google_pay_card = Braintree::PaymentMethod.find(payment_method_token)
+        google_pay_card.should be_a(Braintree::GooglePayCard)
+        google_pay_card.should_not be_nil
+        google_pay_card.token.should == payment_method_token
+        google_pay_card.card_type.should == Braintree::CreditCard::CardType::MasterCard
+        google_pay_card.virtual_card_type.should == Braintree::CreditCard::CardType::MasterCard
+        google_pay_card.expiration_month.to_i.should > 0
+        google_pay_card.expiration_year.to_i.should > 0
+        google_pay_card.default.should == true
+        google_pay_card.image_url.should =~ /android_pay/
+        google_pay_card.is_network_tokenized?.should == true
+        google_pay_card.source_card_type.should == Braintree::CreditCard::CardType::MasterCard
+        google_pay_card.source_card_last_4.should == "4444"
+        google_pay_card.google_transaction_id.should == "google_transaction_id"
+        google_pay_card.source_description.should == "MasterCard 4444"
+        google_pay_card.customer_id.should == customer.id
       end
     end
 
     context "unknown payment methods" do
       it "finds the payment method with the given token" do
         customer = Braintree::Customer.create!
-        payment_method_token = "FUTURE_PAYMENT_#{rand(36**3).to_s(36)}"
+        payment_method_token = make_token
         result = Braintree::PaymentMethod.create(
           :payment_method_nonce => Braintree::Test::Nonce::AbstractTransactable,
           :customer_id => customer.id,
-          :token => payment_method_token
+          :token => payment_method_token,
         )
         result.should be_success
 
@@ -872,18 +1255,18 @@ describe Braintree::PaymentMethod do
   end
 
   describe "self.delete" do
-    it "deletes an android pay card" do
+    it "deletes an google pay card" do
       customer = Braintree::Customer.create!
 
       create_result = Braintree::PaymentMethod.create(
-        :payment_method_nonce => Braintree::Test::Nonce::AndroidPayDiscover,
-        :customer_id => customer.id
+        :payment_method_nonce => Braintree::Test::Nonce::GooglePayDiscover,
+        :customer_id => customer.id,
       )
 
       token = create_result.payment_method.token
 
-      android_card = Braintree::PaymentMethod.find(token)
-      android_card.should be_a(Braintree::AndroidPayCard)
+      google_card = Braintree::PaymentMethod.find(token)
+      google_card.should be_a(Braintree::GooglePayCard)
 
       delete_result = Braintree::PaymentMethod.delete(token)
       delete_result.success?.should == true
@@ -898,7 +1281,7 @@ describe Braintree::PaymentMethod do
 
       create_result = Braintree::PaymentMethod.create(
         :payment_method_nonce => Braintree::Test::Nonce::ApplePayAmEx,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
       token = create_result.payment_method.token
 
@@ -915,14 +1298,15 @@ describe Braintree::PaymentMethod do
 
     it "deletes a paypal account" do
       customer = Braintree::Customer.create!
-      paypal_account_token = "PAYPAL_ACCOUNT_TOKEN_#{rand(36**3).to_s(36)}"
+      paypal_account_token = make_token
+
       nonce = nonce_for_paypal_account(
         :consent_code => "PAYPAL_CONSENT_CODE",
-        :token => paypal_account_token
+        :token => paypal_account_token,
       )
       Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
 
       paypal_account = Braintree::PaymentMethod.find(paypal_account_token)
@@ -937,7 +1321,7 @@ describe Braintree::PaymentMethod do
     end
 
     it "deletes a credit card" do
-      token = "CREDIT_CARD_#{rand(36**3).to_s(36)}"
+      token = make_token
       customer = Braintree::Customer.create!
       nonce = nonce_for_new_payment_method({
         :credit_card => {
@@ -951,7 +1335,7 @@ describe Braintree::PaymentMethod do
 
       Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
 
       result = Braintree::PaymentMethod.delete(token)
@@ -963,7 +1347,7 @@ describe Braintree::PaymentMethod do
     end
 
     it "raises a NotFoundError exception if payment method cannot be found" do
-      token = "CREDIT_CARD_#{rand(36**3).to_s(36)}"
+      token = make_token
       customer = Braintree::Customer.create!
 
       expect do
@@ -974,6 +1358,71 @@ describe Braintree::PaymentMethod do
 
   describe "self.update" do
     context "credit cards" do
+      it "throws validation error when passing invalid  pass thru params" do
+        customer = Braintree::Customer.create!
+        credit_card = Braintree::CreditCard.create!(
+          :customer_id => customer.id,
+          :payment_method_nonce => Braintree::Test::Nonce::ThreeDSecureVisaFullAuthentication,
+          :options => {:verify_card => true},
+        )
+
+        update_result = Braintree::PaymentMethod.update(credit_card.token,
+          :cardholder_name => "New Holder",
+          :cvv => "456",
+          :number => Braintree::Test::CreditCardNumbers::MasterCard,
+          :expiration_date => "06/2013",
+          :three_d_secure_pass_thru => {
+            :eci_flag => "02",
+            :cavv => "some_cavv",
+            :xid => "some_xid",
+            :three_d_secure_version => "xx",
+            :authentication_response => "Y",
+            :directory_response => "Y",
+            :cavv_algorithm => "2",
+            :ds_transaction_id => "some_ds_transaction_id",
+          },
+          :options => {:verify_card => true},
+        )
+        expect(update_result).to_not be_success
+        error = update_result.errors.for(:verification).first
+        expect(error.code).to eq(Braintree::ErrorCodes::Verification::ThreeDSecurePassThru::ThreeDSecureVersionIsInvalid)
+        expect(error.message).to eq("The version of 3D Secure authentication must be composed only of digits and separated by periods (e.g. `1.0.2`).")
+      end
+
+      it "updates the credit card with three_d_secure pass thru params" do
+        customer = Braintree::Customer.create!
+        credit_card = Braintree::CreditCard.create!(
+          :customer_id => customer.id,
+          :payment_method_nonce => Braintree::Test::Nonce::ThreeDSecureVisaFullAuthentication,
+          :options => {:verify_card => true},
+        )
+
+        update_result = Braintree::PaymentMethod.update(credit_card.token,
+          :cardholder_name => "New Holder",
+          :cvv => "456",
+          :number => Braintree::Test::CreditCardNumbers::MasterCard,
+          :expiration_date => "06/2013",
+          :three_d_secure_pass_thru => {
+            :eci_flag => "02",
+            :cavv => "some_cavv",
+            :xid => "some_xid",
+            :three_d_secure_version => "1.0.2",
+            :authentication_response => "Y",
+            :directory_response => "Y",
+            :cavv_algorithm => "2",
+            :ds_transaction_id => "some_ds_transaction_id",
+          },
+          :options => {:verify_card => true},
+        )
+        update_result.success?.should == true
+        update_result.payment_method.should == credit_card
+        updated_credit_card = update_result.payment_method
+        updated_credit_card.cardholder_name.should == "New Holder"
+        updated_credit_card.bin.should == Braintree::Test::CreditCardNumbers::MasterCard[0, 6]
+        updated_credit_card.last_4.should == Braintree::Test::CreditCardNumbers::MasterCard[-4..-1]
+        updated_credit_card.expiration_date.should == "06/2013"
+      end
+
       it "updates the credit card" do
         customer = Braintree::Customer.create!
         credit_card = Braintree::CreditCard.create!(
@@ -981,13 +1430,13 @@ describe Braintree::PaymentMethod do
           :customer_id => customer.id,
           :cvv => "123",
           :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2012"
+          :expiration_date => "05/2012",
         )
         update_result = Braintree::PaymentMethod.update(credit_card.token,
           :cardholder_name => "New Holder",
           :cvv => "456",
           :number => Braintree::Test::CreditCardNumbers::MasterCard,
-          :expiration_date => "06/2013"
+          :expiration_date => "06/2013",
         )
         update_result.success?.should == true
         update_result.payment_method.should == credit_card
@@ -998,6 +1447,142 @@ describe Braintree::PaymentMethod do
         updated_credit_card.expiration_date.should == "06/2013"
       end
 
+      it "includes risk data when skip_advanced_fraud_checking is false" do
+        with_fraud_protection_enterprise_merchant do
+          customer = Braintree::Customer.create!
+          credit_card = Braintree::CreditCard.create!(
+            :customer_id => customer.id,
+            :cvv => "123",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "05/2012",
+          )
+          update_result = Braintree::PaymentMethod.update(
+            credit_card.token,
+            :cvv => "456",
+            :number => Braintree::Test::CreditCardNumbers::MasterCard,
+            :expiration_date => "06/2013",
+            :options => {
+              :verify_card => true,
+              :skip_advanced_fraud_checking => false
+            },
+          )
+
+          expect(update_result).to be_success
+          verification = update_result.payment_method.verification
+          expect(verification.risk_data).not_to be_nil
+        end
+      end
+
+      it "does not include risk data when skip_advanced_fraud_checking is true" do
+        with_fraud_protection_enterprise_merchant do
+          customer = Braintree::Customer.create!
+          credit_card = Braintree::CreditCard.create!(
+            :customer_id => customer.id,
+            :cvv => "123",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "05/2012",
+          )
+          update_result = Braintree::PaymentMethod.update(
+            credit_card.token,
+            :cvv => "456",
+            :number => Braintree::Test::CreditCardNumbers::MasterCard,
+            :expiration_date => "06/2013",
+            :options => {
+              :verify_card => true,
+              :skip_advanced_fraud_checking => true
+            },
+          )
+
+          expect(update_result).to be_success
+          verification = update_result.payment_method.verification
+          expect(verification.risk_data).to be_nil
+        end
+      end
+
+      context "verification_currency_iso_code" do
+        it "validates verification_currency_iso_code and updates the credit card " 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 = Braintree::PaymentMethod.update(credit_card.token,
+                                                          :cardholder_name => "New Holder",
+                                                          :cvv => "456",
+                                                          :number => Braintree::Test::CreditCardNumbers::MasterCard,
+                                                          :expiration_date => "06/2013",
+                                                          :options => {:verify_card => true, :verification_currency_iso_code => "USD"},
+                                                         )
+          update_result.success?.should == true
+          update_result.payment_method.verification.currency_iso_code  == "USD"
+        end
+
+        it "validates verification_currency_iso_code against the given verification_merchant_account_id and updates the credit card " 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 = Braintree::PaymentMethod.update(credit_card.token,
+                                                          :cardholder_name => "New Holder",
+                                                          :cvv => "456",
+                                                          :number => Braintree::Test::CreditCardNumbers::MasterCard,
+                                                          :expiration_date => "06/2013",
+                                                          :options => {:verify_card => true, :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId,  :verification_currency_iso_code => "USD"},
+                                                         )
+          update_result.success?.should == true
+          update_result.payment_method.verification.currency_iso_code  == "USD"
+          update_result.payment_method.verification.merchant_account_id == SpecHelper::NonDefaultMerchantAccountId
+        end
+
+        it "throws validation error when passing invalid verification_currency_iso_code" 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 = Braintree::PaymentMethod.update(credit_card.token,
+                                                          :cardholder_name => "New Holder",
+                                                          :cvv => "456",
+                                                          :number => Braintree::Test::CreditCardNumbers::MasterCard,
+                                                          :expiration_date => "06/2013",
+                                                          :options => {:verify_card => true, :verification_currency_iso_code => "GBP"},
+                                                         )
+          expect(update_result).to_not be_success
+          update_result.errors.for(:credit_card).for(:options).on(:verification_currency_iso_code)[0].code.should == Braintree::ErrorCodes::CreditCard::CurrencyCodeNotSupportedByMerchantAccount
+        end
+
+        it "throws validation error when passing invalid verification_currency_iso_code of the given verification merchant account id" 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 = Braintree::PaymentMethod.update(credit_card.token,
+                                                          :cardholder_name => "New Holder",
+                                                          :cvv => "456",
+                                                          :number => Braintree::Test::CreditCardNumbers::MasterCard,
+                                                          :expiration_date => "06/2013",
+                                                          :options => {:verify_card => true, :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId,  :verification_currency_iso_code => "GBP"},
+                                                         )
+          expect(update_result).to_not be_success
+          update_result.errors.for(:credit_card).for(:options).on(:verification_currency_iso_code)[0].code.should == Braintree::ErrorCodes::CreditCard::CurrencyCodeNotSupportedByMerchantAccount
+        end
+      end
+
+
       context "billing address" do
         it "creates a new billing address by default" do
           customer = Braintree::Customer.create!
@@ -1007,12 +1592,12 @@ describe Braintree::PaymentMethod do
             :expiration_date => "05/2012",
             :billing_address => {
               :street_address => "123 Nigeria Ave"
-            }
+            },
           )
           update_result = Braintree::PaymentMethod.update(credit_card.token,
             :billing_address => {
               :region => "IL"
-            }
+            },
           )
           update_result.success?.should == true
           updated_credit_card = update_result.payment_method
@@ -1029,13 +1614,13 @@ describe Braintree::PaymentMethod do
             :expiration_date => "05/2012",
             :billing_address => {
               :street_address => "123 Nigeria Ave"
-            }
+            },
           )
           update_result = Braintree::PaymentMethod.update(credit_card.token,
             :billing_address => {
               :region => "IL",
               :options => {:update_existing => true}
-            }
+            },
           )
           update_result.success?.should == true
           updated_credit_card = update_result.payment_method
@@ -1052,7 +1637,7 @@ describe Braintree::PaymentMethod do
             :expiration_date => "05/2012",
             :billing_address => {
               :street_address => "123 Nigeria Ave"
-            }
+            },
           )
           update_result = Braintree::PaymentMethod.update(credit_card.token,
             :billing_address => {
@@ -1061,7 +1646,7 @@ describe Braintree::PaymentMethod do
               :country_code_alpha3 => "ASM",
               :country_code_numeric => "016",
               :options => {:update_existing => true}
-            }
+            },
           )
           update_result.success?.should == true
           updated_credit_card = update_result.payment_method
@@ -1077,12 +1662,12 @@ describe Braintree::PaymentMethod do
         credit_card = Braintree::CreditCard.create!(
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2012"
+          :expiration_date => "05/2012",
         )
         update_result = Braintree::PaymentMethod.update(credit_card.token,
           :number => Braintree::Test::CreditCardNumbers::MasterCard,
           :expiration_month => "07",
-          :expiration_year => "2011"
+          :expiration_year => "2011",
         )
         update_result.success?.should == true
         update_result.payment_method.should == credit_card
@@ -1098,14 +1683,14 @@ describe Braintree::PaymentMethod do
           :customer_id => customer.id,
           :cvv => "123",
           :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2012"
+          :expiration_date => "05/2012",
         )
         update_result = Braintree::PaymentMethod.update(credit_card.token,
           :cardholder_name => "New Holder",
           :cvv => "456",
           :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::MasterCard,
           :expiration_date => "06/2013",
-          :options => {:verify_card => true}
+          :options => {:verify_card => true},
         )
         update_result.success?.should == false
         update_result.credit_card_verification.status.should == Braintree::Transaction::Status::ProcessorDeclined
@@ -1119,11 +1704,11 @@ describe Braintree::PaymentMethod do
           :customer_id => customer.id,
           :cvv => "123",
           :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2020"
+          :expiration_date => "05/2020",
         )
         update_result = Braintree::PaymentMethod.update(credit_card.token,
           :payment_method_nonce => Braintree::Test::Nonce::ProcessorDeclinedMasterCard,
-          :options => {:verify_card => true, :verification_amount => "2.34"}
+          :options => {:verify_card => true, :verification_amount => "2.34"},
         )
         update_result.success?.should == false
         update_result.credit_card_verification.status.should == Braintree::Transaction::Status::ProcessorDeclined
@@ -1149,7 +1734,7 @@ describe Braintree::PaymentMethod do
             :region => "Old State",
             :postal_code => "12345",
             :country_name => "Canada"
-          }
+          },
         )
         result = Braintree::PaymentMethod.update(credit_card.token,
           :options => {:verify_card => false},
@@ -1163,7 +1748,7 @@ describe Braintree::PaymentMethod do
             :region => "New State",
             :postal_code => "56789",
             :country_name => "United States of America"
-          }
+          },
         )
         result.success?.should == true
         address = result.payment_method.billing_address
@@ -1184,12 +1769,12 @@ describe Braintree::PaymentMethod do
           :cardholder_name => "Original Holder",
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2012"
+          :expiration_date => "05/2012",
         )
         update_result = Braintree::PaymentMethod.update(credit_card.token,
           :cardholder_name => "New Holder",
           :number => "invalid",
-          :expiration_date => "05/2014"
+          :expiration_date => "05/2014",
         )
         update_result.success?.should == false
         update_result.errors.for(:credit_card).on(:number)[0].message.should == "Credit card number must be 12-19 digits."
@@ -1200,12 +1785,12 @@ describe Braintree::PaymentMethod do
         card1 = Braintree::CreditCard.create(
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2009"
+          :expiration_date => "05/2009",
         ).credit_card
         card2 = Braintree::CreditCard.create(
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2009"
+          :expiration_date => "05/2009",
         ).credit_card
 
         card1.should be_default
@@ -1218,50 +1803,23 @@ describe Braintree::PaymentMethod do
       end
     end
 
-    context "coinbase accounts" do
-      it "can make a coinbase account the default payment method" do
-        customer = Braintree::Customer.create!
-        result = Braintree::CreditCard.create(
-          :customer_id => customer.id,
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2009",
-          :options => {:make_default => true}
-        )
-        result.should be_success
-
-        nonce = Braintree::Test::Nonce::Coinbase
-        original_token = Braintree::PaymentMethod.create(
-          :payment_method_nonce => nonce,
-          :customer_id => customer.id
-        ).payment_method.token
-
-        updated_result = Braintree::PaymentMethod.update(
-          original_token,
-          :options => {:make_default => true}
-        )
-
-        updated_customer = Braintree::Customer.find(customer.id)
-        updated_customer.default_payment_method.token.should == original_token
-      end
-    end
-
     context "paypal accounts" do
       it "updates a paypal account's token" do
         customer = Braintree::Customer.create!
         original_token = random_payment_method_token
         nonce = nonce_for_paypal_account(
           :consent_code => "consent-code",
-          :token => original_token
+          :token => original_token,
         )
         original_result = Braintree::PaymentMethod.create(
           :payment_method_nonce => nonce,
-          :customer_id => customer.id
+          :customer_id => customer.id,
         )
 
-        updated_token = "UPDATED_TOKEN-" + rand(36**3).to_s(36)
+        updated_token = make_token
         updated_result = Braintree::PaymentMethod.update(
           original_token,
-          :token => updated_token
+          :token => updated_token,
         )
 
         updated_paypal_account = Braintree::PayPalAccount.find(updated_token)
@@ -1278,19 +1836,19 @@ describe Braintree::PaymentMethod do
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2009",
-          :options => {:make_default => true}
+          :options => {:make_default => true},
         )
         result.should be_success
 
         nonce = nonce_for_paypal_account(:consent_code => "consent-code")
         original_token = Braintree::PaymentMethod.create(
           :payment_method_nonce => nonce,
-          :customer_id => customer.id
+          :customer_id => customer.id,
         ).payment_method.token
 
         updated_result = Braintree::PaymentMethod.update(
           original_token,
-          :options => {:make_default => true}
+          :options => {:make_default => true},
         )
 
         updated_paypal_account = Braintree::PayPalAccount.find(original_token)
@@ -1304,25 +1862,25 @@ describe Braintree::PaymentMethod do
 
         first_nonce = nonce_for_paypal_account(
           :consent_code => "consent-code",
-          :token => first_token
+          :token => first_token,
         )
         first_result = Braintree::PaymentMethod.create(
           :payment_method_nonce => first_nonce,
-          :customer_id => customer.id
+          :customer_id => customer.id,
         )
 
         second_nonce = nonce_for_paypal_account(
           :consent_code => "consent-code",
-          :token => second_token
+          :token => second_token,
         )
         second_result = Braintree::PaymentMethod.create(
           :payment_method_nonce => second_nonce,
-          :customer_id => customer.id
+          :customer_id => customer.id,
         )
 
         updated_result = Braintree::PaymentMethod.update(
           first_token,
-          :token => second_token
+          :token => second_token,
         )
 
         updated_result.should_not be_success
@@ -1331,44 +1889,68 @@ describe Braintree::PaymentMethod do
     end
   end
 
+  describe "self.update!" do
+    it "updates the credit card" 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",
+      )
+      payment_method = Braintree::PaymentMethod.update!(credit_card.token,
+        :cardholder_name => "New Holder",
+        :cvv => "456",
+        :number => Braintree::Test::CreditCardNumbers::MasterCard,
+        :expiration_date => "06/2013",
+      )
+      payment_method.should == credit_card
+      payment_method.cardholder_name.should == "New Holder"
+      payment_method.bin.should == Braintree::Test::CreditCardNumbers::MasterCard[0, 6]
+      payment_method.last_4.should == Braintree::Test::CreditCardNumbers::MasterCard[-4..-1]
+      payment_method.expiration_date.should == "06/2013"
+    end
+  end
+
   context "payment method grant and revoke" do
     before(:each) do
-      partner_merchant_gateway = Braintree::Gateway.new(
+      @partner_merchant_gateway = Braintree::Gateway.new(
         :merchant_id => "integration_merchant_public_id",
         :public_key => "oauth_app_partner_user_public_key",
         :private_key => "oauth_app_partner_user_private_key",
         :environment => Braintree::Configuration.environment,
-        :logger => Logger.new("/dev/null")
+        :logger => Logger.new("/dev/null"),
       )
-      customer = partner_merchant_gateway.customer.create(
+      customer = @partner_merchant_gateway.customer.create(
         :first_name => "Joe",
         :last_name => "Brown",
         :company => "ExampleCo",
         :email => "joe@example.com",
         :phone => "312.555.1234",
         :fax => "614.555.5678",
-        :website => "www.example.com"
+        :website => "www.example.com",
       ).customer
-      @credit_card = partner_merchant_gateway.credit_card.create(
+      @credit_card = @partner_merchant_gateway.credit_card.create(
         :customer_id => customer.id,
         :cardholder_name => "Adam Davis",
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2009"
+        :expiration_date => "05/2009",
       ).credit_card
 
-      oauth_gateway = Braintree::Gateway.new(
+      @oauth_gateway = Braintree::Gateway.new(
         :client_id => "client_id$#{Braintree::Configuration.environment}$integration_client_id",
         :client_secret => "client_secret$#{Braintree::Configuration.environment}$integration_client_secret",
-        :logger => Logger.new("/dev/null")
+        :logger => Logger.new("/dev/null"),
       )
-      access_token = Braintree::OAuthTestHelper.create_token(oauth_gateway, {
+      access_token = Braintree::OAuthTestHelper.create_token(@oauth_gateway, {
         :merchant_public_id => "integration_merchant_id",
         :scope => "grant_payment_method"
       }).credentials.access_token
 
       @granting_gateway = Braintree::Gateway.new(
         :access_token => access_token,
-        :logger => Logger.new("/dev/null")
+        :logger => Logger.new("/dev/null"),
       )
     end
 
@@ -1384,13 +1966,13 @@ describe Braintree::PaymentMethod do
 
         result = Braintree::Transaction.sale(
           :payment_method_nonce => grant_result.payment_method_nonce.nonce,
-          :amount => Braintree::Test::TransactionAmounts::Authorize
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
         )
         result.should be_success
 
         result2 = Braintree::Transaction.sale(
           :payment_method_nonce => grant_result.payment_method_nonce.nonce,
-          :amount => Braintree::Test::TransactionAmounts::Authorize
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
         )
         result2.should_not be_success
       end
@@ -1402,7 +1984,7 @@ describe Braintree::PaymentMethod do
 
         result = Braintree::PaymentMethod.create(
           :customer_id => customer_result.customer.id,
-          :payment_method_nonce => grant_result.payment_method_nonce.nonce
+          :payment_method_nonce => grant_result.payment_method_nonce.nonce,
         )
         result.should_not be_success
       end
@@ -1414,7 +1996,7 @@ describe Braintree::PaymentMethod do
 
         result = Braintree::PaymentMethod.create(
           :customer_id => customer_result.customer.id,
-          :payment_method_nonce => grant_result.payment_method_nonce.nonce
+          :payment_method_nonce => grant_result.payment_method_nonce.nonce,
         )
         result.should be_success
       end
@@ -1422,7 +2004,7 @@ describe Braintree::PaymentMethod do
       it "raises an error if the token isn't found" do
         expect do
           @granting_gateway.payment_method.grant("not_a_real_token", false)
-        end.to raise_error
+        end.to raise_error(Braintree::NotFoundError)
       end
 
       it "returns a valid nonce with no options set" do
@@ -1437,7 +2019,7 @@ describe Braintree::PaymentMethod do
       it "raises an error if the token isn't found" do
         expect do
           @granting_gateway.payment_method.revoke("not_a_real_token")
-        end.to raise_error
+        end.to raise_error(Braintree::NotFoundError)
       end
 
       it "renders a granted nonce useless" do
@@ -1449,7 +2031,7 @@ describe Braintree::PaymentMethod do
 
         result = Braintree::PaymentMethod.create(
           :customer_id => customer_result.customer.id,
-          :payment_method_nonce => grant_result.payment_method_nonce.nonce
+          :payment_method_nonce => grant_result.payment_method_nonce.nonce,
         )
         result.should_not be_success
       end
@@ -1463,7 +2045,7 @@ describe Braintree::PaymentMethod do
 
         result = Braintree::PaymentMethod.create(
           :customer_id => customer_result.customer.id,
-          :payment_method_nonce => grant_result.payment_method_nonce.nonce
+          :payment_method_nonce => grant_result.payment_method_nonce.nonce,
         )
         result.should_not be_success
       end