braintree 2.104.0 → 4.9.0

data/spec/integration/braintree/customer_spec.rb

@@ -8,7 +8,7 @@ describe Braintree::Customer do
       customers = Braintree::Customer.all
       customers.maximum_size.should > 100
 
-      customer_ids = customers.map {|c| c.id }.uniq.compact
+      customer_ids = customers.map { |c| c.id }.uniq.compact
       customer_ids.size.should == customers.maximum_size
     end
   end
@@ -17,7 +17,7 @@ describe Braintree::Customer do
     it "deletes the customer with the given id" do
      create_result = Braintree::Customer.create(
         :first_name => "Joe",
-        :last_name => "Cool"
+        :last_name => "Cool",
       )
       create_result.success?.should == true
       customer = create_result.customer
@@ -39,7 +39,8 @@ describe Braintree::Customer do
         :email => "bill@microsoft.com",
         :phone => "312.555.1234",
         :fax => "614.555.5678",
-        :website => "www.microsoft.com"
+        :website => "www.microsoft.com",
+        :tax_identifiers => [{:country_code => "US", :identifier => "987654321"}],
       )
       result.success?.should == true
       result.customer.id.should =~ /^\d{6,}$/
@@ -58,7 +59,7 @@ describe Braintree::Customer do
       oauth_gateway = Braintree::Gateway.new(
         :client_id => "client_id$#{Braintree::Configuration.environment}$integration_client_id",
         :client_secret => "client_secret$#{Braintree::Configuration.environment}$integration_client_secret",
-        :logger => Logger.new("/dev/null")
+        :logger => Logger.new("/dev/null"),
       )
       access_token = Braintree::OAuthTestHelper.create_token(oauth_gateway, {
         :merchant_public_id => "integration_merchant_id",
@@ -67,7 +68,7 @@ describe Braintree::Customer do
 
       gateway = Braintree::Gateway.new(
         :access_token => access_token,
-        :logger => Logger.new("/dev/null")
+        :logger => Logger.new("/dev/null"),
       )
 
       result = gateway.customer.create(
@@ -77,7 +78,7 @@ describe Braintree::Customer do
         :email => "joe@example.com",
         :phone => "312.555.1234",
         :fax => "614.555.5678",
-        :website => "www.example.com"
+        :website => "www.example.com",
       )
       result.success?.should == true
       result.customer.id.should =~ /^\d{6,}$/
@@ -85,15 +86,14 @@ describe Braintree::Customer do
       result.customer.last_name.should == "Brown"
     end
 
-    it "supports creation with a device session ID and (optional) fraud_merchant_id" do
+    it "supports creation with device_data" do
       result = Braintree::Customer.create(
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::MasterCard,
           :expiration_date => "05/2010",
           :cvv => "100",
-          :device_session_id => "abc123",
-          :fraud_merchant_id => "7"
-        }
+          :device_data => "device_data",
+        },
       )
 
       result.should be_success
@@ -109,7 +109,58 @@ describe Braintree::Customer do
         :risk_data => {
           :customer_browser => "IE5",
           :customer_ip => "192.168.0.1"
-        }
+        },
+      )
+
+      result.should be_success
+    end
+
+    it "includes risk data when skip_advanced_fraud_checking is false" do
+      with_fraud_protection_enterprise_merchant do
+        result = Braintree::Customer.create(
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::MasterCard,
+            :expiration_date => "05/2010",
+            :cvv => "100",
+            :options => {
+              :skip_advanced_fraud_checking => false,
+              :verify_card => true,
+            },
+          },
+        )
+
+        expect(result).to be_success
+        verification = result.customer.credit_cards.first.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
+        result = Braintree::Customer.create(
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::MasterCard,
+            :expiration_date => "05/2010",
+            :cvv => "100",
+            :options => {
+              :skip_advanced_fraud_checking => true,
+              :verify_card => true,
+            },
+          },
+        )
+
+        expect(result).to be_success
+        verification = result.customer.credit_cards.first.verification
+        expect(verification.risk_data).to be_nil
+      end
+    end
+
+    it "supports creation with tax_identifiers" do
+      result = Braintree::Customer.create(
+        :tax_identifiers => [
+          {:country_code => "US", :identifier => "987654321"},
+          {:country_code => "CL", :identifier => "123456789"}
+        ],
       )
 
       result.should be_success
@@ -135,21 +186,21 @@ describe Braintree::Customer do
         found_customer.last_name.should == last_name
       else
         result.customer.first_name.should == "José"
-        result.customer.first_name.bytes.map {|b| b.to_s(8)}.should == ["112", "157", "163", "303", "251"]
+        result.customer.first_name.bytes.map { |b| b.to_s(8) }.should == ["112", "157", "163", "303", "251"]
         result.customer.last_name.should == "Muñoz"
-        result.customer.last_name.bytes.map {|b| b.to_s(8)}.should == ["115", "165", "303", "261", "157", "172"]
+        result.customer.last_name.bytes.map { |b| b.to_s(8) }.should == ["115", "165", "303", "261", "157", "172"]
 
         found_customer = Braintree::Customer.find(result.customer.id)
         found_customer.first_name.should == "José"
-        found_customer.first_name.bytes.map {|b| b.to_s(8)}.should == ["112", "157", "163", "303", "251"]
+        found_customer.first_name.bytes.map { |b| b.to_s(8) }.should == ["112", "157", "163", "303", "251"]
         found_customer.last_name.should == "Muñoz"
-        found_customer.last_name.bytes.map {|b| b.to_s(8)}.should == ["115", "165", "303", "261", "157", "172"]
+        found_customer.last_name.bytes.map { |b| b.to_s(8) }.should == ["115", "165", "303", "261", "157", "172"]
       end
     end
 
     it "returns an error response if invalid" do
       result = Braintree::Customer.create(
-        :email => "@invalid.com"
+        :email => "@invalid.com",
       )
       result.success?.should == false
       result.errors.for(:customer).on(:email)[0].message.should == "Email is an invalid format."
@@ -163,7 +214,7 @@ describe Braintree::Customer do
           :number => Braintree::Test::CreditCardNumbers::MasterCard,
           :expiration_date => "05/2010",
           :cvv => "100"
-        }
+        },
       )
 
       result.success?.should == true
@@ -183,7 +234,7 @@ describe Braintree::Customer do
           :email => "other@example.com",
           :billing_agreement_id => "B-123456",
           :options => {:make_default => true}
-        }
+        },
       )
 
       result.success?.should == true
@@ -201,7 +252,7 @@ describe Braintree::Customer do
           :number => Braintree::Test::CreditCardNumbers::FailsSandboxVerification::MasterCard,
           :expiration_date => "05/2010",
           :options => {:verify_card => true}
-        }
+        },
       )
       result.success?.should == false
       result.credit_card_verification.status.should == Braintree::Transaction::Status::ProcessorDeclined
@@ -215,7 +266,7 @@ describe Braintree::Customer do
           :number => Braintree::Test::CreditCardNumbers::MasterCard,
           :expiration_date => "05/2019",
           :options => {:verify_card => true, :verification_amount => "2.00"}
