braintree 3.1.0 → 4.1.0

data/spec/integration/braintree/payment_method_nonce_spec.rb

@@ -12,12 +12,12 @@ describe Braintree::PaymentMethodNonce do
           :number => "4111111111111111",
           :expiration_month => "11",
           :expiration_year => "2099",
-        }
+        },
       )
 
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
 
       result.should be_success
@@ -49,12 +49,12 @@ describe Braintree::PaymentMethodNonce do
           :number => "4111111111111111",
           :expiration_month => "11",
           :expiration_year => "2099",
-        }
+        },
       )
 
       payment_method = Braintree::PaymentMethod.create!(
         :payment_method_nonce => nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
 
       payment_method.should be_a(Braintree::CreditCard)
@@ -79,33 +79,24 @@ describe Braintree::PaymentMethodNonce do
       result.should be_success
       nonce.nonce.should == "fake-valid-nonce"
       nonce.type.should == "CreditCard"
-      nonce.details.fetch(:last_two).should == "81"
-      nonce.details.fetch(:card_type).should == "Visa"
+      nonce.details.bin.should == "401288"
+      nonce.details.card_type.should == "Visa"
+      nonce.details.expiration_month.should == "12"
+      nonce.details.expiration_year.should == "2022"
+      nonce.details.is_network_tokenized?.should be_nil
+      nonce.details.last_two.should == "81"
+      nonce.details.payer_info.should be_nil
     end
 
     it "return paypal details if details exist" do
       result = Braintree::PaymentMethodNonce.find("fake-paypal-one-time-nonce")
       nonce = result.payment_method_nonce
-
-      nonce.details.fetch(:cobranded_card_label).should_not be_nil
-      nonce.details.fetch(:shipping_option_id).should_not be_nil
-      nonce.details.fetch(:billing_address).fetch(:recipient_name).should_not be_nil
-      nonce.details.fetch(:shipping_address).fetch(:recipient_name).should_not be_nil
-
-      nonce.details.fetch(:payer_info).fetch(:first_name).should_not be_nil
-      nonce.details.fetch(:payer_info).fetch(:last_name).should_not be_nil
-      nonce.details.fetch(:payer_info).fetch(:email).should_not be_nil
-      nonce.details.fetch(:payer_info).fetch(:payer_id).should_not be_nil
-    end
-
-    it "return venmo details if details exist" do
-      result = Braintree::PaymentMethodNonce.find("fake-venmo-account-nonce")
-
-      nonce = result.payment_method_nonce
-
-      nonce.details.fetch(:last_two).should == "99"
-      nonce.details.fetch(:username).should == "venmojoe"
-      nonce.details.fetch(:venmo_user_id).should == "Venmo-Joe-1"
+      nonce.details.payer_info.billing_agreement_id.should be_nil
+      nonce.details.payer_info.country_code.should be_nil
+      nonce.details.payer_info.email.should_not be_nil
+      nonce.details.payer_info.first_name.should_not be_nil
+      nonce.details.payer_info.last_name.should_not be_nil
+      nonce.details.payer_info.payer_id.should_not be_nil
     end
 
     it "returns null 3ds_info if there isn't any" do
@@ -114,7 +105,7 @@ describe Braintree::PaymentMethodNonce do
           :number => "4111111111111111",
           :expiration_month => "11",
           :expiration_year => "2099",
-        }
+        },
       )
 
       result = Braintree::PaymentMethodNonce.find(nonce)
@@ -131,7 +122,7 @@ describe Braintree::PaymentMethodNonce do
       nonce = result.payment_method_nonce
       result.should be_success
       nonce.details.should_not be_nil
-      nonce.details[:bin].should == "401288"
+      nonce.details.bin.should == "401288"
     end
 
     it "returns bin_data with commercial set to Yes" do
@@ -257,19 +248,19 @@ describe Braintree::PaymentMethodNonce do
       context "regulation environments" do
         it "can get unregulated" do
           expect(
-            request_authentication_insights(european_merchant_token, indian_payment_token)[:regulation_environment]
+            request_authentication_insights(european_merchant_token, indian_payment_token)[:regulation_environment],
           ).to eq "unregulated"
         end
 
         it "can get psd2" do
           expect(
-            request_authentication_insights(european_merchant_token, european_payment_token)[:regulation_environment]
+            request_authentication_insights(european_merchant_token, european_payment_token)[:regulation_environment],
           ).to eq "psd2"
         end
 
         it "can get rbi" do
           expect(
-            request_authentication_insights(indian_merchant_token, indian_payment_token)[:regulation_environment]
+            request_authentication_insights(indian_merchant_token, indian_payment_token)[:regulation_environment],
           ).to eq "rbi"
         end
       end
