braintree 2.104.0 → 4.9.0

data/spec/integration/braintree/credit_card_spec.rb

@@ -35,8 +35,7 @@ describe Braintree::CreditCard do
         :number => Braintree::Test::CreditCardNumbers::Visa,
         :expiration_date => "05/2009",
         :cvv => "100",
-        :device_session_id => "abc123",
-        :fraud_merchant_id => "7"
+        :device_data => "device_data",
       )
       result.success?.should == true
     end
@@ -47,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
@@ -64,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
@@ -82,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
@@ -96,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
@@ -107,10 +106,10 @@ 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::Transaction::Status::ProcessorDeclined
+      result.credit_card_verification.status.should == Braintree::CreditCardVerification::Status::ProcessorDeclined
       result.credit_card_verification.processor_response_code.should == "2000"
       result.credit_card_verification.processor_response_text.should == "Do Not Honor"
       result.credit_card_verification.cvv_response_code.should == "I"
@@ -125,10 +124,10 @@ 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::Transaction::Status::ProcessorDeclined
+      result.credit_card_verification.status.should == Braintree::CreditCardVerification::Status::ProcessorDeclined
       result.credit_card_verification.processor_response_code.should == "2000"
       result.credit_card_verification.processor_response_text.should == "Do Not Honor"
       result.credit_card_verification.cvv_response_code.should == "I"
@@ -138,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",
@@ -146,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
 
@@ -172,10 +215,10 @@ 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::Transaction::GatewayRejectionReason::CVV
+        result.credit_card_verification.gateway_rejection_reason.should == Braintree::CreditCardVerification::GatewayRejectionReason::CVV
       ensure
         Braintree::Configuration.merchant_id = old_merchant
         Braintree::Configuration.public_key = old_public_key
@@ -189,10 +232,10 @@ 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::Transaction::Status::ProcessorDeclined
+      result.credit_card_verification.status.should == Braintree::CreditCardVerification::Status::ProcessorDeclined
       result.credit_card_verification.processor_response_code.should == "2000"
       result.credit_card_verification.processor_response_text.should == "Do Not Honor"
       result.credit_card_verification.cvv_response_code.should == "I"
@@ -210,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
@@ -222,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
@@ -233,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
@@ -255,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
 
@@ -275,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
 
@@ -303,7 +346,7 @@ describe Braintree::CreditCard do
           :locality => "Chicago",
           :region => "Illinois",
           :postal_code => "60622"
-        }
+        },
       )
       result.success?.should == true
       credit_card = result.credit_card
@@ -322,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
@@ -341,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)
@@ -352,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."
@@ -363,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
 
@@ -373,7 +416,7 @@ describe Braintree::CreditCard do
         :expiration_date => "05/2009",
         :options => {
           :make_default => true
-        }
+        },
       ).credit_card
       card2.should be_default
 
@@ -402,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
@@ -414,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
@@ -427,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
@@ -439,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
@@ -451,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
@@ -463,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
@@ -476,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
@@ -488,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
@@ -500,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
@@ -518,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
@@ -539,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
@@ -551,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
@@ -570,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
@@ -585,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
@@ -601,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
@@ -643,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
@@ -660,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
@@ -676,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
@@ -692,7 +735,7 @@ describe Braintree::CreditCard do
           :options => {
             :verify_card => true,
             :verification_account_type => "credit",
-          }
+          },
         )
 
         expect(result).to_not be_success
@@ -708,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"
@@ -722,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
@@ -734,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")
@@ -757,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"
@@ -773,95 +816,6 @@ describe Braintree::CreditCard do
     end
   end
 