-        }
+        },
       )
       result.success?.should == true
     end
@@ -225,7 +276,7 @@ describe Braintree::Customer do
       Braintree::CreditCard.create(
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2015"
+        :expiration_date => "05/2015",
       )
 
       result = Braintree::Customer.create(
@@ -235,7 +286,7 @@ describe Braintree::Customer do
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2015",
           :options => {:fail_on_duplicate_payment_method => true}
-        }
+        },
       )
       result.success?.should == false
       result.errors.for(:customer).for(:credit_card).on(:number)[0].message.should == "Duplicate card exists in the vault."
@@ -252,12 +303,98 @@ describe Braintree::Customer do
             :verify_card => true,
             :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId
           }
-        }
+        },
       )
       result.success?.should == false
       result.credit_card_verification.status.should == Braintree::Transaction::Status::ProcessorDeclined
     end
 
+    it "can create a customer and a payment method at the same time after validating verification_currency_iso_code" do
+      result = Braintree::Customer.create(
+        :first_name => "Mike",
+        :last_name => "Jones",
+        :credit_card => {
+          :number => Braintree::Test::CreditCardNumbers::MasterCard,
+          :expiration_date => "05/2010",
+          :cvv => "100",
+          :options => {
+            :verify_card => true,
+            :verification_currency_iso_code => "USD"
+          }
+        },
+      )
+
+      result.success?.should == true
+      result.customer.first_name.should == "Mike"
+      result.customer.last_name.should == "Jones"
+      result.customer.credit_cards[0].bin.should == Braintree::Test::CreditCardNumbers::MasterCard[0, 6]
+      result.customer.credit_cards[0].last_4.should == Braintree::Test::CreditCardNumbers::MasterCard[-4..-1]
+      result.customer.credit_cards[0].expiration_date.should == "05/2010"
+      result.customer.credit_cards[0].unique_number_identifier.should =~ /\A\w{32}\z/
+      result.customer.credit_cards[0].verification.currency_iso_code == "USD"
+    end
+
+    it "errors when verification_currency_iso_code is not supported by merchant account" do
+      result = Braintree::Customer.create(
+        :first_name => "Mike",
+        :last_name => "Jones",
+        :credit_card => {
+          :number => Braintree::Test::CreditCardNumbers::MasterCard,
+          :expiration_date => "05/2010",
+          :cvv => "100",
+          :options => {
+            :verify_card => true,
+            :verification_currency_iso_code => "GBP"
+          }
+        },
+      )
+      expect(result).to_not be_success
+      expect(result.errors.for(:customer).for(:credit_card).for(:options).on(:verification_currency_iso_code)[0].code).to eq Braintree::ErrorCodes::CreditCard::CurrencyCodeNotSupportedByMerchantAccount
+    end
+
+    it "validates verification_currency_iso_code of the given verification_merchant_account_id and creates customer" do
+      result = Braintree::Customer.create(
+        :first_name => "Mike",
+        :last_name => "Jones",
+        :credit_card => {
+          :number => Braintree::Test::CreditCardNumbers::MasterCard,
+          :expiration_date => "05/2010",
+          :options => {
+            :verify_card => true,
+            :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId,
+            :verification_currency_iso_code => "USD"
+          }
+        },
+      )
+      result.success?.should == true
+      result.customer.credit_cards[0].verification.currency_iso_code == "USD"
+      result.customer.first_name.should == "Mike"
+      result.customer.last_name.should == "Jones"
+      result.customer.credit_cards[0].bin.should == Braintree::Test::CreditCardNumbers::MasterCard[0, 6]
+      result.customer.credit_cards[0].last_4.should == Braintree::Test::CreditCardNumbers::MasterCard[-4..-1]
+      result.customer.credit_cards[0].expiration_date.should == "05/2010"
+      result.customer.credit_cards[0].unique_number_identifier.should =~ /\A\w{32}\z/
+    end
+
+    it "validates verification_currency_iso_code of the given verification_merchant_account_id and returns error" do
+      result = Braintree::Customer.create(
+        :first_name => "Mike",
+        :last_name => "Jones",
+        :credit_card => {
+          :number => Braintree::Test::CreditCardNumbers::MasterCard,
+          :expiration_date => "05/2010",
+          :options => {
+            :verify_card => true,
+            :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId,
+            :verification_currency_iso_code => "GBP"
+          }
+        },
+      )
+      expect(result).to_not be_success
+      expect(result.errors.for(:customer).for(:credit_card).for(:options).on(:verification_currency_iso_code)[0].code).to eq Braintree::ErrorCodes::CreditCard::CurrencyCodeNotSupportedByMerchantAccount
+    end
+
+
     it "can create a customer, payment method, and billing address at the same time" do
       result = Braintree::Customer.create(
         :first_name => "Mike",
@@ -273,7 +410,7 @@ describe Braintree::Customer do
             :postal_code => "60622",
             :country_name => "United States of America"
           }
-        }
+        },
       )
       result.success?.should == true
       result.customer.first_name.should == "Mike"
@@ -304,7 +441,7 @@ describe Braintree::Customer do
             :country_code_alpha3 => "COM",
             :country_code_numeric => "174"
           }
-        }
+        },
       )
       result.success?.should == true
       result.customer.addresses[0].country_name.should == "Comoros"
@@ -319,7 +456,7 @@ describe Braintree::Customer do
         :last_name => "Gates",
         :custom_fields => {
           :store_me => "custom value"
-        }
+        },
       )
       result.success?.should == true
       result.customer.custom_fields[:store_me].should == "custom value"
@@ -329,7 +466,7 @@ describe Braintree::Customer do
       result = Braintree::Customer.create(
         :first_name => "Bill",
         :last_name => "Gates",
-        :custom_fields => { :store_me => "" }
+        :custom_fields => {:store_me => ""},
       )
       result.success?.should == true
       result.customer.custom_fields.should == {}
@@ -343,7 +480,7 @@ describe Braintree::Customer do
           :billing_address => {
             :country_name => "invalid"
           }
-        }
+        },
       )
       result.success?.should == false
       result.errors.for(:customer).on(:email)[0].message.should == "Email is an invalid format."
@@ -363,10 +500,10 @@ describe Braintree::Customer do
             :country_code_alpha2 => "US",
             :country_code_alpha3 => "COM",
           }
-        }
+        },
       )
       result.success?.should == false
-      result.errors.for(:customer).for(:credit_card).for(:billing_address).on(:base).map {|e| e.code}.should include(Braintree::ErrorCodes::Address::InconsistentCountry)
+      result.errors.for(:customer).for(:credit_card).for(:billing_address).on(:base).map { |e| e.code }.should include(Braintree::ErrorCodes::Address::InconsistentCountry)
     end
 
     it "returns an error if country code alpha2 is invalid" do
@@ -379,10 +516,10 @@ describe Braintree::Customer do
           :billing_address => {
             :country_code_alpha2 => "zz",
           }
-        }
+        },
       )
       result.success?.should == false