@@ -277,19 +268,19 @@ describe Braintree::PaymentMethodNonce do
       context "sca_indicator" do
         it "can get unavailable" do
           expect(
-            request_authentication_insights(indian_merchant_token, indian_payment_token)[:sca_indicator]
+            request_authentication_insights(indian_merchant_token, indian_payment_token)[:sca_indicator],
           ).to eq "unavailable"
         end
 
         it "can get sca_required" do
           expect(
-            request_authentication_insights(indian_merchant_token, indian_payment_token, {amount: 2001})[:sca_indicator]
+            request_authentication_insights(indian_merchant_token, indian_payment_token, {amount: 2001})[:sca_indicator],
           ).to eq "sca_required"
         end
 
         it "can get sca_optional" do
           expect(
-            request_authentication_insights(indian_merchant_token, indian_payment_token, {amount: 2000, recurring_customer_consent: true, recurring_max_amount: 2000})[:sca_indicator]
+            request_authentication_insights(indian_merchant_token, indian_payment_token, {amount: 2000, recurring_customer_consent: true, recurring_max_amount: 2000})[:sca_indicator],
 
           ).to eq "sca_optional"
         end
@@ -309,7 +300,7 @@ describe Braintree::PaymentMethodNonce do
 
         result = Braintree::PaymentMethodNonce.create(
           payment_method_token,
-          payment_method_nonce: nonce_request
+          payment_method_nonce: nonce_request,
         )
         result.should be_success
 

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
@@ -107,7 +107,7 @@ describe Braintree::PaymentMethod do
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => Braintree::Test::Nonce::GooglePayDiscover,
         :customer_id => customer.id,
-        :token => token
+        :token => token,
       )
 
       result.should be_success
@@ -135,7 +135,7 @@ describe Braintree::PaymentMethod do
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => Braintree::Test::Nonce::GooglePayMasterCard,
         :customer_id => customer.id,
-        :token => token
+        :token => token,
       )
 
       result.should be_success
@@ -163,7 +163,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
@@ -185,7 +185,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
@@ -195,7 +195,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
@@ -210,12 +210,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
@@ -229,7 +229,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(
@@ -238,7 +238,7 @@ describe Braintree::PaymentMethod do
         :options => {
           :verify_card => true,
           :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId
-        }
+        },
       )
 
       result.should_not be_success
@@ -254,7 +254,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(
@@ -263,7 +263,7 @@ describe Braintree::PaymentMethod do
         :options => {
           :verify_card => true,
           :verification_amount => "100.00"
-        }
+        },
       )
 
       result.should_not be_success
@@ -279,16 +279,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
@@ -302,16 +302,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
@@ -343,7 +343,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
 
@@ -351,14 +351,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
@@ -375,14 +375,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"
 
@@ -392,7 +392,7 @@ describe Braintree::PaymentMethod do
         :customer_id => customer.id,
         :billing_address => {
           :street_address => "123 Abc Way"
-        }
+        },
       )
 
       result.should be_success
@@ -414,14 +414,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"
 
@@ -431,7 +431,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
@@ -454,7 +454,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(
@@ -464,7 +464,7 @@ describe Braintree::PaymentMethod do
         :options => {:validate => false},
         :billing_address => {
           :street_address => "456 Xyz Way"
-        }
+        },
       )
       response.code.should == "202"
 
@@ -474,7 +474,7 @@ describe Braintree::PaymentMethod do
         :customer_id => customer.id,
         :billing_address => {
           :street_address => "123 Abc Way"
-        }
+        },
       )
 
       result.should be_success
@@ -496,7 +496,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(
@@ -505,7 +505,7 @@ describe Braintree::PaymentMethod do
         :expirationYear => 2020,
         :billing_address => {
           :street_address => "456 Xyz Way"
-        }
+        },
       )
       response.code.should == "201"
 
@@ -515,7 +515,7 @@ describe Braintree::PaymentMethod do
         :customer_id => customer.id,
         :billing_address => {
           :street_address => "123 Abc Way"
-        }
+        },
       )
 
       result.should be_success
@@ -527,6 +527,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(
@@ -534,7 +586,7 @@ describe Braintree::PaymentMethod do
             :number => Braintree::Test::CreditCardNumbers::Hiper,
             :expiration_month => "11",
             :expiration_year => "2099",
-          }
+          },
         )
         customer = Braintree::Customer.create!
         result = Braintree::PaymentMethod.create(
@@ -544,7 +596,7 @@ describe Braintree::PaymentMethod do
             :verify_card => true,
             :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
             :verification_account_type => "debit",
-          }
+          },
         )
 
         result.should be_success
@@ -557,7 +609,7 @@ describe Braintree::PaymentMethod do
             :number => Braintree::Test::CreditCardNumbers::Hiper,
             :expiration_month => "11",
             :expiration_year => "2099",