-  describe "self.create_from_transparent_redirect" do
-    it "returns a successful result if successful" do
-      result = Braintree::Customer.create
-      result.success?.should == true
-      customer = result.customer
-      params =  {
-        :credit_card => {
-          :cardholder_name => "Card Holder",
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2012"
-        }
-      }
-      tr_data_params = {
-        :credit_card => {
-          :customer_id => customer.id
-        }
-      }
-      tr_data = Braintree::TransparentRedirect.create_credit_card_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::CreditCard.create_credit_card_url)
-      result = Braintree::CreditCard.create_from_transparent_redirect(query_string_response)
-      result.success?.should == true
-      credit_card = result.credit_card
-      credit_card.bin.should == Braintree::Test::CreditCardNumbers::Visa[0, 6]
-      credit_card.cardholder_name.should == "Card Holder"
-      credit_card.last_4.should == Braintree::Test::CreditCardNumbers::Visa[-4..-1]
-      credit_card.expiration_month.should == "05"
-      credit_card.expiration_year.should == "2012"
-      credit_card.expiration_date.should == "05/2012"
-      credit_card.customer_id.should == customer.id
-    end
-
-    it "create card as default" do
-      customer = Braintree::Customer.create!(
-        :credit_card => {
-          :cardholder_name => "Old Cardholder Name",
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2012"
-        }
-      )
-      card1 = customer.credit_cards[0]
-
-      params =  {
-        :credit_card => {
-          :cardholder_name => "Card Holder",
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2012",
-          :options => {:make_default => true}
-        }
-      }
-      tr_data_params = {
-        :credit_card => {
-          :customer_id => customer.id
-        }
-      }
-      tr_data = Braintree::TransparentRedirect.create_credit_card_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::CreditCard.create_credit_card_url)
-      result = Braintree::CreditCard.create_from_transparent_redirect(query_string_response)
-      result.success?.should == true
-      card2 = result.credit_card
-
-      Braintree::CreditCard.find(card1.token).should_not be_default
-      card2.should be_default
-    end
-
-    it "returns xml with nested errors if validation errors" do
-      customer = Braintree::Customer.create.customer
-      params =  {
-        :credit_card => {
-          :cardholder_name => "Card Holder",
-          :number => "eleventy",
-          :expiration_date => "y2k"
-        }
-      }
-      tr_data_params = {
-        :credit_card => {
-          :customer_id => customer.id
-        }
-      }
-      tr_data = Braintree::TransparentRedirect.create_credit_card_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::CreditCard.create_credit_card_url)
-      result = Braintree::CreditCard.create_from_transparent_redirect(query_string_response)
-      result.success?.should == false
-      result.params[:customer_id] == customer.id
-      result.params[:credit_card]["cardholder_name"] == customer.id
-      result.params[:credit_card]["number"] == "eleventy"
-      result.params[:credit_card]["exipiration_date"] == "y2k"
-    end
-  end
-
   describe "self.update" do
     it "updates the credit card" do
       customer = Braintree::Customer.create!
@@ -870,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
@@ -894,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
@@ -922,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
@@ -952,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
@@ -974,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
@@ -997,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 => {
@@ -1006,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
@@ -1022,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
@@ -1043,17 +1044,17 @@ 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::Transaction::Status::ProcessorDeclined
+      update_result.credit_card_verification.status.should == Braintree::CreditCardVerification::Status::ProcessorDeclined
       update_result.credit_card_verification.gateway_rejection_reason.should be_nil
     end
 
@@ -1075,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},
@@ -1089,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
@@ -1110,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."
@@ -1126,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
@@ -1189,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]
@@ -1210,151 +1211,25 @@ 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
   end
 