-      result.errors.for(:customer).for(:credit_card).for(:billing_address).on(:country_code_alpha2).map {|e| e.code}.should include(Braintree::ErrorCodes::Address::CountryCodeAlpha2IsNotAccepted)
+      result.errors.for(:customer).for(:credit_card).for(:billing_address).on(:country_code_alpha2).map { |e| e.code }.should include(Braintree::ErrorCodes::Address::CountryCodeAlpha2IsNotAccepted)
     end
 
     it "returns an error if country code alpha3 is invalid" do
@@ -395,10 +532,10 @@ describe Braintree::Customer do
           :billing_address => {
             :country_code_alpha3 => "zzz",
           }
-        }
+        },
       )
       result.success?.should == false
-      result.errors.for(:customer).for(:credit_card).for(:billing_address).on(:country_code_alpha3).map {|e| e.code}.should include(Braintree::ErrorCodes::Address::CountryCodeAlpha3IsNotAccepted)
+      result.errors.for(:customer).for(:credit_card).for(:billing_address).on(:country_code_alpha3).map { |e| e.code }.should include(Braintree::ErrorCodes::Address::CountryCodeAlpha3IsNotAccepted)
     end
 
     it "returns an error if country code numeric is invalid" do
@@ -411,10 +548,10 @@ describe Braintree::Customer do
           :billing_address => {
             :country_code_numeric => "zzz",
           }
-        }
+        },
       )
       result.success?.should == false
-      result.errors.for(:customer).for(:credit_card).for(:billing_address).on(:country_code_numeric).map {|e| e.code}.should include(Braintree::ErrorCodes::Address::CountryCodeNumericIsNotAccepted)
+      result.errors.for(:customer).for(:credit_card).for(:billing_address).on(:country_code_numeric).map { |e| e.code }.should include(Braintree::ErrorCodes::Address::CountryCodeNumericIsNotAccepted)
     end
 
     it "returns errors if custom_fields are not registered" do
@@ -423,7 +560,7 @@ describe Braintree::Customer do
         :last_name => "Kennedy",
         :custom_fields => {
           :spouse_name => "Jacqueline"
-        }
+        },
       )
       result.success?.should == false
       result.errors.for(:customer).on(:custom_fields)[0].message.should == "Custom field is invalid: spouse_name."
@@ -436,7 +573,7 @@ describe Braintree::Customer do
           :last_name => "Hamlin",
           :credit_card => {
             :venmo_sdk_payment_method_code => Braintree::Test::VenmoSDK::VisaPaymentMethodCode
-          }
+          },
         )
         result.success?.should == true
         result.customer.credit_cards.first.bin.should == "400934"
@@ -453,7 +590,7 @@ describe Braintree::Customer do
             :options => {
               :venmo_sdk_session => Braintree::Test::VenmoSDK::Session
             }
-          }
+          },
         )
         result.success?.should == true
         result.customer.credit_cards.first.venmo_sdk?.should == false
@@ -468,13 +605,13 @@ describe Braintree::Customer do
             :expiration_month => "11",
             :expiration_year => "2099",
           },
-          :share => true
+          :share => true,
         )
 
         result = Braintree::Customer.create(
           :credit_card => {
             :payment_method_nonce => nonce
-          }
+          },
         )
 
         result.success?.should == true
@@ -504,7 +641,7 @@ describe Braintree::Customer do
             :number => Braintree::Test::CreditCardNumbers::Hiper,
             :expiration_month => "11",
             :expiration_year => "2099",
-          }
+          },
         )
         result = Braintree::Customer.create(
           :payment_method_nonce => nonce,
@@ -514,7 +651,7 @@ describe Braintree::Customer do
               :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
               :verification_account_type => "debit",
             }
-          }
+          },
         )
 
         expect(result).to be_success
@@ -526,7 +663,7 @@ describe Braintree::Customer do
             :number => Braintree::Test::CreditCardNumbers::Hiper,
             :expiration_month => "11",
             :expiration_year => "2099",
-          }
+          },
         )
         result = Braintree::Customer.create(
           :payment_method_nonce => nonce,
@@ -536,7 +673,7 @@ describe Braintree::Customer do
               :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
               :verification_account_type => "credit",
             }
-          }
+          },
         )
 
         expect(result).to be_success
@@ -548,7 +685,7 @@ describe Braintree::Customer do
             :number => Braintree::Test::CreditCardNumbers::Hiper,
             :expiration_month => "11",
             :expiration_year => "2099",
-          }
+          },
         )
         result = Braintree::Customer.create(
           :payment_method_nonce => nonce,
@@ -558,7 +695,7 @@ describe Braintree::Customer do
               :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
               :verification_account_type => "ach",
             }
-          }
+          },
         )
 
         expect(result).to_not be_success
@@ -571,7 +708,7 @@ describe Braintree::Customer do
             :number => Braintree::Test::CreditCardNumbers::Visa,
             :expiration_month => "11",
             :expiration_year => "2099",
-          }
+          },
         )
         result = Braintree::Customer.create(
           :payment_method_nonce => nonce,
@@ -580,7 +717,7 @@ describe Braintree::Customer do
               :verify_card => true,
               :verification_account_type => "credit",
             }
-          }
+          },
         )
 
         expect(result).to_not be_success
@@ -593,7 +730,7 @@ describe Braintree::Customer do
     it "returns the customer if successful" do
       customer = Braintree::Customer.create!(
         :first_name => "Jim",
-        :last_name => "Smith"
+        :last_name => "Smith",
       )
       customer.id.should =~ /\d+/
       customer.first_name.should == "Jim"
@@ -618,7 +755,7 @@ describe Braintree::Customer do
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2010"
-        }
+        },
       )
       result = Braintree::Customer.credit(customer.id, :amount => "100.00")
       result.success?.should == true
@@ -638,7 +775,7 @@ describe Braintree::Customer do
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2010"
-        }
+        },
       )
       transaction = Braintree::Customer.credit!(customer.id, :amount => "100.00")
       transaction.amount.should == BigDecimal("100.00")
@@ -657,7 +794,7 @@ describe Braintree::Customer do
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2010"
-        }
+        },
       )
       result = Braintree::Customer.sale(customer.id, :amount => "100.00")
       result.success?.should == true
@@ -677,7 +814,7 @@ describe Braintree::Customer do
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2010"
-        }
+        },
       )
       transaction = Braintree::Customer.sale!(customer.id, :amount => "100.00")
       transaction.amount.should == BigDecimal("100.00")
@@ -696,80 +833,24 @@ describe Braintree::Customer do
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2010"
-        }
+        },
       )
-      transaction = customer.sale!(:amount => "100.00")
+      transaction = Braintree::Customer.sale!(customer.id, :amount => "100.00")
       collection = Braintree::Customer.transactions(customer.id)
       collection.first.should == transaction
     end
   end
 
-
-  describe "sale" do
-    it "creates a sale 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.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.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
-  end
-
-  describe "transactions" do
-    it "finds transactions for the customer" do
-      customer = Braintree::Customer.create!(
-        :credit_card => {
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "05/2010"
-        }
-      )
-      transaction = customer.sale!(:amount => "100.00")
-      collection = customer.transactions
-      collection.first.should == transaction
-    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(
-        :amount => "100.00"
+        :amount => "100.00",
       )
       result.success?.should == true
       result.transaction.amount.should == BigDecimal("100.00")
