braintree 3.2.0 → 4.2.0

data/spec/integration/braintree/apple_pay_spec.rb

@@ -5,18 +5,18 @@ describe Braintree::ApplePayGateway do
     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"),
     )
 
     result = gateway.merchant.create(
       :email => "name@email.com",
       :country_code_alpha3 => "USA",
-      :payment_methods => ["credit_card", "paypal"]
+      :payment_methods => ["credit_card", "paypal"],
     )
 
     @gateway = Braintree::Gateway.new(
       :access_token => result.credentials.access_token,
-      :logger => Logger.new("/dev/null")
+      :logger => Logger.new("/dev/null"),
     )
   end
 

data/spec/integration/braintree/braintree_gateway_spec.rb

@@ -12,7 +12,8 @@ describe Braintree::Gateway do
   end
 
   describe "query" do
-    it "makes valid GraphQL queries when given a definition" do
+    # we are temporarily skipping this test until we have a more stable CI env
+    xit "makes valid GraphQL queries when given a definition" do
       definition = <<-GRAPHQL
       mutation ExampleServerSideSingleUseToken($input: TokenizeCreditCardInput!) {
         tokenizeCreditCard(input: $input) {

data/spec/integration/braintree/client_api/client_token_spec.rb

@@ -12,7 +12,7 @@ describe Braintree::ClientToken do
         config,
         :authorization_fingerprint => client_token["authorizationFingerprint"],
         :shared_customer_identifier => "fake_identifier",
-        :shared_customer_identifier_type => "testing"
+        :shared_customer_identifier_type => "testing",
       )
 
       response = http.get_payment_methods
@@ -49,7 +49,7 @@ describe Braintree::ClientToken do
         :customer_id => result.customer.id,
         :options => {
           :verify_card => true
-        }
+        },
       )
       client_token = decode_client_token(raw_client_token)
 
@@ -57,7 +57,7 @@ describe Braintree::ClientToken do
         config,
         :authorization_fingerprint => client_token["authorizationFingerprint"],
         :shared_customer_identifier => "fake_identifier",
-        :shared_customer_identifier_type => "testing"
+        :shared_customer_identifier_type => "testing",
       )
 
       response = http.add_payment_method(
@@ -65,7 +65,7 @@ describe Braintree::ClientToken do
           :number => "4000111111111115",
           :expiration_month => "11",
           :expiration_year => "2099"
-        }
+        },
       )
 
       response.code.should == "422"
@@ -79,7 +79,7 @@ describe Braintree::ClientToken do
         :customer_id => customer_id,
         :options => {
           :make_default => true
-        }
+        },
       )
       client_token = decode_client_token(raw_client_token)
 
@@ -87,7 +87,7 @@ describe Braintree::ClientToken do
         config,
         :authorization_fingerprint => client_token["authorizationFingerprint"],
         :shared_customer_identifier => "fake_identifier",
-        :shared_customer_identifier_type => "testing"
+        :shared_customer_identifier_type => "testing",
       )
 
       response = http.add_payment_method(
@@ -95,7 +95,7 @@ describe Braintree::ClientToken do
           :number => "4111111111111111",
           :expiration_month => "11",
           :expiration_year => "2099"
-        }
+        },
       )
 
       response.code.should == "201"
@@ -105,7 +105,7 @@ describe Braintree::ClientToken do
           :number => "4005519200000004",
           :expiration_month => "11",
           :expiration_year => "2099"
-        }
+        },
       )
 
       response.code.should == "201"
@@ -119,7 +119,7 @@ describe Braintree::ClientToken do
       result = Braintree::Customer.create
       customer_id = result.customer.id
       raw_client_token = Braintree::ClientToken.generate(
-        :customer_id => customer_id
+        :customer_id => customer_id,
       )
       client_token = decode_client_token(raw_client_token)
 
@@ -127,7 +127,7 @@ describe Braintree::ClientToken do
         config,
         :authorization_fingerprint => client_token["authorizationFingerprint"],
         :shared_customer_identifier => "fake_identifier",
