braintree 2.74.0 → 4.12.0

data/spec/integration/braintree/address_spec.rb

@@ -14,8 +14,9 @@ describe Braintree::Address do
         :extended_address => "Suite 200",
         :locality => "Chicago",
         :region => "Illinois",
+        :phone_number => "5551231234",
         :postal_code => "60622",
-        :country_name => "United States of America"
+        :country_name => "United States of America",
       )
       result.success?.should == true
       result.address.customer_id.should == customer.id
@@ -26,6 +27,7 @@ describe Braintree::Address do
       result.address.extended_address.should == "Suite 200"
       result.address.locality.should == "Chicago"
       result.address.region.should == "Illinois"
+      result.address.phone_number.should == "5551231234"
       result.address.postal_code.should == "60622"
       result.address.country_name.should == "United States of America"
       result.address.country_code_alpha2.should == "US"
@@ -39,7 +41,7 @@ describe Braintree::Address do
         :customer_id => customer.id,
         :country_code_alpha2 => "AS",
         :country_code_alpha3 => "ASM",
-        :country_code_numeric => "16"
+        :country_code_numeric => "16",
       )
       result.success?.should == true
       result.address.country_name.should == "American Samoa"
@@ -52,7 +54,7 @@ describe Braintree::Address do
       customer = Braintree::Customer.create!
       result = Braintree::Address.create(
         :customer_id => customer.id,
-        :country_name => "Åland"
+        :country_name => "Åland",
       )
       result.success?.should == true
       result.address.country_name.should == "Åland"
@@ -63,47 +65,47 @@ describe Braintree::Address do
       result = Braintree::Address.create(
         :customer_id => customer.id,
         :country_code_alpha2 => "AS",
-        :country_code_alpha3 => "USA"
+        :country_code_alpha3 => "USA",
       )
       result.success?.should == false
-      result.errors.for(:address).on(:base).map {|e| e.code}.should include(Braintree::ErrorCodes::Address::InconsistentCountry)
+      result.errors.for(:address).on(:base).map { |e| e.code }.should include(Braintree::ErrorCodes::Address::InconsistentCountry)
     end
 
     it "returns an error response given an invalid country_code_alpha2" do
       customer = Braintree::Customer.create!
       result = Braintree::Address.create(
         :customer_id => customer.id,
-        :country_code_alpha2 => "zz"
+        :country_code_alpha2 => "zz",
       )
       result.success?.should == false
-      result.errors.for(:address).on(:country_code_alpha2).map {|e| e.code}.should include(Braintree::ErrorCodes::Address::CountryCodeAlpha2IsNotAccepted)
+      result.errors.for(:address).on(:country_code_alpha2).map { |e| e.code }.should include(Braintree::ErrorCodes::Address::CountryCodeAlpha2IsNotAccepted)
     end
 
     it "returns an error response given an invalid country_code_alpha3" do
       customer = Braintree::Customer.create!
       result = Braintree::Address.create(
         :customer_id => customer.id,
-        :country_code_alpha3 => "zzz"
+        :country_code_alpha3 => "zzz",
       )
       result.success?.should == false
-      result.errors.for(:address).on(:country_code_alpha3).map {|e| e.code}.should include(Braintree::ErrorCodes::Address::CountryCodeAlpha3IsNotAccepted)
+      result.errors.for(:address).on(:country_code_alpha3).map { |e| e.code }.should include(Braintree::ErrorCodes::Address::CountryCodeAlpha3IsNotAccepted)
     end
 
     it "returns an error response given an invalid country_code_numeric" do
       customer = Braintree::Customer.create!
       result = Braintree::Address.create(
         :customer_id => customer.id,
-        :country_code_numeric => "zz"
+        :country_code_numeric => "zz",
       )
       result.success?.should == false