@@ -788,7 +869,7 @@ describe Braintree::Customer do
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "05/2010"
-        }
+        },
       )
       transaction = customer.credit!(:amount => "100.00")
       transaction.amount.should == BigDecimal("100.00")
@@ -801,72 +882,11 @@ describe Braintree::Customer do
     end
   end
 
-  describe "create_from_transparent_redirect" do
-    it "returns a successful result if successful" do
-      params = {
-        :customer => {
-          :first_name => "John",
-          :last_name => "Doe",
-          :company => "Doe Co",
-          :email => "john@doe.com",
-          :phone => "312.555.2323",
-          :fax => "614.555.5656",
-          :website => "www.johndoe.com"
-        }
-      }
-
-      tr_data = Braintree::TransparentRedirect.create_customer_data({:redirect_url => "http://example.com"}.merge({}))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::Customer.create_customer_url)
-      result = Braintree::Customer.create_from_transparent_redirect(query_string_response)
-
-      result.success?.should == true
-      customer = result.customer
-      customer.first_name.should == "John"
-      customer.last_name.should == "Doe"
-      customer.company.should == "Doe Co"
-      customer.email.should == "john@doe.com"
-      customer.phone.should == "312.555.2323"
-      customer.fax.should == "614.555.5656"
-      customer.website.should == "www.johndoe.com"
-    end
-
-    it "can pass any attribute through tr_data" do
-      customer_id = "customer_#{rand(1_000_000)}"
-      tr_data_params = {
-        :customer => {
-          :id => customer_id,
-          :first_name => "John",
-          :last_name => "Doe",
-          :company => "Doe Co",
-          :email => "john@doe.com",
-          :phone => "312.555.2323",
-          :fax => "614.555.5656",
-          :website => "www.johndoe.com"
-        }
-      }
-
-      tr_data = Braintree::TransparentRedirect.create_customer_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, {}, Braintree::Customer.create_customer_url)
-      result = Braintree::Customer.create_from_transparent_redirect(query_string_response)
-
-      result.success?.should == true
-      customer = result.customer
-      customer.id.should == customer_id
-      customer.first_name.should == "John"
-      customer.last_name.should == "Doe"
-      customer.company.should == "Doe Co"
-      customer.email.should == "john@doe.com"
-      customer.phone.should == "312.555.2323"
-      customer.fax.should == "614.555.5656"
-      customer.website.should == "www.johndoe.com"
-    end
-  end
-
   describe "delete" do
     it "deletes the customer" do
      result = Braintree::Customer.create(
         :first_name => "Joe",
-        :last_name => "Cool"
+        :last_name => "Cool",
       )
       result.success?.should == true
 
@@ -883,7 +903,7 @@ describe Braintree::Customer do
     it "finds the customer with the given id" do
       result = Braintree::Customer.create(
         :first_name => "Joe",
-        :last_name => "Cool"
+        :last_name => "Cool",
       )
       result.success?.should == true
 
@@ -899,13 +919,13 @@ describe Braintree::Customer 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_customer = Braintree::Customer.find(customer.id)
@@ -920,7 +940,7 @@ describe Braintree::Customer do
         customer = Braintree::Customer.create(
           :custom_fields => {
             :store_me => "custom value"
-          }
+          },
         ).customer
         credit_card = Braintree::CreditCard.create(
           :customer_id => customer.id,
@@ -932,13 +952,13 @@ describe Braintree::Customer do
             :region => "Illinois",
             :postal_code => "60622",
             :country_name => "United States of America"
-          }
+          },
         ).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_customer = Braintree::Customer.find(customer.id, {
@@ -954,7 +974,7 @@ describe Braintree::Customer do
         customer = Braintree::Customer.create(
           :custom_fields => {
             :store_me => "custom value"
-          }
+          },
         ).customer
         credit_card = Braintree::CreditCard.create(
           :customer_id => customer.id,
@@ -966,13 +986,13 @@ describe Braintree::Customer do
             :region => "Illinois",
             :postal_code => "60622",
             :country_name => "United States of America"
-          }
+          },
         ).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_customer = Braintree::Customer.find(customer.id, {
@@ -990,7 +1010,7 @@ describe Braintree::Customer do
 
     it "returns associated ApplePayCards" do
       result = Braintree::Customer.create(
-        :payment_method_nonce => Braintree::Test::Nonce::ApplePayAmEx
+        :payment_method_nonce => Braintree::Test::Nonce::ApplePayAmEx,
       )
       result.success?.should == true
 
@@ -1001,58 +1021,70 @@ describe Braintree::Customer do
       apple_pay_card.token.should_not be_nil
       apple_pay_card.expiration_year.should_not be_nil
       apple_pay_card.payment_instrument_name.should == "AmEx 41002"
-    end
-
-    it "returns associated android pay proxy cards" do
-      result = Braintree::Customer.create(
-        :payment_method_nonce => Braintree::Test::Nonce::AndroidPayDiscover
-      )
-      result.success?.should == true
-
-      found_customer = Braintree::Customer.find(result.customer.id)
-      found_customer.android_pay_cards.size.should == 1
-      found_customer.payment_methods.size.should == 1
-      android_pay_card = found_customer.android_pay_cards.first
-      android_pay_card.should be_a Braintree::AndroidPayCard
-      android_pay_card.token.should_not be_nil
-      android_pay_card.expiration_year.should_not be_nil
-      android_pay_card.is_network_tokenized?.should == false
-    end
-
-    it "returns associated android pay network tokens" do
+      apple_pay_card.commercial.should_not be_nil
+      apple_pay_card.country_of_issuance.should_not be_nil
+      apple_pay_card.debit.should_not be_nil
+      apple_pay_card.durbin_regulated.should_not be_nil
+      apple_pay_card.healthcare.should_not be_nil
+      apple_pay_card.issuing_bank.should_not be_nil
+      apple_pay_card.payroll.should_not be_nil
+      apple_pay_card.prepaid.should_not be_nil
+      apple_pay_card.product_id.should_not be_nil
+    end
+
+    it "returns associated google pay proxy cards" do
       result = Braintree::Customer.create(
-        :payment_method_nonce => Braintree::Test::Nonce::AndroidPayMasterCard
+        :payment_method_nonce => Braintree::Test::Nonce::GooglePayDiscover,
       )
       result.success?.should == true
 
       found_customer = Braintree::Customer.find(result.customer.id)
-      found_customer.android_pay_cards.size.should == 1
+      found_customer.google_pay_cards.size.should == 1
       found_customer.payment_methods.size.should == 1
-      android_pay_card = found_customer.android_pay_cards.first
-      android_pay_card.should be_a Braintree::AndroidPayCard
-      android_pay_card.token.should_not be_nil
-      android_pay_card.expiration_year.should_not be_nil
-      android_pay_card.is_network_tokenized?.should == true
-    end
-
-    it "returns associated amex express checkout cards" do
+      google_pay_card = found_customer.google_pay_cards.first
+      google_pay_card.should be_a Braintree::GooglePayCard
+      google_pay_card.token.should_not be_nil
+      google_pay_card.expiration_year.should_not be_nil
+      google_pay_card.is_network_tokenized?.should == false
+      google_pay_card.commercial.should_not be_nil
+      google_pay_card.country_of_issuance.should_not be_nil
+      google_pay_card.debit.should_not be_nil
+      google_pay_card.durbin_regulated.should_not be_nil
+      google_pay_card.healthcare.should_not be_nil
+      google_pay_card.issuing_bank.should_not be_nil
+      google_pay_card.payroll.should_not be_nil
+      google_pay_card.prepaid.should_not be_nil
+      google_pay_card.product_id.should_not be_nil
+    end
+
+    it "returns associated google pay network tokens" do
       result = Braintree::Customer.create(
-        :payment_method_nonce => Braintree::Test::Nonce::AmexExpressCheckout
+        :payment_method_nonce => Braintree::Test::Nonce::GooglePayMasterCard,
       )
       result.success?.should == true
 
       found_customer = Braintree::Customer.find(result.customer.id)
-      found_customer.amex_express_checkout_cards.size.should == 1
+      found_customer.google_pay_cards.size.should == 1
       found_customer.payment_methods.size.should == 1
-      amex_express_checkout_card = found_customer.amex_express_checkout_cards.first
-      amex_express_checkout_card.should be_a Braintree::AmexExpressCheckoutCard
-      amex_express_checkout_card.token.should_not be_nil
-      amex_express_checkout_card.expiration_year.should_not be_nil
+      google_pay_card = found_customer.google_pay_cards.first
+      google_pay_card.should be_a Braintree::GooglePayCard
+      google_pay_card.token.should_not be_nil
+      google_pay_card.expiration_year.should_not be_nil
+      google_pay_card.is_network_tokenized?.should == true
+      google_pay_card.commercial.should_not be_nil
+      google_pay_card.country_of_issuance.should_not be_nil
+      google_pay_card.debit.should_not be_nil
+      google_pay_card.durbin_regulated.should_not be_nil
+      google_pay_card.healthcare.should_not be_nil
+      google_pay_card.issuing_bank.should_not be_nil
+      google_pay_card.payroll.should_not be_nil
+      google_pay_card.prepaid.should_not be_nil
+      google_pay_card.product_id.should_not be_nil
     end
 
     it "returns associated venmo accounts" do
       result = Braintree::Customer.create(
-        :payment_method_nonce => Braintree::Test::Nonce::VenmoAccount
+        :payment_method_nonce => Braintree::Test::Nonce::VenmoAccount,
       )
       result.success?.should == true
 
@@ -1072,7 +1104,7 @@ describe Braintree::Customer do
           :options => {
             :verification_merchant_account_id => SpecHelper::UsBankMerchantAccountId,
           }
-        }
+        },
       )
       result.should be_success
 