-        :shared_customer_identifier_type => "testing"
+        :shared_customer_identifier_type => "testing",
       )
 
       response = http.add_payment_method(
@@ -135,7 +135,7 @@ describe Braintree::ClientToken do
           :number => "4111111111111111",
           :expiration_month => "11",
           :expiration_year => "2099"
-        }
+        },
       )
 
       response.code.should == "201"
@@ -144,7 +144,7 @@ describe Braintree::ClientToken do
         :customer_id => customer_id,
         :options => {
           :fail_on_duplicate_payment_method => true
-        }
+        },
       )
       second_client_token = decode_client_token(second_raw_client_token)
 
@@ -155,7 +155,7 @@ describe Braintree::ClientToken do
           :number => "4111111111111111",
           :expiration_month => "11",
           :expiration_year => "2099"
-        }
+        },
       )
 
       response.code.should == "422"
@@ -165,7 +165,7 @@ describe Braintree::ClientToken do
       merchant_account_id = SpecHelper::NonDefaultMerchantAccountId
 
       raw_client_token = Braintree::ClientToken.generate(
-        :merchant_account_id => merchant_account_id
+        :merchant_account_id => merchant_account_id,
       )
       client_token = decode_client_token(raw_client_token)
 

data/spec/integration/braintree/client_api/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'json'
+require "json"
 
 def decode_client_token(raw_client_token)
   decoded_client_token_string = Base64.decode64(raw_client_token)
@@ -20,7 +20,7 @@ def _initialize_client(options)
   ClientApiHttp.new(Braintree::Configuration.instantiate,
     :authorization_fingerprint => client_token["authorizationFingerprint"],
     :shared_customer_identifier => "fake_identifier",
-    :shared_customer_identifier_type => "testing"
+    :shared_customer_identifier_type => "testing",
   )
 end
 
@@ -42,7 +42,7 @@ def nonce_for_paypal_account(paypal_account_details)
   raw_client_token = Braintree::ClientToken.generate
   client_token = decode_client_token(raw_client_token)
   client = ClientApiHttp.new(Braintree::Configuration.instantiate,
-    :authorization_fingerprint => client_token["authorizationFingerprint"]
+    :authorization_fingerprint => client_token["authorizationFingerprint"],
   )
 
   response = client.create_paypal_account(paypal_account_details)
@@ -283,7 +283,7 @@ class ClientApiHttp
     params.merge!(
       :authorization_fingerprint => @options[:authorization_fingerprint],
       :shared_customer_identifier => "fake_identifier",
-      :shared_customer_identifier_type => "testing"
+      :shared_customer_identifier_type => "testing",
     )
 
     post("/merchants/#{config.merchant_id}/client_api/v1/payment_methods/credit_cards", params)
@@ -292,7 +292,7 @@ class ClientApiHttp
   def create_paypal_account(params)
     params = {:paypal_account => params}
     params.merge!(
-      :authorization_fingerprint => @options[:authorization_fingerprint]
+      :authorization_fingerprint => @options[:authorization_fingerprint],
     )
 
     post("/merchants/#{config.merchant_id}/client_api/v1/payment_methods/paypal_accounts", params)

data/spec/integration/braintree/credit_card_spec.rb

@@ -46,7 +46,7 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::Visa,
         :expiration_month => "05",
-        :expiration_year => "2012"
+        :expiration_year => "2012",
       )
       result.success?.should == true
       credit_card = result.credit_card
@@ -63,7 +63,7 @@ describe Braintree::CreditCard do
         :number => Braintree::Test::CreditCardNumbers::Visa,
         :expiration_date => "05/2009",
         :cvv => "100",
-        :token => token
+        :token => token,
       )
       result.success?.should == true
       credit_card = result.credit_card
@@ -81,7 +81,7 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::Visa,
         :expiration_date => "05/2009",
-        :billing_address_id => address.id
+        :billing_address_id => address.id,
       ).credit_card
 
       credit_card.billing_address.id.should == address.id