-      result.errors.for(:address).on(:country_code_numeric).map {|e| e.code}.should include(Braintree::ErrorCodes::Address::CountryCodeNumericIsNotAccepted)
+      result.errors.for(:address).on(:country_code_numeric).map { |e| e.code }.should include(Braintree::ErrorCodes::Address::CountryCodeNumericIsNotAccepted)
     end
 
     it "returns an error response if invalid" do
       customer = Braintree::Customer.create!(:last_name => "Wilson")
       result = Braintree::Address.create(
         :customer_id => customer.id,
-        :country_name => "United States of Invalid"
+        :country_name => "United States of Invalid",
       )
       result.success?.should == false
       result.errors.for(:address).on(:country_name)[0].message.should == "Country name is not an accepted country."
@@ -131,14 +133,16 @@ describe Braintree::Address do
         :extended_address => "Suite 201",
         :locality => "Bartlett",
         :region => "IL",
+        :phone_number => "5551231234",
         :postal_code => "60623",
-        :country_name => "United States of America"
+        :country_name => "United States of America",
       )
       address.customer_id.should == customer.id
       address.street_address.should == "1812 E Main St"
       address.extended_address.should == "Suite 201"
       address.locality.should == "Bartlett"
       address.region.should == "IL"
+      address.phone_number.should == "5551231234"
       address.postal_code.should == "60623"
       address.country_name.should == "United States of America"
     end
@@ -148,7 +152,7 @@ describe Braintree::Address do
       expect do
         Braintree::Address.create!(
           :customer_id => customer.id,
-          :country_name => "United States of Invalid"
+          :country_name => "United States of Invalid",
         )
       end.to raise_error(Braintree::ValidationsFailed)
     end
@@ -226,7 +230,7 @@ describe Braintree::Address do
         :locality => "Old Chicago",
         :region => "IL",
         :postal_code => "60620",
-        :country_name => "United States of America"
+        :country_name => "United States of America",
       )
       result = Braintree::Address.update(
         customer.id,
@@ -236,7 +240,7 @@ describe Braintree::Address do
         :locality => "Chicago",
         :region => "Illinois",
         :postal_code => "60621",
-        :country_name => "United States of America"
+        :country_name => "United States of America",
       )
       result.success?.should == true
       result.address.street_address.should == "123 E New St"
@@ -254,12 +258,12 @@ describe Braintree::Address do
       customer = Braintree::Customer.create!(:last_name => "Miller")
       address = Braintree::Address.create!(
         :customer_id => customer.id,
-        :country_name => "Angola"
+        :country_name => "Angola",
       )
       result = Braintree::Address.update(
         customer.id,
         address.id,
-        :country_name => "Azerbaijan"
+        :country_name => "Azerbaijan",
       )
 
       result.success?.should == true
@@ -273,13 +277,13 @@ describe Braintree::Address do
       customer = Braintree::Customer.create!(:last_name => "Miller")
       address = Braintree::Address.create!(
         :customer_id => customer.id,
-        :country_name => "United States of America"
+        :country_name => "United States of America",
       )
       result = Braintree::Address.update(
         customer.id,
         address.id,
         :street_address => "123 E New St",
-        :country_name => "United States of Invalid"
+        :country_name => "United States of Invalid",
       )
       result.success?.should == false
       result.errors.for(:address).on(:country_name)[0].message.should == "Country name is not an accepted country."
@@ -304,7 +308,7 @@ describe Braintree::Address do
         :locality => "Old Chicago",
         :region => "IL",
         :postal_code => "60620",
-        :country_name => "United States of America"
+        :country_name => "United States of America",
       )
       updated_address = Braintree::Address.update!(
         customer.id,
@@ -314,7 +318,7 @@ describe Braintree::Address do
         :locality => "Chicago",
         :region => "Illinois",
         :postal_code => "60621",
-        :country_name => "United States of America"
+        :country_name => "United States of America",
       )
       updated_address.should == address
       updated_address.street_address.should == "123 E New St"