@@ -1118,7 +1150,7 @@ describe Braintree::Customer do
       it "updates the credit card with three_d_secure pass thru params" do
         customer = Braintree::Customer.create!(
           :first_name => "Joe",
-          :last_name => "Cool"
+          :last_name => "Cool",
         )
         result = Braintree::Customer.update(
           customer.id,
@@ -1131,17 +1163,17 @@ describe Braintree::Customer do
             :number => 4111111111111111,
             :expiration_date => "05/2060",
             :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},
-          }
+          },
         )
         result.success?.should == true
         result.customer.id.should == customer.id
@@ -1153,7 +1185,7 @@ describe Braintree::Customer do
       it "validates the presence of three_d_secure_version while passing three_d_secure_pass_thru in update" do
         customer = Braintree::Customer.create!(
           :first_name => "Joe",
-          :last_name => "Cool"
+          :last_name => "Cool",
         )
         result = Braintree::Customer.update(
           customer.id,
@@ -1166,16 +1198,16 @@ describe Braintree::Customer do
             :number => 4111111111111111,
             :expiration_date => "05/2060",
             :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}
-          }
+          },
         )
         expect(result).to_not be_success
         error = result.errors.for(:verification).first
@@ -1186,7 +1218,7 @@ describe Braintree::Customer do
     it "updates the customer with the given id if successful" do
       customer = Braintree::Customer.create!(
         :first_name => "Joe",
-        :last_name => "Cool"
+        :last_name => "Cool",
       )
       result = Braintree::Customer.update(
         customer.id,
@@ -1194,7 +1226,7 @@ describe Braintree::Customer do
         :last_name => "Super Cool",
         :custom_fields => {
           :store_me => "a value"
-        }
+        },
       )
       result.success?.should == true
       result.customer.id.should == customer.id
@@ -1208,7 +1240,7 @@ describe Braintree::Customer do
         :credit_card => {
           :number => 4111111111111111,
           :expiration_date => "05/2010",
-        }
+        },
       )
       result = Braintree::Customer.update(
         customer.id,
@@ -1218,7 +1250,7 @@ describe Braintree::Customer do
           :options=> {
             :fail_on_duplicate_payment_method => true
           }
-        }
+        },
       )
       result.success?.should == false
       result.errors.for(:customer).for(:credit_card).on(:number)[0].message.should == "Duplicate card exists in the vault."
@@ -1227,7 +1259,7 @@ describe Braintree::Customer do
     it "updates the default payment method" do
       customer = Braintree::Customer.create!(
         :first_name => "Joe",
-        :last_name => "Brown"
+        :last_name => "Brown",
       )
 
       token1 = random_payment_method_token
@@ -1235,7 +1267,7 @@ describe Braintree::Customer do
       payment_method1 = Braintree::PaymentMethod.create(
         :customer_id => customer.id,
         :payment_method_nonce => Braintree::Test::Nonce::TransactableVisa,
-        :token => token1
+        :token => token1,
       )
 
       payment_method1 = Braintree::PaymentMethod.find(token1)
@@ -1246,11 +1278,11 @@ describe Braintree::Customer do
       payment_method2 = Braintree::PaymentMethod.create(
         :customer_id => customer.id,
         :payment_method_nonce => Braintree::Test::Nonce::TransactableMasterCard,
-        :token => token2
+        :token => token2,
       )
 
       Braintree::Customer.update(customer.id,
-        :default_payment_method_token => token2
+        :default_payment_method_token => token2,
       )
 
       payment_method2 = Braintree::PaymentMethod.find(token2)
@@ -1260,7 +1292,7 @@ describe Braintree::Customer do
     it "updates the default payment method in the options" do
       customer = Braintree::Customer.create!(
         :first_name => "Joe",
-        :last_name => "Brown"
+        :last_name => "Brown",
       )
 
       token1 = random_payment_method_token
@@ -1268,7 +1300,7 @@ describe Braintree::Customer do
       payment_method1 = Braintree::PaymentMethod.create(
         :customer_id => customer.id,
         :payment_method_nonce => Braintree::Test::Nonce::TransactableVisa,
-        :token => token1
+        :token => token1,
       )
 
       payment_method1 = Braintree::PaymentMethod.find(token1)