@@ -95,7 +95,7 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::Visa,
         :expiration_date => "05/2009",
-        :options => {}
+        :options => {},
       )
       result.success?.should == true
     end
@@ -106,7 +106,7 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::Visa,
         :expiration_date => "05/2009",
-        :options => {:verify_card => true}
+        :options => {:verify_card => true},
       )
       result.success?.should == false
       result.credit_card_verification.status.should == Braintree::CreditCardVerification::Status::ProcessorDeclined
@@ -124,7 +124,7 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::Visa,
         :expiration_date => "05/2009",
-        :options => {:verify_card => true, :verification_amount => "100.00"}
+        :options => {:verify_card => true, :verification_amount => "100.00"},
       )
       result.success?.should == false
       result.credit_card_verification.status.should == Braintree::CreditCardVerification::Status::ProcessorDeclined
@@ -137,7 +137,7 @@ describe Braintree::CreditCard do
     end
 
     it "returns risk data on verification on credit_card create" do
-      with_advanced_fraud_integration_merchant do
+      with_fraud_protection_enterprise_merchant do
         customer = Braintree::Customer.create!
         credit_card = Braintree::CreditCard.create!(
           :cardholder_name => "Original Holder",
@@ -145,13 +145,57 @@ describe Braintree::CreditCard do
           :cvv => "123",
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2020",
-          :options => {:verify_card => true}
+          :options => {:verify_card => true},
         )
         verification = credit_card.verification
-        verification.risk_data.should respond_to(:id)
-        verification.risk_data.should respond_to(:decision)
-        verification.risk_data.should respond_to(:device_data_captured)
-        verification.risk_data.should respond_to(:fraud_service_provider)
+        verification.risk_data.id.should_not be_nil
+        verification.risk_data.decision.should_not be_nil
+        verification.risk_data.decision_reasons.should_not be_nil
+        expect(verification.risk_data).to respond_to(:device_data_captured)
+        expect(verification.risk_data).to respond_to(:fraud_service_provider)
+        expect(verification.risk_data).to respond_to(:transaction_risk_score)
+      end
+    end
+
+    it "includes risk data when skip_advanced_fraud_checking is false" do
+      with_fraud_protection_enterprise_merchant do
+        customer = Braintree::Customer.create!
+        result = Braintree::CreditCard.create(
+          :cardholder_name => "Original Holder",
+          :customer_id => customer.id,
+          :cvv => "123",
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "05/2020",
+          :options => {
+            :skip_advanced_fraud_checking => false,
+            :verify_card => true,
+          },
+        )
+
+        expect(result).to be_success
+        verification = result.credit_card.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!
+        result = Braintree::CreditCard.create(
+          :cardholder_name => "Original Holder",
+          :customer_id => customer.id,
+          :cvv => "123",
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "05/2020",
+          :options => {
+            :skip_advanced_fraud_checking => true,
+            :verify_card => true,
+          },
+        )
+
+        expect(result).to be_success
+        verification = result.credit_card.verification
+        expect(verification.risk_data).to be_nil
       end
     end
 
@@ -171,7 +215,7 @@ describe Braintree::CreditCard do
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2009",
           :cvv => "200",
-          :options => {:verify_card => true}
+          :options => {:verify_card => true},
         )
         result.success?.should == false
         result.credit_card_verification.gateway_rejection_reason.should == Braintree::CreditCardVerification::GatewayRejectionReason::CVV
@@ -188,7 +232,7 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::Visa,
         :expiration_date => "05/2009",
-        :options => {:verify_card => true, :verification_amount => "1.01"}
+        :options => {:verify_card => true, :verification_amount => "1.01"},
       )
       result.success?.should == false
       result.credit_card_verification.status.should == Braintree::CreditCardVerification::Status::ProcessorDeclined
@@ -209,7 +253,7 @@ describe Braintree::CreditCard do
         :options => {
           :verify_card => true,
           :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId
-        }
+        },
       )
       result.success?.should == false
       result.credit_card_verification.merchant_account_id.should == SpecHelper::NonDefaultMerchantAccountId
