braintree 2.104.0 → 4.9.0

data/spec/integration/braintree/payment_method_spec.rb

@@ -17,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
@@ -51,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
@@ -82,7 +82,7 @@ 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
@@ -99,89 +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.is_network_tokenized?.should == false
-      android_pay_card.source_card_type.should == Braintree::CreditCard::CardType::Discover
-      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 == "Discover 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.is_network_tokenized?.should == true
-      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
@@ -190,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
@@ -200,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
@@ -212,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
@@ -222,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
@@ -237,12 +237,12 @@ describe Braintree::PaymentMethod do
       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
@@ -256,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(
@@ -265,7 +265,7 @@ describe Braintree::PaymentMethod do
         :options => {
           :verify_card => true,
           :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId
-        }
+        },
       )
 
       result.should_not be_success
@@ -281,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(
@@ -290,7 +290,7 @@ describe Braintree::PaymentMethod do
         :options => {
           :verify_card => true,
           :verification_amount => "100.00"
-        }
+        },
       )
 
       result.should_not be_success
@@ -306,16 +306,16 @@ describe Braintree::PaymentMethod do
         :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',
+          :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}
+        :options => {:verify_card => true},
       )
       expect(result).not_to be_success
       error = result.errors.for(:verification).first
@@ -329,16 +329,16 @@ describe Braintree::PaymentMethod do
         :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',
+          :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}
+        :options => {:verify_card => true},
       )
 
       expect(result).to be_success
@@ -370,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
 
@@ -378,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
@@ -402,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"
 
@@ -419,7 +419,7 @@ describe Braintree::PaymentMethod do
         :customer_id => customer.id,
         :billing_address => {
           :street_address => "123 Abc Way"
-        }
+        },
       )
 
       result.should be_success
@@ -441,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"
 
@@ -458,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
@@ -481,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(
@@ -491,7 +491,7 @@ describe Braintree::PaymentMethod do
         :options => {:validate => false},
         :billing_address => {
           :street_address => "456 Xyz Way"
-        }
+        },
       )
       response.code.should == "202"
 
@@ -501,7 +501,7 @@ describe Braintree::PaymentMethod do
         :customer_id => customer.id,
         :billing_address => {
           :street_address => "123 Abc Way"
-        }
+        },
       )
 
       result.should be_success
@@ -523,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(
@@ -532,7 +532,7 @@ describe Braintree::PaymentMethod do
         :expirationYear => 2020,
         :billing_address => {
           :street_address => "456 Xyz Way"
-        }
+        },
       )
       response.code.should == "201"
 
@@ -542,7 +542,7 @@ describe Braintree::PaymentMethod do
         :customer_id => customer.id,
         :billing_address => {
           :street_address => "123 Abc Way"
-        }
+        },
       )
 
       result.should be_success
@@ -554,6 +554,58 @@ describe Braintree::PaymentMethod do
       found_credit_card.billing_address.street_address.should == "456 Xyz Way"
     end
 
+    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(
@@ -561,7 +613,7 @@ describe Braintree::PaymentMethod do
             :number => Braintree::Test::CreditCardNumbers::Hiper,
             :expiration_month => "11",
             :expiration_year => "2099",
-          }
+          },
         )
         customer = Braintree::Customer.create!
         result = Braintree::PaymentMethod.create(
@@ -571,7 +623,7 @@ describe Braintree::PaymentMethod do
             :verify_card => true,
             :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
             :verification_account_type => "debit",
-          }
+          },
         )
 
         result.should be_success
@@ -584,7 +636,7 @@ describe Braintree::PaymentMethod do
             :number => Braintree::Test::CreditCardNumbers::Hiper,
             :expiration_month => "11",
             :expiration_year => "2099",
-          }
+          },
         )
         customer = Braintree::Customer.create!
         result = Braintree::PaymentMethod.create(
@@ -594,7 +646,7 @@ describe Braintree::PaymentMethod do
             :verify_card => true,
             :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
             :verification_account_type => "credit",
-          }
+          },
         )
 
         result.should be_success
@@ -607,7 +659,7 @@ describe Braintree::PaymentMethod do
             :number => Braintree::Test::CreditCardNumbers::Hiper,
             :expiration_month => "11",
             :expiration_year => "2099",
-          }
+          },
         )
         customer = Braintree::Customer.create!
         result = Braintree::PaymentMethod.create(
@@ -617,7 +669,7 @@ describe Braintree::PaymentMethod do
             :verify_card => true,
             :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
             :verification_account_type => "ach",
-          }
+          },
         )
 
         result.should_not be_success
@@ -630,7 +682,7 @@ describe Braintree::PaymentMethod do
             :number => Braintree::Test::CreditCardNumbers::Visa,
             :expiration_month => "11",
             :expiration_year => "2099",