@@ -1279,7 +1311,7 @@ describe Braintree::Customer do
       payment_method2 = Braintree::PaymentMethod.create(
         :customer_id => customer.id,
         :payment_method_nonce => Braintree::Test::Nonce::TransactableMasterCard,
-        :token => token2
+        :token => token2,
       )
 
       Braintree::Customer.update(customer.id,
@@ -1288,7 +1320,7 @@ describe Braintree::Customer do
             :update_existing_token => token2,
             :make_default => true
           }
-        }
+        },
       )
 
       payment_method2 = Braintree::PaymentMethod.find(token2)
@@ -1298,7 +1330,7 @@ describe Braintree::Customer do
     it "can use any country code" do
       customer = Braintree::Customer.create!(
         :first_name => "Alex",
-        :last_name => "Matterson"
+        :last_name => "Matterson",
       )
       result = Braintree::Customer.update(
         customer.id,
@@ -1313,7 +1345,7 @@ describe Braintree::Customer do
             :country_code_alpha3 => "FJI",
             :country_code_numeric => "242"
           }
-        }
+        },
       )
       result.success?.should == true
       result.customer.addresses[0].country_name.should == "Fiji"
@@ -1332,7 +1364,7 @@ describe Braintree::Customer do
             :first_name => "Joe",
             :postal_code => "60622"
           }
-        }
+        },
       )
 
       result = Braintree::Customer.update(
@@ -1340,13 +1372,13 @@ describe Braintree::Customer do
         :first_name => "New Joe",
         :credit_card => {
           :cardholder_name => "New Joe Cardholder",
-          :options => { :update_existing_token => customer.credit_cards.first.token },
+          :options => {:update_existing_token => customer.credit_cards.first.token},
           :billing_address => {
             :last_name => "Cool",
             :postal_code => "60666",
-            :options => { :update_existing => true }
+            :options => {:update_existing => true}
           }
-        }
+        },
       )
       result.success?.should == true
       result.customer.id.should == customer.id
@@ -1364,7 +1396,7 @@ describe Braintree::Customer do
 
     it "can update the customer and verify_card with a specific verification_amount" do
       customer = Braintree::Customer.create!(
-        :first_name => "Joe"
+        :first_name => "Joe",
       )
 
       result = Braintree::Customer.update(
@@ -1374,8 +1406,73 @@ describe Braintree::Customer do
           :cardholder_name => "New Joe Cardholder",
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "12/2009",
-          :options => { :verify_card => true, :verification_amount => "2.00" }
-        }
+          :options => {:verify_card => true, :verification_amount => "2.00"}
+        },
+      )
+      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!(
+          :first_name => "Joe",
+        )
+
+        updated_result = Braintree::Customer.update(
+          customer.id,
+          :credit_card => {
+            :cardholder_name => "New Joe Cardholder",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "12/2009",
+            :options => {
+              :skip_advanced_fraud_checking => false,
+              :verify_card => true,
+            },
+          },
+        )
+
+        expect(updated_result).to be_success
+        verification = updated_result.customer.credit_cards.first.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!(
+          :first_name => "Joe",
+        )
+
+        updated_result = Braintree::Customer.update(
+          customer.id,
+          :credit_card => {
+            :cardholder_name => "New Joe Cardholder",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "12/2009",
+            :options => {
+              :skip_advanced_fraud_checking => true,
+              :verify_card => true,
+            },
+          },
+        )
+
+        expect(updated_result).to be_success
+        verification = updated_result.customer.credit_cards.first.verification
+        expect(verification.risk_data).to be_nil
+      end
+    end
+
+    it "can update a tax_identifier" do
+      customer = Braintree::Customer.create!(
+        :tax_identifiers => [
+          {:country_code => "US", :identifier => "987654321"},
+          {:country_code => "CL", :identifier => "123456789"}
+        ],
+      )
+
+      result = Braintree::Customer.update(
+        customer.id,
+        :tax_identifiers => [{:country_code => "US", :identifier => "567891234"}],
       )
       result.success?.should == true
     end
@@ -1385,17 +1482,17 @@ describe Braintree::Customer do
         :payment_method_nonce => Braintree::Test::Nonce::ThreeDSecureVisaFullAuthentication,
         :credit_card => {
           :three_d_secure_pass_thru => {
-            :eci_flag => '02',
-            :cavv => 'some_cavv',
-            :xid => 'some_xid',
-            :three_d_secure_version => 'xx',
-            :authentication_response => 'Y',
-            :directory_response => 'Y',
-            :cavv_algorithm => '2',
-            :ds_transaction_id => 'some_ds_transaction_id',
+            :eci_flag => "02",
+            :cavv => "some_cavv",
+            :xid => "some_xid",
+            :three_d_secure_version => "xx",
+            :authentication_response => "Y",
+            :directory_response => "Y",
+            :cavv_algorithm => "2",
+            :ds_transaction_id => "some_ds_transaction_id",
           },
           :options => {:verify_card => true}
-        }
+        },
       )
 
       expect(result).not_to be_success
@@ -1409,17 +1506,17 @@ describe Braintree::Customer do
         :payment_method_nonce => Braintree::Test::Nonce::ThreeDSecureVisaFullAuthentication,
         :credit_card => {
           :three_d_secure_pass_thru => {
-            :eci_flag => '02',
-            :cavv => 'some_cavv',
-            :xid => 'some_xid',
-            :three_d_secure_version => '2.2.1',
-            :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 => "2.2.1",
+            :authentication_response => "Y",
+            :directory_response => "Y",
+            :cavv_algorithm => "2",
+            :ds_transaction_id => "some_ds_transaction_id",
           },
           :options => {:verify_card => true}
-        }
+        },
       )
 
       expect(result).to be_success
@@ -1430,7 +1527,7 @@ describe Braintree::Customer do
         :payment_method_nonce => Braintree::Test::Nonce::ThreeDSecureVisaFullAuthentication,
         :credit_card => {
           :options => {:verify_card => true}
-        }
+        },
       )
       result.success?.should == true
 
@@ -1452,7 +1549,7 @@ describe Braintree::Customer do
       address = Braintree::Address.create!(
         :customer_id => customer.id,
         :first_name => "John",
-        :last_name => "Doe"
+        :last_name => "Doe",
       )
 
       customer = Braintree::Customer.update(
@@ -1461,7 +1558,7 @@ describe Braintree::Customer do
           :number => Braintree::Test::CreditCardNumbers::Visa,
           :expiration_date => "12/2009",
           :billing_address_id => address.id
-        }
+        },
       ).customer
 
       billing_address = customer.credit_cards.first.billing_address
@@ -1474,12 +1571,93 @@ describe Braintree::Customer do
       customer = Braintree::Customer.create!(:email => "valid@email.com")
       result = Braintree::Customer.update(
         customer.id,
-        :email => "@invalid.com"
+        :email => "@invalid.com",
       )
       result.success?.should == false
       result.errors.for(:customer).on(:email)[0].message.should == "Email is an invalid format."
     end
 