@@ -221,7 +265,7 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::Visa,
         :expiration_date => "05/2009",
-        :options => {:verify_card => false}
+        :options => {:verify_card => false},
       )
       result.success?.should == true
     end
@@ -232,15 +276,15 @@ describe Braintree::CreditCard 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',
-          :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",
+          :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
@@ -254,16 +298,16 @@ describe Braintree::CreditCard 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},
       )
       result.success?.should == true
 
@@ -274,7 +318,7 @@ describe Braintree::CreditCard do
       result = Braintree::CreditCard.create(
         :customer_id => customer.id,
         :payment_method_nonce => Braintree::Test::Nonce::ThreeDSecureVisaFullAuthentication,
-        :options => {:verify_card => true}
+        :options => {:verify_card => true},
       )
       result.success?.should == true
 
@@ -302,7 +346,7 @@ describe Braintree::CreditCard do
           :locality => "Chicago",
           :region => "Illinois",
           :postal_code => "60622"
-        }
+        },
       )
       result.success?.should == true
       credit_card = result.credit_card
@@ -321,7 +365,7 @@ describe Braintree::CreditCard do
           :country_code_alpha2 => "US",
           :country_code_alpha3 => "USA",
           :country_code_numeric => "840"
-        }
+        },
       )
       result.success?.should == true
       credit_card = result.credit_card
@@ -340,7 +384,7 @@ describe Braintree::CreditCard do
         :billing_address => {
           :country_name => "Mexico",
           :country_code_alpha2 => "US"
-        }
+        },
       )
       result.success?.should == false
       result.errors.for(:credit_card).for(:billing_address).on(:base).map { |e| e.code }.should include(Braintree::ErrorCodes::Address::InconsistentCountry)
@@ -351,7 +395,7 @@ describe Braintree::CreditCard do
       result = Braintree::CreditCard.create(
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "invalid_date"
+        :expiration_date => "invalid_date",
       )
       result.success?.should == false
       result.errors.for(:credit_card).on(:expiration_date)[0].message.should == "Expiration date is invalid."
@@ -362,7 +406,7 @@ describe Braintree::CreditCard do
       card1 = 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
 
@@ -372,7 +416,7 @@ describe Braintree::CreditCard do
         :expiration_date => "05/2009",
         :options => {
           :make_default => true
-        }
+        },
       ).credit_card
       card2.should be_default
 
@@ -401,7 +445,7 @@ describe Braintree::CreditCard do
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::Prepaid,
           :expiration_date => "05/2014",
-          :options => {:verify_card => true}
+          :options => {:verify_card => true},
         )
         credit_card = result.credit_card
         credit_card.prepaid.should == Braintree::CreditCard::Prepaid::Yes
@@ -413,7 +457,7 @@ describe Braintree::CreditCard do
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::Healthcare,
           :expiration_date => "05/2014",
-          :options => {:verify_card => true}
+          :options => {:verify_card => true},
         )
         credit_card = result.credit_card
         credit_card.healthcare.should == Braintree::CreditCard::Healthcare::Yes
@@ -426,7 +470,7 @@ describe Braintree::CreditCard do
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::DurbinRegulated,
           :expiration_date => "05/2014",
-          :options => {:verify_card => true}
+          :options => {:verify_card => true},
         )
         credit_card = result.credit_card
         credit_card.durbin_regulated.should == Braintree::CreditCard::DurbinRegulated::Yes
@@ -438,7 +482,7 @@ describe Braintree::CreditCard do
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::CountryOfIssuance,
           :expiration_date => "05/2014",
-          :options => {:verify_card => true}
+          :options => {:verify_card => true},
         )
         credit_card = result.credit_card
         credit_card.country_of_issuance.should == Braintree::Test::CreditCardDefaults::CountryOfIssuance
@@ -450,7 +494,7 @@ describe Braintree::CreditCard do
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::IssuingBank,
           :expiration_date => "05/2014",