-          }
+          },
         )
         customer = Braintree::Customer.create!
         result = Braintree::PaymentMethod.create(
@@ -639,7 +691,7 @@ describe Braintree::PaymentMethod do
           :options => {
             :verify_card => true,
             :verification_account_type => "credit",
-          }
+          },
         )
 
         result.should_not be_success
@@ -653,7 +705,7 @@ 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",
@@ -677,7 +729,7 @@ 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",
@@ -701,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
@@ -778,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
@@ -793,7 +845,7 @@ describe Braintree::PaymentMethod do
           :customer_id => customer.id,
           :billing_address => {
             :street_address => "123 Abc Way"
-          }
+          },
         )
 
         result.should be_success
@@ -811,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
@@ -828,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
@@ -842,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(
@@ -852,7 +904,7 @@ 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
@@ -866,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
@@ -876,6 +928,99 @@ 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
@@ -889,20 +1034,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"]
       payment_method = Braintree::PaymentMethod.create!(
         :payment_method_nonce => nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
 
       payment_method.should be_a(Braintree::CreditCard)
@@ -920,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
 
@@ -936,13 +1081,13 @@ 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)
@@ -959,11 +1104,11 @@ describe Braintree::PaymentMethod do
         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
 
@@ -982,7 +1127,7 @@ describe Braintree::PaymentMethod do
         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
 
@@ -1007,7 +1152,7 @@ describe Braintree::PaymentMethod do
         result = Braintree::PaymentMethod.create(
           :payment_method_nonce => Braintree::Test::Nonce::VenmoAccount,
           :customer_id => customer.id,
-          :token => payment_method_token
+          :token => payment_method_token,
         )
         result.should be_success
 
@@ -1017,68 +1162,68 @@ describe Braintree::PaymentMethod do
         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 == 'Venmo-Joe-1'
+        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 "android pay cards" do
+    context "google pay cards" do
       it "finds the proxy card 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::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.is_network_tokenized?.should == false
-        android_pay_card.source_card_type.should == Braintree::CreditCard::CardType::Discover
-        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 == "Discover 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 = 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.is_network_tokenized?.should == true
-        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
 
@@ -1089,7 +1234,7 @@ describe Braintree::PaymentMethod do
         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
 
@@ -1110,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
@@ -1136,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
 
@@ -1157,11 +1302,11 @@ describe Braintree::PaymentMethod do
 
       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)
@@ -1190,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)
@@ -1227,14 +1372,14 @@ describe Braintree::PaymentMethod do
           :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',
+            :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},
         )
@@ -1258,14 +1403,14 @@ describe Braintree::PaymentMethod do
           :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',
+            :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},
         )
@@ -1285,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
@@ -1302,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!
@@ -1311,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
@@ -1333,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
@@ -1356,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 => {
@@ -1365,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
@@ -1381,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
@@ -1402,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
@@ -1423,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
@@ -1453,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},
@@ -1467,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
@@ -1488,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."
@@ -1504,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
@@ -1522,39 +1803,23 @@ describe Braintree::PaymentMethod do
       end
     end
 
-    context "coinbase accounts" do
-      it "cannot create a payment method token with Coinbase" do
-        customer = Braintree::Customer.create!
-
-        nonce = Braintree::Test::Nonce::Coinbase
-        result = Braintree::PaymentMethod.create(
-          :payment_method_nonce => nonce,
-          :customer_id => customer.id
-        )
-
-        result.should_not be_success
-
-        result.errors.for(:coinbase_account).first.code.should == Braintree::ErrorCodes::PaymentMethod::PaymentMethodNoLongerSupported
-      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 = make_token
         updated_result = Braintree::PaymentMethod.update(
           original_token,
-          :token => updated_token
+          :token => updated_token,
         )
 
         updated_paypal_account = Braintree::PayPalAccount.find(updated_token)
@@ -1571,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)
@@ -1597,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
@@ -1632,13 +1897,13 @@ describe Braintree::PaymentMethod do
         :customer_id => customer.id,
         :cvv => "123",
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
+        :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"
+        :expiration_date => "06/2013",
       )
       payment_method.should == credit_card
       payment_method.cardholder_name.should == "New Holder"
@@ -1655,7 +1920,7 @@ describe Braintree::PaymentMethod do
         :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(
         :first_name => "Joe",
@@ -1664,19 +1929,19 @@ describe Braintree::PaymentMethod do
         :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(
         :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(
         :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, {
         :merchant_public_id => "integration_merchant_id",
@@ -1685,7 +1950,7 @@ describe Braintree::PaymentMethod do
 
       @granting_gateway = Braintree::Gateway.new(
         :access_token => access_token,
-        :logger => Logger.new("/dev/null")
+        :logger => Logger.new("/dev/null"),
       )
     end
 
@@ -1701,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
@@ -1719,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
@@ -1731,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
@@ -1739,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
@@ -1754,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
@@ -1766,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
@@ -1780,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