@@ -329,14 +333,14 @@ describe Braintree::Address do
       customer = Braintree::Customer.create!(:last_name => "Miller")
       address = Braintree::Address.create!(
         :customer_id => customer.id,
-        :country_name => "United States of America"
+        :country_name => "United States of America",
       )
       expect do
         Braintree::Address.update!(
           customer.id,
           address.id,
           :street_address => "123 E New St",
-          :country_name => "United States of Invalid"
+          :country_name => "United States of Invalid",
         )
       end.to raise_error(Braintree::ValidationsFailed)
     end
@@ -347,98 +351,11 @@ describe Braintree::Address do
     it "deletes the address" do
       customer = Braintree::Customer.create!(:last_name => "Wilson")
       address = Braintree::Address.create!(:customer_id => customer.id, :street_address => "123 E Main St")
-      address.delete.success?.should == true
+      result = Braintree::Address.delete(customer.id, address.id)
+      result.success?.should == true
       expect do
         Braintree::Address.find(customer.id, address.id)
       end.to raise_error(Braintree::NotFoundError)
     end
   end
-
-  describe "update" do
-    it "returns a success response and updates the address if valid" do
-      customer = Braintree::Customer.create!(:last_name => "Miller")
-      address = Braintree::Address.create!(
-        :customer_id => customer.id,
-        :street_address => "1812 E Old St",
-        :extended_address => "Suite Old 201",
-        :locality => "Old Chicago",
-        :region => "IL",
-        :postal_code => "60620",
-        :country_name => "United States of America"
-      )
-      result = address.update(
-        :street_address => "123 E New St",
-        :extended_address => "New Suite 3",
-        :locality => "Chicago",
-        :region => "Illinois",
-        :postal_code => "60621",
-        :country_name => "United States of America"
-      )
-      result.success?.should == true
-      result.address.should == address
-      address.street_address.should == "123 E New St"
-      address.extended_address.should == "New Suite 3"
-      address.locality.should == "Chicago"
-      address.region.should == "Illinois"
-      address.postal_code.should == "60621"
-      address.country_name.should == "United States of America"
-    end
-
-    it "returns an error response if invalid" do
-      customer = Braintree::Customer.create!(:last_name => "Miller")
-      address = Braintree::Address.create!(
-        :customer_id => customer.id,
-        :country_name => "United States of America"
-      )
-      result = address.update(
-        :street_address => "123 E New St",
-        :country_name => "United States of Invalid"
-      )
-      result.success?.should == false
-      result.errors.for(:address).on(:country_name)[0].message.should == "Country name is not an accepted country."
-    end
-  end
-
-  describe "update!" do
-    it "returns true and updates the address if valid" do
-      customer = Braintree::Customer.create!(:last_name => "Miller")
-      address = Braintree::Address.create!(
-        :customer_id => customer.id,
-        :street_address => "1812 E Old St",
-        :extended_address => "Suite Old 201",
-        :locality => "Old Chicago",
-        :region => "IL",
-        :postal_code => "60620",
-        :country_name => "United States of America"
-      )
-      address.update!(
-        :street_address => "123 E New St",
-        :extended_address => "New Suite 3",
-        :locality => "Chicago",
-        :region => "Illinois",
-        :postal_code => "60621",
-        :country_name => "United States of America"
-      ).should == address
-      address.street_address.should == "123 E New St"
-      address.extended_address.should == "New Suite 3"
-      address.locality.should == "Chicago"
-      address.region.should == "Illinois"
-      address.postal_code.should == "60621"
-      address.country_name.should == "United States of America"
-    end
-
-    it "raises a ValidationsFailed invalid" do
-      customer = Braintree::Customer.create!(:last_name => "Miller")
-      address = Braintree::Address.create!(
-        :customer_id => customer.id,
-        :country_name => "United States of America"
-      )
-      expect do
-        address.update!(
-          :street_address => "123 E New St",
-          :country_name => "United States of Invalid"
-        )
-      end.to raise_error(Braintree::ValidationsFailed)
-    end
-  end
 end