-          }
+          },
         )
         customer = Braintree::Customer.create!
         result = Braintree::PaymentMethod.create(
@@ -567,7 +619,7 @@ describe Braintree::PaymentMethod do
             :verify_card => true,
             :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
             :verification_account_type => "credit",
-          }
+          },
         )
 
         result.should be_success
@@ -580,7 +632,7 @@ describe Braintree::PaymentMethod do
             :number => Braintree::Test::CreditCardNumbers::Hiper,
             :expiration_month => "11",
             :expiration_year => "2099",
-          }
+          },
         )
         customer = Braintree::Customer.create!
         result = Braintree::PaymentMethod.create(
@@ -590,7 +642,7 @@ describe Braintree::PaymentMethod do
             :verify_card => true,
             :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
             :verification_account_type => "ach",
-          }
+          },
         )
 
         result.should_not be_success
@@ -603,7 +655,7 @@ describe Braintree::PaymentMethod do
             :number => Braintree::Test::CreditCardNumbers::Visa,
             :expiration_month => "11",
             :expiration_year => "2099",
-          }
+          },
         )
         customer = Braintree::Customer.create!
         result = Braintree::PaymentMethod.create(
@@ -612,7 +664,7 @@ describe Braintree::PaymentMethod do
           :options => {
             :verify_card => true,
             :verification_account_type => "credit",
-          }
+          },
         )
 
         result.should_not be_success
@@ -626,7 +678,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",
@@ -650,7 +702,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",
@@ -674,7 +726,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
@@ -751,7 +803,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
@@ -766,7 +818,7 @@ describe Braintree::PaymentMethod do
           :customer_id => customer.id,
           :billing_address => {
             :street_address => "123 Abc Way"
-          }
+          },
         )
 
         result.should be_success
@@ -784,7 +836,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
@@ -801,7 +853,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
@@ -815,7 +867,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(
@@ -825,7 +877,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
@@ -839,7 +891,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
@@ -849,6 +901,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
@@ -862,20 +1007,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)
@@ -893,7 +1038,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
 
@@ -909,13 +1054,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)
@@ -932,11 +1077,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
 
@@ -955,7 +1100,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
 
@@ -980,7 +1125,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
 
@@ -990,8 +1135,8 @@ 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 == "Venmo-Joe-1"
         venmo_account.source_description.should == "Venmo Account: venmojoe"
         venmo_account.customer_id.should == customer.id
       end
@@ -1004,7 +1149,7 @@ describe Braintree::PaymentMethod do
         result = Braintree::PaymentMethod.create(
           :payment_method_nonce => Braintree::Test::Nonce::GooglePayDiscover,
           :customer_id => customer.id,
-          :token => payment_method_token
+          :token => payment_method_token,
         )
         result.should be_success
 
@@ -1032,7 +1177,7 @@ describe Braintree::PaymentMethod do
         result = Braintree::PaymentMethod.create(
           :payment_method_nonce => Braintree::Test::Nonce::GooglePayMasterCard,
           :customer_id => customer.id,
-          :token => payment_method_token
+          :token => payment_method_token,
         )
         result.should be_success
 
@@ -1062,7 +1207,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
 
@@ -1088,7 +1233,7 @@ describe Braintree::PaymentMethod do
 
       create_result = Braintree::PaymentMethod.create(
         :payment_method_nonce => Braintree::Test::Nonce::GooglePayDiscover,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
 
       token = create_result.payment_method.token
@@ -1109,7 +1254,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
 
@@ -1130,11 +1275,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)
@@ -1163,7 +1308,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)
@@ -1200,14 +1345,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},
         )
@@ -1231,14 +1376,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},
         )
@@ -1258,13 +1403,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
@@ -1275,6 +1420,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!
@@ -1284,12 +1565,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
@@ -1306,13 +1587,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
@@ -1329,7 +1610,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 => {
@@ -1338,7 +1619,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
@@ -1354,12 +1635,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
@@ -1375,14 +1656,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
@@ -1396,11 +1677,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
@@ -1426,7 +1707,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},
@@ -1440,7 +1721,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
@@ -1461,12 +1742,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."
@@ -1477,12 +1758,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
@@ -1501,17 +1782,17 @@ 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,
         )
         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)
@@ -1528,19 +1809,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)
@@ -1554,25 +1835,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
@@ -1589,13 +1870,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"
@@ -1612,7 +1893,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",
@@ -1621,19 +1902,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",
@@ -1642,7 +1923,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
 
@@ -1658,13 +1939,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
@@ -1676,7 +1957,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
@@ -1688,7 +1969,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
@@ -1723,7 +2004,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
@@ -1737,7 +2018,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