-          :options => {:verify_card => true}
+          :options => {:verify_card => true},
         )
         credit_card = result.credit_card
         credit_card.issuing_bank.should == Braintree::Test::CreditCardDefaults::IssuingBank
@@ -462,7 +506,7 @@ describe Braintree::CreditCard do
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::Payroll,
           :expiration_date => "05/2014",
-          :options => {:verify_card => true}
+          :options => {:verify_card => true},
         )
         credit_card = result.credit_card
         credit_card.payroll.should == Braintree::CreditCard::Payroll::Yes
@@ -475,7 +519,7 @@ describe Braintree::CreditCard do
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::Debit,
           :expiration_date => "05/2014",
-          :options => {:verify_card => true}
+          :options => {:verify_card => true},
         )
         credit_card = result.credit_card
         credit_card.debit.should == Braintree::CreditCard::Debit::Yes
@@ -487,7 +531,7 @@ describe Braintree::CreditCard do
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::Commercial,
           :expiration_date => "05/2014",
-          :options => {:verify_card => true}
+          :options => {:verify_card => true},
         )
         credit_card = result.credit_card
         credit_card.commercial.should == Braintree::CreditCard::Commercial::Yes
@@ -499,7 +543,7 @@ describe Braintree::CreditCard do
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::No,
           :expiration_date => "05/2014",
-          :options => {:verify_card => true}
+          :options => {:verify_card => true},
         )
         credit_card = result.credit_card
         credit_card.prepaid.should == Braintree::CreditCard::Prepaid::No
@@ -517,7 +561,7 @@ describe Braintree::CreditCard do
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::Unknown,
           :expiration_date => "05/2014",
-          :options => {:verify_card => true}
+          :options => {:verify_card => true},
         )
         credit_card = result.credit_card
         credit_card.prepaid.should == Braintree::CreditCard::Prepaid::Unknown
@@ -538,7 +582,7 @@ describe Braintree::CreditCard do
           customer = Braintree::Customer.create!
           result = Braintree::CreditCard.create(
             :customer_id => customer.id,
-            :venmo_sdk_payment_method_code => Braintree::Test::VenmoSDK::VisaPaymentMethodCode
+            :venmo_sdk_payment_method_code => Braintree::Test::VenmoSDK::VisaPaymentMethodCode,
           )
           result.success?.should == true
           result.credit_card.venmo_sdk?.should == false
@@ -550,7 +594,7 @@ describe Braintree::CreditCard do
           customer = Braintree::Customer.create!
           result = Braintree::CreditCard.create(
             :customer_id => customer.id,
-            :venmo_sdk_payment_method_code => Braintree::Test::VenmoSDK::InvalidPaymentMethodCode
+            :venmo_sdk_payment_method_code => Braintree::Test::VenmoSDK::InvalidPaymentMethodCode,
           )
 
           result.success?.should == false
@@ -569,7 +613,7 @@ describe Braintree::CreditCard do
             :cvv => "100",
             :options => {
               :venmo_sdk_session => Braintree::Test::VenmoSDK::Session
-            }
+            },
           )
           result.success?.should == true
           result.credit_card.venmo_sdk?.should == false
@@ -584,7 +628,7 @@ describe Braintree::CreditCard do
             :cvv => "100",
             :options => {
               :venmo_sdk_session => Braintree::Test::VenmoSDK::InvalidSession
-            }
+            },
           )
           result.success?.should == true
           result.credit_card.venmo_sdk?.should == false
@@ -600,12 +644,12 @@ describe Braintree::CreditCard do
             :expiration_month => "11",
             :expiration_year => "2099",
           },
-          :share => true
+          :share => true,
         )
         customer = Braintree::Customer.create!
         result = Braintree::CreditCard.create(
           :customer_id => customer.id,
-          :payment_method_nonce => nonce
+          :payment_method_nonce => nonce,
         )
 
         result.success?.should == true
@@ -642,7 +686,7 @@ describe Braintree::CreditCard do
             :verify_card => true,
             :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
             :verification_account_type => "debit",