+    context "verification_currency_iso_code" do
+      it "can update the customer after validating verification_currency_iso_code" do
+        customer = Braintree::Customer.create!(
+          :first_name => "Joe",
+        )
+
+        result = Braintree::Customer.update(
+          customer.id,
+          :first_name => "New Joe",
+          :credit_card => {
+            :cardholder_name => "New Joe Cardholder",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "12/2009",
+            :options => {:verify_card => true, :verification_currency_iso_code => "USD"}
+          },
+        )
+        result.success?.should == true
+        result.customer.credit_cards[0].verification.currency_iso_code == "USD"
+      end
+
+      it "can update the customer after validating verification_currency_iso_code against the given verification_merchant_account_id" do
+        customer = Braintree::Customer.create!(
+          :first_name => "Joe",
+        )
+
+        result = Braintree::Customer.update(
+          customer.id,
+          :first_name => "New Joe",
+          :credit_card => {
+            :cardholder_name => "New Joe Cardholder",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "12/2009",
+            :options => {:verify_card => true, :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId, :verification_currency_iso_code => "USD"}
+          },
+        )
+        result.success?.should == true
+        result.customer.credit_cards[0].verification.currency_iso_code == "USD"
+        result.customer.credit_cards[0].verification.merchant_account_id == SpecHelper::NonDefaultMerchantAccountId
+      end
+
+      it "throws error due to verification_currency_iso_code not matching against the currency configured in default merchant account" do
+        customer = Braintree::Customer.create!(
+          :first_name => "Joe",
+        )
+
+        result = Braintree::Customer.update(
+          customer.id,
+          :first_name => "New Joe",
+          :credit_card => {
+            :cardholder_name => "New Joe Cardholder",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "12/2009",
+            :options => {:verify_card => true, :verification_currency_iso_code => "GBP"}
+          },
+        )
+        result.success?.should == false
+        expect(result.errors.for(:customer).for(:credit_card).for(:options).on(:verification_currency_iso_code)[0].code).to eq Braintree::ErrorCodes::CreditCard::CurrencyCodeNotSupportedByMerchantAccount
+
+      end
+
+      it "throws error due to verification_currency_iso_code not matching against the currency configured in the given verification merchant account" do
+        customer = Braintree::Customer.create!(
+          :first_name => "Joe",
+        )
+
+        result = Braintree::Customer.update(
+          customer.id,
+          :first_name => "New Joe",
+          :credit_card => {
+            :cardholder_name => "New Joe Cardholder",
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "12/2009",
+            :options => {:verify_card => true, :verification_merchant_account_id => SpecHelper::NonDefaultMerchantAccountId, :verification_currency_iso_code => "GBP"}
+          },
+        )
+        result.success?.should == false
+        expect(result.errors.for(:customer).for(:credit_card).for(:options).on(:verification_currency_iso_code)[0].code).to eq Braintree::ErrorCodes::CreditCard::CurrencyCodeNotSupportedByMerchantAccount
+
+      end
+    end
+
     context "verification_account_type" do
       it "updates the credit card with account_type credit" do
         customer = Braintree::Customer.create!
@@ -1495,7 +1673,7 @@ describe Braintree::Customer do
               :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
               :verification_account_type => "credit",
             },
-          }
+          },
         )
         expect(update_result).to be_success
       end
@@ -1514,7 +1692,7 @@ describe Braintree::Customer do
               :verification_merchant_account_id => SpecHelper::HiperBRLMerchantAccountId,
               :verification_account_type => "debit",
             },
-          }
+          },
         )
         expect(update_result).to be_success
       end
@@ -1525,12 +1703,12 @@ describe Braintree::Customer do
     it "returns the updated customer if successful" do
       customer = Braintree::Customer.create!(
         :first_name => "Joe",
-        :last_name => "Cool"
+        :last_name => "Cool",
       )
       updated_customer = Braintree::Customer.update!(
         customer.id,
         :first_name => "Mr. Joe",
-        :last_name => "Super Cool"
+        :last_name => "Super Cool",
       )
       updated_customer.first_name.should == "Mr. Joe"
       updated_customer.last_name.should == "Super Cool"
@@ -1545,214 +1723,7 @@ describe Braintree::Customer do
     end
   end
 