data/spec/integration/braintree/advanced_search_spec.rb

@@ -6,7 +6,7 @@ describe Braintree::AdvancedSearch do
       :credit_card => {
         :number => Braintree::Test::CreditCardNumbers::Visa,
         :expiration_date => "05/2010"
-      }
+      },
     ).credit_cards[0]
   end
 
@@ -16,13 +16,13 @@ describe Braintree::AdvancedSearch do
       subscription1 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
-        :id => "subscription1_#{id}"
+        :id => "subscription1_#{id}",
       ).subscription
 
       subscription2 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
-        :id => "subscription2_#{id}"
+        :id => "subscription2_#{id}",
       ).subscription
 
       collection = Braintree::Subscription.search do |search|
@@ -39,14 +39,14 @@ describe Braintree::AdvancedSearch do
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
         :price => "11",
-        :id => "subscription1_#{id}"
+        :id => "subscription1_#{id}",
       ).subscription
 
       subscription2 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
         :price => "11",
-        :id => "subscription2_#{id}"
+        :id => "subscription2_#{id}",
       ).subscription
 
       collection = Braintree::Subscription.search do |search|
@@ -63,13 +63,13 @@ describe Braintree::AdvancedSearch do
       subscription1 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
-        :id => "subscription1_#{id}"
+        :id => "subscription1_#{id}",
       ).subscription
 
       subscription2 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
-        :id => "subscription2_#{id}"
+        :id => "subscription2_#{id}",
       ).subscription
 
       collection = Braintree::Subscription.search do |search|
@@ -85,13 +85,13 @@ describe Braintree::AdvancedSearch do
       subscription1 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
-        :id => "subscription1_#{id}"
+        :id => "subscription1_#{id}",
       ).subscription
 
       subscription2 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
-        :id => "subscription2_#{id}"
+        :id => "subscription2_#{id}",
       ).subscription
 
       collection = Braintree::Subscription.search do |search|
@@ -107,13 +107,13 @@ describe Braintree::AdvancedSearch do
       subscription1 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
-        :id => "subscription1_#{id}"
+        :id => "subscription1_#{id}",
       ).subscription
 
       subscription2 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
-        :id => "subscription2_#{id}"
+        :id => "subscription2_#{id}",
       ).subscription
 
       collection = Braintree::Subscription.search do |search|
@@ -131,13 +131,13 @@ describe Braintree::AdvancedSearch do
         subscription1 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "12"
+          :price => "12",
         ).subscription
 
         subscription2 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "12"
+          :price => "12",
         ).subscription
 
         Braintree::Subscription.cancel(subscription2.id)
@@ -155,13 +155,13 @@ describe Braintree::AdvancedSearch do
         subscription1 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "13"
+          :price => "13",
         ).subscription
 
         subscription2 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "13"
+          :price => "13",
         ).subscription
 
         Braintree::Subscription.cancel(subscription2.id)
@@ -179,13 +179,13 @@ describe Braintree::AdvancedSearch do
         subscription1 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "14"
+          :price => "14",
         ).subscription
 
         subscription2 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "14"
+          :price => "14",
         ).subscription
 
         Braintree::Subscription.cancel(subscription2.id)
@@ -204,13 +204,13 @@ describe Braintree::AdvancedSearch do
           subscription1 = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
             :plan_id => SpecHelper::TriallessPlan[:id],
-            :price => "15"
+            :price => "15",
           ).subscription
 
           subscription2 = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
             :plan_id => SpecHelper::TriallessPlan[:id],
-            :price => "15"
+            :price => "15",
           ).subscription
 
           Braintree::Subscription.cancel(subscription2.id)
@@ -229,13 +229,13 @@ describe Braintree::AdvancedSearch do
         subscription1 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "16"