-          }
+          },
         )
 
         expect(result).to be_success
@@ -659,7 +703,7 @@ describe Braintree::CreditCard do
             :verify_card => true,
             :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
             :verification_account_type => "credit",
-          }
+          },
         )
 
         expect(result).to be_success
@@ -675,7 +719,7 @@ describe Braintree::CreditCard do
             :verify_card => true,
             :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
             :verification_account_type => "ach",
-          }
+          },
         )
 
         expect(result).to_not be_success
@@ -691,7 +735,7 @@ describe Braintree::CreditCard do
           :options => {
             :verify_card => true,
             :verification_account_type => "credit",
-          }
+          },
         )
 
         expect(result).to_not be_success
@@ -707,7 +751,7 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :cardholder_name => "Adam Davis",
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2009"
+        :expiration_date => "05/2009",
       )
       credit_card.bin.should == Braintree::Test::CreditCardNumbers::Visa[0, 6]
       credit_card.cardholder_name.should == "Adam Davis"
@@ -721,7 +765,7 @@ describe Braintree::CreditCard do
         Braintree::CreditCard.create!(
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "invalid_date"
+          :expiration_date => "invalid_date",
         )
       end.to raise_error(Braintree::ValidationsFailed)
     end
@@ -733,11 +777,11 @@ describe Braintree::CreditCard do
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2010"
-        }
+        },
       )
       result = Braintree::CreditCard.credit(
         customer.credit_cards[0].token,
-        :amount => "100.00"
+        :amount => "100.00",
       )
       result.success?.should == true
       result.transaction.amount.should == BigDecimal("100.00")
@@ -756,11 +800,11 @@ describe Braintree::CreditCard do
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2010"
-        }
+        },
       )
       transaction = Braintree::CreditCard.credit!(
         customer.credit_cards[0].token,
-        :amount => "100.00"
+        :amount => "100.00",
       )
       transaction.amount.should == BigDecimal("100.00")
       transaction.type.should == "credit"
@@ -780,13 +824,13 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :cvv => "123",
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
+        :expiration_date => "05/2012",
       )
       update_result = Braintree::CreditCard.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.credit_card.should == credit_card
@@ -804,20 +848,20 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :cvv => "123",
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
+        :expiration_date => "05/2012",
       )
       result = Braintree::CreditCard.update(credit_card.token,
         :payment_method_nonce => Braintree::Test::Nonce::Transactable,
         :three_d_secure_pass_thru => {
-          :eci_flag => '02',
-          :cavv => 'some_cavv',
-          :xid => 'some_xid',
-          :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",
+          :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
@@ -832,25 +876,72 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :cvv => "123",
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
+        :expiration_date => "05/2012",
       )
       result = Braintree::CreditCard.update(credit_card.token,
         :payment_method_nonce => Braintree::Test::Nonce::Transactable,
         :three_d_secure_pass_thru => {
-          :eci_flag => '02',
-          :cavv => 'some_cavv',
+          :eci_flag => "02",
+          :cavv => "some_cavv",
           :three_d_secure_version=> "2.1.0",
-          :xid => 'some_xid',
-          :authentication_response => 'Y',
-          :directory_response => 'Y',
-          :cavv_algorithm => '2',
-          :ds_transaction_id => 'some_ds_transaction_id',
+          :xid => "some_xid",
+          :authentication_response => "Y",
+          :directory_response => "Y",
+          :cavv_algorithm => "2",
+          :ds_transaction_id => "some_ds_transaction_id",
         },
-        :options => {:verify_card => true}
+        :options => {:verify_card => true},
       )
 
       result.success?.should == true
+    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!(
+          :cardholder_name => "Original Holder",
+          :customer_id => customer.id,
+          :cvv => "123",
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "05/2020",
+        )
+        updated_result = Braintree::CreditCard.update(credit_card.token,
+          :expiration_date => "05/2021",
+          :options => {
+            :verify_card => true,
+            :skip_advanced_fraud_checking => false,
+          },
+        )
+
+        expect(updated_result).to be_success
+        verification = updated_result.credit_card.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!(
+          :cardholder_name => "Original Holder",
+          :customer_id => customer.id,
+          :cvv => "123",
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "05/2020",
+        )
+        updated_result = Braintree::CreditCard.update(credit_card.token,
+          :expiration_date => "05/2021",
+          :options => {
+            :verify_card => true,
+            :skip_advanced_fraud_checking => true,
+          },
+        )
+
+        expect(updated_result).to be_success
+        verification = updated_result.credit_card.verification
+        expect(verification.risk_data).to be_nil
+      end
     end
 
     context "billing address" do
@@ -862,12 +953,12 @@ describe Braintree::CreditCard do
           :expiration_date => "05/2012",
           :billing_address => {
             :street_address => "123 Nigeria Ave"
-          }
+          },
         )
         update_result = Braintree::CreditCard.update(credit_card.token,
           :billing_address => {
             :region => "IL"
-          }
+          },
         )
         update_result.success?.should == true
         updated_credit_card = update_result.credit_card