-  describe "self.update_from_transparent_redirect" do
-    it "updates the credit card" do
-      old_token = "token_#{rand(10**10)}"
-      new_token = "token_#{rand(10**10)}"
-      customer = Braintree::Customer.create!(
-        :credit_card => {
-          :cardholder_name => "Old Cardholder Name",
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2012",
-          :token => old_token
-        }
-      )
-      credit_card = customer.credit_cards[0]
-      params = {
-        :credit_card => {
-          :cardholder_name => "New Cardholder Name",
-          :number => Braintree::Test::CreditCardNumbers::MasterCard,
-          :expiration_date => "05/2014"
-        }
-      }
-      tr_data_params = {
-        :payment_method_token => old_token,
-        :credit_card => {
-          :token => new_token
-        }
-      }
-      tr_data = Braintree::TransparentRedirect.update_credit_card_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::CreditCard.update_credit_card_url)
-      result = Braintree::CreditCard.update_from_transparent_redirect(query_string_response)
-      result.success?.should == true
-      credit_card = result.credit_card
-      credit_card.cardholder_name.should == "New Cardholder Name"
-      credit_card.masked_number.should == "555555******4444"
-      credit_card.expiration_date.should == "05/2014"
-      credit_card.token.should == new_token
-    end
-
-    it "updates the default credit card" do
-      customer = Braintree::Customer.create!(
-        :credit_card => {
-          :cardholder_name => "Old Cardholder Name",
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2012"
-        }
-      )
-      card1 = customer.credit_cards[0]
-
-      card2 = Braintree::CreditCard.create(
-        :customer_id => customer.id,
-        :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2009"
-      ).credit_card
-
-      card1.should be_default
-      card2.should_not be_default
-
-      params = {
-        :credit_card => {
-          :options => {:make_default => true}
-        }
-      }
-      tr_data_params = {
-        :payment_method_token => card2.token
-      }
-      tr_data = Braintree::TransparentRedirect.update_credit_card_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::CreditCard.update_credit_card_url)
-      result = Braintree::CreditCard.update_from_transparent_redirect(query_string_response)
-
-      Braintree::CreditCard.find(card1.token).should_not be_default
-      Braintree::CreditCard.find(card2.token).should be_default
-    end
-  end
-
-  describe "credit" do
-    it "creates a credit transaction using the customer, returning a result object" do
-      customer = Braintree::Customer.create!(
-        :credit_card => {
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2010"
-        }
-      )
-      result = customer.credit_cards[0].credit(
-        :amount => "100.00"
-      )
-      result.success?.should == true
-      result.transaction.amount.should == BigDecimal("100.00")
-      result.transaction.type.should == "credit"
-      result.transaction.customer_details.id.should == customer.id
-      result.transaction.credit_card_details.token.should == customer.credit_cards[0].token
-      result.transaction.credit_card_details.bin.should == Braintree::Test::CreditCardNumbers::Visa[0, 6]
-      result.transaction.credit_card_details.last_4.should == Braintree::Test::CreditCardNumbers::Visa[-4..-1]
-      result.transaction.credit_card_details.expiration_date.should == "05/2010"
-    end
-  end
-
-  describe "credit!" do
-    it "returns the created credit tranaction if valid" do
-      customer = Braintree::Customer.create!(
-        :credit_card => {
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2010"
-        }
-      )
-      transaction = customer.credit_cards[0].credit!(:amount => "100.00")
-      transaction.amount.should == BigDecimal("100.00")
-      transaction.type.should == "credit"
-      transaction.customer_details.id.should == customer.id
-      transaction.credit_card_details.token.should == customer.credit_cards[0].token
-      transaction.credit_card_details.bin.should == Braintree::Test::CreditCardNumbers::Visa[0, 6]
-      transaction.credit_card_details.last_4.should == Braintree::Test::CreditCardNumbers::Visa[-4..-1]
-      transaction.credit_card_details.expiration_date.should == "05/2010"
-    end
-
-    it "raises a ValidationsFailed if invalid" do
-      customer = Braintree::Customer.create!(
-        :credit_card => {
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2010"
-        }
-      )
-      expect do
-        customer.credit_cards[0].credit!(:amount => "invalid")
-      end.to raise_error(Braintree::ValidationsFailed)
-    end
-  end
-
   describe "self.delete" do
     it "deletes the credit card" do
       customer = Braintree::Customer.create.customer
       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
@@ -1374,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
 
@@ -1405,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
@@ -1423,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)
@@ -1438,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)
@@ -1488,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)
@@ -1502,7 +1377,7 @@ describe Braintree::CreditCard do
           :number => "4111111111111111",
           :expiration_month => "11",
           :expiration_year => "2099",
-        }
+        },
       )
       expect do
         Braintree::CreditCard.from_nonce(nonce)
@@ -1517,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)
@@ -1533,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")
 
@@ -1552,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
@@ -1576,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")
@@ -1589,255 +1464,6 @@ describe Braintree::CreditCard do
     end
   end
 