+          :price => "16",
         ).subscription
 
         subscription2 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "16"
+          :price => "16",
         ).subscription
 
         Braintree::Subscription.cancel(subscription2.id)
@@ -266,19 +266,19 @@ describe Braintree::AdvancedSearch do
         subscription1 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "17"
+          :price => "17",
         ).subscription
 
         subscription2 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :price => "17"
+          :price => "17",
         ).subscription
 
         subscription3 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::AddOnDiscountPlan[:id],
-          :price => "17"
+          :price => "17",
         ).subscription
 
         plan_ids = [SpecHelper::TriallessPlan[:id], SpecHelper::TrialPlan[:id]]
@@ -307,13 +307,13 @@ describe Braintree::AdvancedSearch do
         trialless_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "18"
+          :price => "18",
         ).subscription
 
         trial_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :price => "18"
+          :price => "18",
         ).subscription
 
         collection = Braintree::Subscription.search do |search|
@@ -331,13 +331,13 @@ describe Braintree::AdvancedSearch do
         trialless_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "19"
+          :price => "19",
         ).subscription
 
         trial_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :price => "19"
+          :price => "19",
         ).subscription
 
         collection = Braintree::Subscription.search do |search|
@@ -355,13 +355,13 @@ describe Braintree::AdvancedSearch do
         trialless_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "20"
+          :price => "20",
         ).subscription
 
         trial_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :price => "20"
+          :price => "20",
         ).subscription
 
         collection = Braintree::Subscription.search do |search|
@@ -379,13 +379,13 @@ describe Braintree::AdvancedSearch do
         trialless_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "21"
+          :price => "21",
         ).subscription
 
         trial_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :price => "21"
+          :price => "21",
         ).subscription
 
         collection = Braintree::Subscription.search do |search|
@@ -403,13 +403,13 @@ describe Braintree::AdvancedSearch do
         trialless_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "22"
+          :price => "22",
         ).subscription
 
         trial_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :price => "22"
+          :price => "22",
         ).subscription
 
         collection = Braintree::Subscription.search do |search|
@@ -428,13 +428,13 @@ describe Braintree::AdvancedSearch do
       subscription_500 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
-        :price => "5.00"
+        :price => "5.00",
       ).subscription
 
       subscription_501 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TrialPlan[:id],
-        :price => "5.01"
+        :price => "5.01",
       ).subscription
 
       collection = Braintree::Subscription.search do |search|
@@ -449,19 +449,19 @@ describe Braintree::AdvancedSearch do
       subscription_499 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TrialPlan[:id],
-        :price => "4.99"
+        :price => "4.99",
       ).subscription
 
       subscription_500 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
-        :price => "5.00"
+        :price => "5.00",
       ).subscription
 
       subscription_501 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TrialPlan[:id],
-        :price => "5.01"
+        :price => "5.01",
       ).subscription
 
       collection = Braintree::Subscription.search do |search|
@@ -477,19 +477,19 @@ describe Braintree::AdvancedSearch do
       subscription_499 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TrialPlan[:id],
-        :price => "999.99"
+        :price => "999.99",
       ).subscription
 
       subscription_500 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
-        :price => "1000.00"
+        :price => "1000.00",
       ).subscription
 
       subscription_501 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TrialPlan[:id],
-        :price => "1000.01"
+        :price => "1000.01",
       ).subscription
 
       collection = Braintree::Subscription.search do |search|
@@ -505,19 +505,19 @@ describe Braintree::AdvancedSearch do
       subscription_499 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TrialPlan[:id],
-        :price => "4.99"
+        :price => "4.99",
       ).subscription
 
       subscription_500 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TriallessPlan[:id],
-        :price => "5.00"
+        :price => "5.00",
       ).subscription
 
       subscription_502 = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TrialPlan[:id],
-        :price => "5.02"
+        :price => "5.02",
       ).subscription
 
       collection = Braintree::Subscription.search do |search|