@@ -884,13 +975,13 @@ describe Braintree::CreditCard do
           :expiration_date => "05/2012",
           :billing_address => {
             :street_address => "123 Nigeria Ave"
-          }
+          },
         )
         update_result = Braintree::CreditCard.update(credit_card.token,
           :billing_address => {
             :region => "IL",
             :options => {:update_existing => true}
-          }
+          },
         )
         update_result.success?.should == true
         updated_credit_card = update_result.credit_card
@@ -907,7 +998,7 @@ describe Braintree::CreditCard do
           :expiration_date => "05/2012",
           :billing_address => {
             :street_address => "123 Nigeria Ave"
-          }
+          },
         )
         update_result = Braintree::CreditCard.update(credit_card.token,
           :billing_address => {
@@ -916,7 +1007,7 @@ describe Braintree::CreditCard do
             :country_code_alpha3 => "ASM",
             :country_code_numeric => "016",
             :options => {:update_existing => true}
-          }
+          },
         )
         update_result.success?.should == true
         updated_credit_card = update_result.credit_card
@@ -932,12 +1023,12 @@ describe Braintree::CreditCard 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::CreditCard.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.credit_card.should == credit_card
@@ -953,14 +1044,14 @@ describe Braintree::CreditCard do
         :customer_id => customer.id,
         :cvv => "123",
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
+        :expiration_date => "05/2012",
       )
       update_result = Braintree::CreditCard.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::CreditCardVerification::Status::ProcessorDeclined
@@ -985,7 +1076,7 @@ describe Braintree::CreditCard do
           :region => "Old State",
           :postal_code => "12345",
           :country_name => "Canada"
-        }
+        },
       )
       result = Braintree::CreditCard.update(credit_card.token,
         :options => {:verify_card => false},
@@ -999,7 +1090,7 @@ describe Braintree::CreditCard do
           :region => "New State",
           :postal_code => "56789",
           :country_name => "United States of America"
-        }
+        },
       )
       result.success?.should == true
       address = result.credit_card.billing_address
@@ -1020,12 +1111,12 @@ describe Braintree::CreditCard 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::CreditCard.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."
@@ -1036,12 +1127,12 @@ describe Braintree::CreditCard 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
@@ -1099,12 +1190,12 @@ describe Braintree::CreditCard do
         :cardholder_name => "Original Holder",
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
+        :expiration_date => "05/2012",
       )
       updated_credit_card = Braintree::CreditCard.update!(credit_card.token,
         :cardholder_name => "New Holder",
         :number => Braintree::Test::CreditCardNumbers::MasterCard,
-        :expiration_date => "06/2013"
+        :expiration_date => "06/2013",
       )
       updated_credit_card.token.should == credit_card.token
       updated_credit_card.bin.should == Braintree::Test::CreditCardNumbers::MasterCard[0, 6]