-  describe "sale" do
-    it "creates a sale transaction using the credit card, returning a result object" do
-      customer = Braintree::Customer.create!(
-        :credit_card => {
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2010"
-        }
-      )
-      result = customer.credit_cards[0].sale(
-        :amount => "100.00"
-      )
-      result.success?.should == true
-      result.transaction.amount.should == BigDecimal("100.00")
-      result.transaction.type.should == "sale"
-      result.transaction.customer_details.id.should == customer.id
-      result.transaction.credit_card_details.token.should == customer.credit_cards[0].token
-      result.transaction.credit_card_details.bin.should == Braintree::Test::CreditCardNumbers::Visa[0, 6]
-      result.transaction.credit_card_details.last_4.should == Braintree::Test::CreditCardNumbers::Visa[-4..-1]
-      result.transaction.credit_card_details.expiration_date.should == "05/2010"
-    end
-  end
-
-  describe "sale!" do
-    it "returns the created sale tranaction if valid" do
-      customer = Braintree::Customer.create!(
-        :credit_card => {
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2010"
-        }
-      )
-      transaction = customer.credit_cards[0].sale!(:amount => "100.00")
-      transaction.amount.should == BigDecimal("100.00")
-      transaction.type.should == "sale"
-      transaction.customer_details.id.should == customer.id
-      transaction.credit_card_details.token.should == customer.credit_cards[0].token
-      transaction.credit_card_details.bin.should == Braintree::Test::CreditCardNumbers::Visa[0, 6]
-      transaction.credit_card_details.last_4.should == Braintree::Test::CreditCardNumbers::Visa[-4..-1]
-      transaction.credit_card_details.expiration_date.should == "05/2010"
-    end
-
-    it "raises a ValidationsFailed if invalid" do
-      customer = Braintree::Customer.create!(
-        :credit_card => {
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2010"
-        }
-      )
-      expect do
-        customer.credit_cards[0].sale!(:amount => "invalid")
-      end.to raise_error(Braintree::ValidationsFailed)
-    end
-  end
-
-  describe "update" do
-    it "updates the credit card" do
-      customer = Braintree::Customer.create!
-      credit_card = Braintree::CreditCard.create!(
-        :cardholder_name => "Original Holder",
-        :customer_id => customer.id,
-        :cvv => "123",
-        :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
-      )
-      update_result = credit_card.update(
-        :cardholder_name => "New Holder",
-        :cvv => "456",
-        :number => Braintree::Test::CreditCardNumbers::MasterCard,
-        :expiration_date => "06/2013"
-      )
-      update_result.success?.should == true
-      update_result.credit_card.should == credit_card
-      updated_credit_card = update_result.credit_card
-      updated_credit_card.bin.should == Braintree::Test::CreditCardNumbers::MasterCard[0, 6]
-      updated_credit_card.last_4.should == Braintree::Test::CreditCardNumbers::MasterCard[-4..-1]
-      updated_credit_card.expiration_date.should == "06/2013"
-      updated_credit_card.cardholder_name.should == "New Holder"
-    end
-
-    it "verifies the update if options[verify_card]=true" do
-      customer = Braintree::Customer.create!
-      credit_card = Braintree::CreditCard.create!(
-        :cardholder_name => "Original Holder",
-        :customer_id => customer.id,
-        :cvv => "123",
-        :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
-      )
-      update_result = credit_card.update(
-        :cardholder_name => "New Holder",
-        :cvv => "456",
-        :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::MasterCard,
-        :expiration_date => "06/2013",
-        :options => {:verify_card => true}
-      )
-      update_result.success?.should == false
-      update_result.credit_card_verification.status.should == Braintree::Transaction::Status::ProcessorDeclined
-    end
-
-    it "fails on create if credit_card[options][fail_on_duplicate_payment_method]=true and there is a duplicated payment method" do
-      customer = Braintree::Customer.create!
-      Braintree::CreditCard.create(
-        :customer_id => customer.id,
-        :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2015"
-      )
-
-      result = Braintree::CreditCard.create(
-        :customer_id => customer.id,
-        :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2015",
-        :options => {:fail_on_duplicate_payment_method => true}
-      )
-
-      result.success?.should == false
-      result.errors.for(:credit_card).on(:number)[0].message.should == "Duplicate card exists in the vault."
-    end
-
-    it "allows user to specify merchant account for verification" do
-      customer = Braintree::Customer.create!
-      credit_card = Braintree::CreditCard.create!(
-        :cardholder_name => "Original Holder",
-        :customer_id => customer.id,
-        :cvv => "123",
-        :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
-      )
-      update_result = credit_card.update(
-        :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::Visa,
-        :expiration_date => "05/2009",
-        :options => {
-          :verify_card => true,
-          :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId
-        }
-      )
-      update_result.success?.should == false
-      update_result.credit_card_verification.status.should == Braintree::Transaction::Status::ProcessorDeclined
-      update_result.credit_card_verification.processor_response_code.should == "2000"
-      update_result.credit_card_verification.processor_response_text.should == "Do Not Honor"
-      update_result.credit_card_verification.cvv_response_code.should == "I"
-      update_result.credit_card_verification.avs_error_response_code.should == nil
-      update_result.credit_card_verification.avs_postal_code_response_code.should == "I"
-      update_result.credit_card_verification.avs_street_address_response_code.should == "I"
-    end
-
-    it "can update the billing address" do
-      customer = Braintree::Customer.create!
-      credit_card = Braintree::CreditCard.create!(
-        :cardholder_name => "Original Holder",
-        :customer_id => customer.id,
-        :cvv => "123",
-        :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012",
-        :billing_address => {
-          :first_name => "Old First Name",
-          :last_name => "Old Last Name",
-          :company => "Old Company",
-          :street_address => "123 Old St",
-          :extended_address => "Apt Old",
-          :locality => "Old City",
-          :region => "Old State",
-          :postal_code => "12345",
-          :country_name => "Canada"
-        }
-      )
-      result = credit_card.update(
-        :options => {:verify_card => false},
-        :billing_address => {
-          :first_name => "New First Name",
-          :last_name => "New Last Name",
-          :company => "New Company",
-          :street_address => "123 New St",
-          :extended_address => "Apt New",
-          :locality => "New City",
-          :region => "New State",
-          :postal_code => "56789",
-          :country_name => "United States of America"
-        }
-      )
-      result.success?.should == true
-      address = result.credit_card.billing_address
-      address.should == credit_card.billing_address # making sure credit card instance was updated
-      address.first_name.should == "New First Name"
-      address.last_name.should == "New Last Name"
-      address.company.should == "New Company"
-      address.street_address.should == "123 New St"
-      address.extended_address.should == "Apt New"
-      address.locality.should == "New City"
-      address.region.should == "New State"
-      address.postal_code.should == "56789"
-      address.country_name.should == "United States of America"
-    end
-
-    it "returns an error response if invalid" do
-      customer = Braintree::Customer.create!
-      credit_card = Braintree::CreditCard.create!(
-        :cardholder_name => "Original Holder",
-        :customer_id => customer.id,
-        :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
-      )
-      update_result = credit_card.update(
-        :cardholder_name => "New Holder",
-        :number => "invalid",
-        :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."
-    end
-  end
-
-  describe "update!" do
-    it "updates the credit card and returns true if valid" do
-      customer = Braintree::Customer.create!
-      credit_card = Braintree::CreditCard.create!(
-        :cardholder_name => "Original Holder",
-        :customer_id => customer.id,
-        :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
-      )
-      credit_card.update!(
-        :cardholder_name => "New Holder",
-        :number => Braintree::Test::CreditCardNumbers::MasterCard,
-        :expiration_date => "06/2013"
-      ).should == credit_card
-      credit_card.bin.should == Braintree::Test::CreditCardNumbers::MasterCard[0, 6]
-      credit_card.last_4.should == Braintree::Test::CreditCardNumbers::MasterCard[-4..-1]
-      credit_card.expiration_date.should == "06/2013"
-      credit_card.cardholder_name.should == "New Holder"
-      credit_card.updated_at.between?(Time.now - 60, Time.now).should == true
-    end
-
-    it "raises a ValidationsFailed if invalid" do
-      customer = Braintree::Customer.create!
-      credit_card = Braintree::CreditCard.create!(
-        :cardholder_name => "Original Holder",
-        :customer_id => customer.id,
-        :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2012"
-      )
-      expect do
-        credit_card.update!(
-          :cardholder_name => "New Holder",
-          :number => Braintree::Test::CreditCardNumbers::MasterCard,
-          :expiration_date => "invalid/date"
-        )
-      end.to raise_error(Braintree::ValidationsFailed)
-    end
-  end
-
   describe "nonce" do
     it "returns the credit card nonce" do
       customer = Braintree::Customer.create!
@@ -1845,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
@@ -1863,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