-  describe "update" do
-    it "updates the customer" do
-      customer = Braintree::Customer.create!(
-        :first_name => "Joe",
-        :last_name => "Cool"
-      )
-      update_result = customer.update(
-        :first_name => "Mr. Joe",
-        :last_name => "Super Cool"
-      )
-      update_result.success?.should == true
-      update_result.customer.should == customer
-      updated_customer = update_result.customer
-      updated_customer.first_name.should == "Mr. Joe"
-      updated_customer.last_name.should == "Super Cool"
-    end
-
-    it "returns an error response if invalid" do
-      customer = Braintree::Customer.create!(
-        :email => "valid@email.com"
-      )
-      result = customer.update(
-        :email => "@invalid.com"
-      )
-      result.success?.should == false
-      result.errors.for(:customer).on(:email)[0].message.should == "Email is an invalid format."
-    end
-  end
-
-  describe "update!" do
-    it "returns the customer and updates the customer if successful" do
-      customer = Braintree::Customer.create!(
-        :first_name => "Joe",
-        :last_name => "Cool"
-      )
-      customer.update!(
-        :first_name => "Mr. Joe",
-        :last_name => "Super Cool"
-      ).should == customer
-      customer.first_name.should == "Mr. Joe"
-      customer.last_name.should == "Super Cool"
-      customer.updated_at.between?(Time.now - 60, Time.now).should == true
-    end
-
-    it "raises an error if unsuccessful" do
-      customer = Braintree::Customer.create!(
-        :email => "valid@email.com"
-      )
-      expect do
-        customer.update!(:email => "@invalid.com")
-      end.to raise_error(Braintree::ValidationsFailed)
-    end
-  end
-
-  describe "update_from_transparent_redirect" do
-    it "returns a successful result if successful" do
-      result = Braintree::Customer.create(
-        :first_name => "Old First",
-        :last_name => "Old Last",
-        :company => "Old Company",
-        :email => "old@email.com",
-        :phone => "000.111.2222",
-        :fax => "000.222.3333",
-        :website => "old.website.com"
-      )
-      result.success?.should == true
-      original_customer = result.customer
-      params = {
-        :customer => {
-          :first_name => "New First",
-          :last_name => "New Last",
-          :company => "New Company",
-          :email => "new@email.com",
-          :phone => "888.111.2222",
-          :fax => "999.222.3333",
-          :website => "new.website.com"
-        }
-      }
-      tr_data_params = {
-        :customer_id => original_customer.id
-      }
-
-      tr_data = Braintree::TransparentRedirect.update_customer_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, params, Braintree::Customer.update_customer_url)
-      result = Braintree::Customer.update_from_transparent_redirect(query_string_response)
-
-      result.success?.should == true
-      customer = result.customer
-      customer.id.should == original_customer.id
-      customer.first_name.should == "New First"
-      customer.last_name.should == "New Last"
-      customer.company.should == "New Company"
-      customer.email.should == "new@email.com"
-      customer.phone.should == "888.111.2222"
-      customer.fax.should == "999.222.3333"
-      customer.website.should == "new.website.com"
-    end
-
-    it "returns a successful result when updating an existing credit card" do
-      result = Braintree::Customer.create(
-        :first_name => "Old First",
-        :last_name => "Old Last",
-        :company => "Old Company",
-        :email => "old@email.com",
-        :phone => "000.111.2222",
-        :fax => "000.222.3333",
-        :website => "old.website.com",
-        :credit_card => {
-          :number => Braintree::Test::CreditCardNumbers::Visa,
-          :expiration_date => "12/2009",
-          :billing_address => {
-            :first_name => "Joe",
-            :postal_code => "60622"
-          }
-        }
-      )
-      result.success?.should == true
-      original_customer = result.customer
-
-      tr_data_params = {
-        :customer_id => original_customer.id,
-        :customer => {
-          :first_name => "New First",
-          :last_name => "New Last",
-          :company => "New Company",
-          :email => "new@email.com",
-          :phone => "888.111.2222",
-          :fax => "999.222.3333",
-          :website => "new.website.com",
-          :credit_card => {
-            :cardholder_name => "New Joe Cardholder",
-            :options => { :update_existing_token => original_customer.credit_cards.first.token },
-            :billing_address => {
-              :last_name => "Cool",
-              :postal_code => "60666",
-              :options => { :update_existing => true }
-            }
-          }
-        }
-      }
-
-      tr_data = Braintree::TransparentRedirect.update_customer_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, {}, Braintree::Customer.update_customer_url)
-      result = Braintree::Customer.update_from_transparent_redirect(query_string_response)
-
-      result.success?.should == true
-      customer = result.customer
-      customer.id.should == original_customer.id
-      customer.first_name.should == "New First"
-      customer.last_name.should == "New Last"
-      customer.company.should == "New Company"
-      customer.email.should == "new@email.com"
-      customer.phone.should == "888.111.2222"
-      customer.fax.should == "999.222.3333"
-      customer.website.should == "new.website.com"
-
-      credit_card = customer.credit_cards.first
-      credit_card.bin.should == Braintree::Test::CreditCardNumbers::Visa.slice(0, 6)
-      credit_card.cardholder_name.should == "New Joe Cardholder"
-
-      credit_card.billing_address.first_name.should == "Joe"
-      credit_card.billing_address.last_name.should == "Cool"
-      credit_card.billing_address.postal_code.should == "60666"
-    end
-
-    it "can pass any attribute through tr_data" do
-      original_customer = Braintree::Customer.create!(
-        :first_name => "Old First",
-        :last_name => "Old Last",
-        :company => "Old Company",
-        :email => "old@email.com",
-        :phone => "000.111.2222",
-        :fax => "000.222.3333",
-        :website => "old.website.com"
-      )
-      new_customer_id = "customer_#{rand(1_000_000)}"
-      tr_data_params = {
-        :customer_id => original_customer.id,
-        :customer => {
-          :id => new_customer_id,
-          :first_name => "New First",
-          :last_name => "New Last",
-          :company => "New Company",
-          :email => "new@email.com",
-          :phone => "888.111.2222",
-          :fax => "999.222.3333",
-          :website => "new.website.com"
-        }
-      }
-
-      tr_data = Braintree::TransparentRedirect.update_customer_data({:redirect_url => "http://example.com"}.merge(tr_data_params))
-      query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, {}, Braintree::Customer.update_customer_url)
-      result = Braintree::Customer.update_from_transparent_redirect(query_string_response)
-
-      result.success?.should == true
-      customer = result.customer
-      customer.id.should == new_customer_id
-      customer.first_name.should == "New First"
-      customer.last_name.should == "New Last"
-      customer.company.should == "New Company"
-      customer.email.should == "new@email.com"
-      customer.phone.should == "888.111.2222"
-      customer.fax.should == "999.222.3333"
-      customer.website.should == "new.website.com"
-    end
-  end
-
-  describe "default_credit_card" do
+  describe "default_payment_method" do
     it "should return the default credit card for a given customer" do
       customer = Braintree::Customer.create!(
         :credit_card => {
@@ -1761,21 +1732,21 @@ describe Braintree::Customer do
           :options => {
             :make_default => false
           }
-        }
+        },
       )
 
-      default_credit_card = Braintree::CreditCard.create!(
+      default_payment_method = Braintree::CreditCard.create!(
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::MasterCard,
         :expiration_date => "11/2015",
         :options => {
           :make_default => true
-        }
+        },
       )
 
       customer = Braintree::Customer.find(customer.id)
 
-      customer.default_credit_card.should == default_credit_card
+      customer.default_payment_method.should == default_payment_method
     end
   end
 
@@ -1783,7 +1754,7 @@ describe Braintree::Customer do
     context "future" do
       it "creates a customer with a future paypal account" do
         result = Braintree::Customer.create(
-          :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment
+          :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment,
         )
 
         result.should be_success
@@ -1797,7 +1768,7 @@ describe Braintree::Customer do
             :options => {
               :make_default => true
             }
-          }
+          },
         )
 
         paypal_account_token = "PAYPAL_ACCOUNT_TOKEN_#{rand(36**3).to_s(36)}"
@@ -1806,12 +1777,12 @@ describe Braintree::Customer do
           :token => paypal_account_token,
           :options => {
             :make_default => true
-          }
+          },
         )
 
         result = Braintree::Customer.update(
           customer.id,
-          :payment_method_nonce => nonce
+          :payment_method_nonce => nonce,
         )
 
         result.should be_success
@@ -1827,7 +1798,7 @@ describe Braintree::Customer do
           :token => paypal_account_token,
           :options => {
             :make_default => true
-          }
+          },
         )
 
         result = Braintree::Customer.create(
@@ -1863,7 +1834,7 @@ describe Braintree::Customer do
             :options => {
               :make_default => true
             }
-          }
+          },
         )
 
         paypal_account_token = "PAYPAL_ACCOUNT_TOKEN_#{rand(36**3).to_s(36)}"
@@ -1872,7 +1843,7 @@ describe Braintree::Customer do
           :token => paypal_account_token,
           :options => {
             :make_default => true
-          }
+          },
         )
 
         result = Braintree::Customer.update(
@@ -1906,7 +1877,7 @@ describe Braintree::Customer do
     context "onetime" do
       it "does not create a customer with a onetime paypal account" do
         result = Braintree::Customer.create(
-          :payment_method_nonce => Braintree::Test::Nonce::PayPalOneTimePayment
+          :payment_method_nonce => Braintree::Test::Nonce::PayPalOneTimePayment,
         )
 
         result.should_not be_success
@@ -1922,7 +1893,7 @@ describe Braintree::Customer do
             :options => {
               :make_default => true
             }
-          }
+          },
         )
 
         paypal_account_token = "PAYPAL_ACCOUNT_TOKEN_#{rand(36**3).to_s(36)}"
@@ -1931,12 +1902,12 @@ describe Braintree::Customer do
           :token => paypal_account_token,
           :options => {
             :make_default => true
-          }
+          },
         )
 
         result = Braintree::Customer.update(
           customer.id,
-          :payment_method_nonce => nonce
+          :payment_method_nonce => nonce,
         )
 
         result.should_not be_success