@@ -1120,13 +1211,13 @@ describe Braintree::CreditCard do
         :cardholder_name => "Original Holder",
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
+        :expiration_date => "05/2012",
       )
       expect do
         Braintree::CreditCard.update!(credit_card.token,
           :cardholder_name => "New Holder",
           :number => Braintree::Test::CreditCardNumbers::MasterCard,
-          :expiration_date => "invalid/date"
+          :expiration_date => "invalid/date",
         )
       end.to raise_error(Braintree::ValidationsFailed)
     end
@@ -1138,7 +1229,7 @@ describe Braintree::CreditCard 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
@@ -1158,7 +1249,7 @@ describe Braintree::CreditCard do
         Braintree::CreditCard.create!(
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "01/#{Time.now.year - 3}"
+          :expiration_date => "01/#{Time.now.year - 3}",
         )
       end
 
@@ -1189,14 +1280,14 @@ describe Braintree::CreditCard do
         Braintree::CreditCard.create!(
           :customer_id => customer.id,
           :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "01/2010"
+          :expiration_date => "01/2010",
         )
       end
 
       collection = Braintree::CreditCard.expiring_between(Time.mktime(2010, 1, 1), Time.mktime(2010,3, 1))
       collection.maximum_size.should > 100
 
-      credit_card_ids = collection.map {|c| c.token }.uniq.compact
+      credit_card_ids = collection.map { |c| c.token }.uniq.compact
       credit_card_ids.size.should == collection.maximum_size
     end
   end
@@ -1207,7 +1298,7 @@ describe Braintree::CreditCard 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
       credit_card = Braintree::CreditCard.find(result.credit_card.token)
@@ -1222,13 +1313,13 @@ describe Braintree::CreditCard 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::CreditCard.find(credit_card.token)
@@ -1272,7 +1363,7 @@ describe Braintree::CreditCard do
           :expiration_month => "11",
           :expiration_year => "2099",
         },
-        :client_token_options => {:customer_id => customer.id}
+        :client_token_options => {:customer_id => customer.id},
       )
 
       credit_card = Braintree::CreditCard.from_nonce(nonce)
@@ -1286,7 +1377,7 @@ describe Braintree::CreditCard do
           :number => "4111111111111111",
           :expiration_month => "11",
           :expiration_year => "2099",
-        }
+        },
       )
       expect do
         Braintree::CreditCard.from_nonce(nonce)
@@ -1301,7 +1392,7 @@ describe Braintree::CreditCard do
           :expiration_month => "11",
           :expiration_year => "2099",
         },
-        :client_token_options => {:customer_id => customer.id}
+        :client_token_options => {:customer_id => customer.id},
       )
 
       Braintree::CreditCard.from_nonce(nonce)
@@ -1317,7 +1408,7 @@ describe Braintree::CreditCard do
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2010"
-        }
+        },
       )
       result = Braintree::CreditCard.sale(customer.credit_cards[0].token, :amount => "100.00")
 
@@ -1336,13 +1427,13 @@ describe Braintree::CreditCard do
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2010"
-        }
+        },
       )
       result = Braintree::CreditCard.sale(customer.credit_cards[0].token,
         :amount => "100.00",
         :credit_card => {
           :cvv => "301"
-        }
+        },
       )
 
       result.success?.should == true
@@ -1360,7 +1451,7 @@ describe Braintree::CreditCard do
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2010"
-        }
+        },
       )
       transaction = Braintree::CreditCard.sale!(customer.credit_cards[0].token, :amount => "100.00")
       transaction.amount.should == BigDecimal("100.00")
@@ -1380,7 +1471,7 @@ describe Braintree::CreditCard do
         :cardholder_name => "Original Holder",
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
+        :expiration_date => "05/2012",
       )
 
       credit_card.nonce.should_not be_nil
@@ -1398,7 +1489,7 @@ describe Braintree::CreditCard do
       credit_card = Braintree::CreditCard.create(
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2009"
+        :expiration_date => "05/2009",
       ).credit_card
       credit_card_vaulted = Braintree::CreditCard.find(credit_card.token)
       credit_card_vaulted.is_network_tokenized?.should == false