braintree 2.104.1 → 3.4.0

data/spec/integration/braintree/payment_method_us_bank_account_spec.rb

@@ -13,14 +13,15 @@ describe Braintree::PaymentMethod do
       context "plaid verified nonce" do
         let(:nonce) { generate_valid_plaid_us_bank_account_nonce }
 
-        it "succeeds" do
+        # we are temporarily skipping this test until we have a more stable CI env
+        xit "succeeds" do
           customer = Braintree::Customer.create.customer
           result = Braintree::PaymentMethod.create(
             :payment_method_nonce => nonce,
             :customer_id => customer.id,
             :options => {
               :verification_merchant_account_id => SpecHelper::AnotherUsBankMerchantAccountId,
-            }
+            },
           )
 
           result.should be_success
@@ -49,7 +50,8 @@ describe Braintree::PaymentMethod do
           Braintree::UsBankAccountVerification::VerificationMethod::IndependentCheck,
           Braintree::UsBankAccountVerification::VerificationMethod::NetworkCheck,
         ].each do |method|
-          it "succeeds and verifies via #{method}" do
+          # we are temporarily skipping this test until we have a more stable CI env
+          xit "succeeds and verifies via #{method}" do
             customer = Braintree::Customer.create.customer
             result = Braintree::PaymentMethod.create(
               :payment_method_nonce => nonce,
@@ -57,7 +59,7 @@ describe Braintree::PaymentMethod do
               :options => {
                 :us_bank_account_verification_method => method,
                 :verification_merchant_account_id => SpecHelper::AnotherUsBankMerchantAccountId,
-              }
+              },
             )
 
             result.should be_success
@@ -101,7 +103,7 @@ describe Braintree::PaymentMethod do
             :customer_id => customer.id,
             :options => {
               :verification_merchant_account_id => SpecHelper::AnotherUsBankMerchantAccountId,
-            }
+            },
           )
 
           result.should be_success
@@ -134,7 +136,7 @@ describe Braintree::PaymentMethod do
               :options => {
                 :us_bank_account_verification_method => method,
                 :verification_merchant_account_id => SpecHelper::AnotherUsBankMerchantAccountId,
-              }
+              },
             )
 
             result.should be_success
@@ -165,7 +167,7 @@ describe Braintree::PaymentMethod do
         customer = Braintree::Customer.create.customer
         result = Braintree::PaymentMethod.create(
           :payment_method_nonce => generate_invalid_us_bank_account_nonce,
-          :customer_id => customer.id
+          :customer_id => customer.id,
         )
 
         result.should_not be_success
@@ -183,14 +185,15 @@ describe Braintree::PaymentMethod do
 
         let(:nonce) { generate_valid_plaid_us_bank_account_nonce }
 
-        it "succeeds and verifies via independent check" do
+        # we are temporarily skipping this test until we have a more stable CI env
+        xit "succeeds and verifies via independent check" do
           customer = Braintree::Customer.create.customer
           result = Braintree::PaymentMethod.create(
             :payment_method_nonce => nonce,
             :customer_id => customer.id,
             :options => {
               :verification_merchant_account_id => SpecHelper::UsBankMerchantAccountId,
-            }
+            },
           )
 
           result.should be_success
@@ -219,14 +222,15 @@ describe Braintree::PaymentMethod do
       context "non plaid verified nonce" do
         let(:nonce) { generate_non_plaid_us_bank_account_nonce }
 
-        it "succeeds and verifies via independent check" do
+        # we are temporarily skipping this test until we have a more stable CI env
+        xit "succeeds and verifies via independent check" do
           customer = Braintree::Customer.create.customer
           result = Braintree::PaymentMethod.create(
             :payment_method_nonce => nonce,
             :customer_id => customer.id,
             :options => {
               :verification_merchant_account_id => SpecHelper::UsBankMerchantAccountId,
-            }
+            },
           )
 
           result.should be_success
@@ -256,7 +260,7 @@ describe Braintree::PaymentMethod do
         customer = Braintree::Customer.create.customer
         result = Braintree::PaymentMethod.create(
           :payment_method_nonce => generate_invalid_us_bank_account_nonce,
-          :customer_id => customer.id
+          :customer_id => customer.id,
         )
 
         result.should_not be_success
@@ -352,7 +356,7 @@ describe Braintree::PaymentMethod do
             :customer_id => customer.id,
             :options => {
               :verification_merchant_account_id => SpecHelper::UsBankMerchantAccountId,
-            }
+            },
           ).payment_method
         end
 

data/spec/integration/braintree/paypal_account_spec.rb

@@ -9,11 +9,11 @@ describe Braintree::PayPalAccount do
 
       nonce = nonce_for_paypal_account(
         :consent_code => "consent-code",
-        :token => payment_method_token
+        :token => payment_method_token,
       )
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
       result.should be_success
 
@@ -35,7 +35,7 @@ describe Braintree::PayPalAccount do
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => Braintree::Test::Nonce::PayPalBillingAgreement,
         :customer_id => customer.id,
-        :token => payment_method_token
+        :token => payment_method_token,
       )
       result.should be_success
 
@@ -56,7 +56,7 @@ describe Braintree::PayPalAccount do
         :number => Braintree::Test::CreditCardNumbers::Visa,
         :expiration_date => "05/2009",
         :cvv => "100",
-        :token => "CREDIT_CARD_TOKEN"
+        :token => "CREDIT_CARD_TOKEN",
       )
 
       expect do
@@ -70,11 +70,11 @@ describe Braintree::PayPalAccount do
 
       nonce = nonce_for_paypal_account(
         :consent_code => "consent-code",
-        :token => payment_method_token
+        :token => payment_method_token,
       )
       result = Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
       result.should be_success
 
@@ -82,12 +82,12 @@ describe Braintree::PayPalAccount do
 
       subscription1 = Braintree::Subscription.create(
         :payment_method_token => token,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       ).subscription
 
       subscription2 = Braintree::Subscription.create(
         :payment_method_token => token,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       ).subscription
 
       paypal_account = Braintree::PayPalAccount.find(token)
@@ -105,7 +105,7 @@ describe Braintree::PayPalAccount do
         :options => {
             :make_default => true,
             :fail_on_duplicate_payment_method => true,
-        }
+        },
       )
 
       result.should be_success
@@ -116,7 +116,7 @@ describe Braintree::PayPalAccount do
     it "throws an error if customer id is not specified" do
       result = Braintree::PayPalAccount.create(
         :billing_agreement_id => "some_billing_agreement_id",
-        :email => "some@example.com"
+        :email => "some@example.com",
       )
 
       result.success?.should == false
@@ -127,7 +127,7 @@ describe Braintree::PayPalAccount do
       customer = Braintree::Customer.create!
       result = Braintree::PayPalAccount.create(
         :customer_id => customer.id,
-        :email => "some@example.com"
+        :email => "some@example.com",
       )
 
       result.success?.should == false
@@ -141,14 +141,14 @@ describe Braintree::PayPalAccount do
       create_result = Braintree::PayPalAccount.create(
         :customer_id => customer.id,
         :billing_agreement_id => "first_billing_agreement_id",
-        :email => "first@example.com"
+        :email => "first@example.com",
       )
       create_result.success?.should == true
 
       update_result = Braintree::PayPalAccount.update(
         create_result.paypal_account.token,
         :billing_agreement_id => "second_billing_agreement_id",
-        :email => "second@example.com"
+        :email => "second@example.com",
       )
 
       update_result.success?.should == true
@@ -163,17 +163,17 @@ describe Braintree::PayPalAccount do
       original_token = random_payment_method_token
       nonce = nonce_for_paypal_account(
         :consent_code => "consent-code",
-        :token => original_token
+        :token => original_token,
       )
       original_result = Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
 
       updated_token = "UPDATED_TOKEN-" + rand(36**3).to_s(36)
       updated_result = Braintree::PayPalAccount.update(
         original_token,
-        :token => updated_token
+        :token => updated_token,
       )
 
       updated_paypal_account = Braintree::PayPalAccount.find(updated_token)
@@ -190,19 +190,19 @@ describe Braintree::PayPalAccount do
         :customer_id => customer.id,
         :number => Braintree::Test::CreditCardNumbers::Visa,
         :expiration_date => "05/2009",
-        :options => {:make_default => true}
+        :options => {:make_default => true},
       )
       result.should be_success
 
       nonce = nonce_for_paypal_account(:consent_code => "consent-code")
       original_token = Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       ).payment_method.token
 
       updated_result = Braintree::PayPalAccount.update(
         original_token,
-        :options => {:make_default => true}
+        :options => {:make_default => true},
       )
 
       updated_paypal_account = Braintree::PayPalAccount.find(original_token)
@@ -216,25 +216,25 @@ describe Braintree::PayPalAccount do
 
       first_nonce = nonce_for_paypal_account(
         :consent_code => "consent-code",
-        :token => first_token
+        :token => first_token,
       )
       first_result = Braintree::PaymentMethod.create(
         :payment_method_nonce => first_nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
 
       second_nonce = nonce_for_paypal_account(
         :consent_code => "consent-code",
-        :token => second_token
+        :token => second_token,
       )
       second_result = Braintree::PaymentMethod.create(
         :payment_method_nonce => second_nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
 
       updated_result = Braintree::PayPalAccount.update(
         first_token,
-        :token => second_token
+        :token => second_token,
       )
 
       updated_result.should_not be_success
@@ -249,11 +249,11 @@ describe Braintree::PayPalAccount do
 
       nonce = nonce_for_paypal_account(
         :consent_code => "consent-code",
-        :token => token
+        :token => token,
       )
       Braintree::PaymentMethod.create(
         :payment_method_nonce => nonce,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       )
 
       result = Braintree::PayPalAccount.delete(token)
@@ -267,7 +267,7 @@ describe Braintree::PayPalAccount do
   context "self.sale" do
     it "creates a transaction using a paypal account and returns a result object" do
       customer = Braintree::Customer.create!(
-        :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment
+        :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment,
       )
 
       result = Braintree::PayPalAccount.sale(customer.paypal_accounts[0].token, :amount => "100.00")
@@ -283,7 +283,7 @@ describe Braintree::PayPalAccount do
   context "self.sale!" do
     it "creates a transaction using a paypal account and returns a transaction" do
       customer = Braintree::Customer.create!(
-        :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment
+        :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment,
       )
 
       transaction = Braintree::PayPalAccount.sale!(customer.paypal_accounts[0].token, :amount => "100.00")

data/spec/integration/braintree/samsung_pay_card_spec.rb

@@ -8,7 +8,7 @@ describe Braintree::SamsungPayCard do
     result = Braintree::PaymentMethod.create(
       :payment_method_nonce => Braintree::Test::Nonce::SamsungPayDiscover,
       :customer_id => customer.id,
-      :cardholder_name => 'Jenny Block',
+      :cardholder_name => "Jenny Block",
       :billing_address => {
           :first_name => "New First Name",
           :last_name => "New Last Name",
@@ -19,7 +19,7 @@ describe Braintree::SamsungPayCard do
           :region => "New State",
           :postal_code => "56789",
           :country_name => "United States of America"
-      }
+      },
     )
     result.should be_success
 
@@ -65,7 +65,7 @@ describe Braintree::SamsungPayCard do
     result = Braintree::PaymentMethod.create(
       :payment_method_nonce => Braintree::Test::Nonce::SamsungPayDiscover,
       :customer_id => customer.id,
-      :cardholder_name => 'Jenny Block',
+      :cardholder_name => "Jenny Block",
       :billing_address => {
           :first_name => "New First Name",
           :last_name => "New Last Name",
@@ -76,11 +76,11 @@ describe Braintree::SamsungPayCard do
           :region => "New State",
           :postal_code => "56789",
           :country_name => "United States of America"
-      }
+      },
     )
 
     result.should be_success
-    result.payment_method.cardholder_name.should == 'Jenny Block'
+    result.payment_method.cardholder_name.should == "Jenny Block"
 
     address = result.payment_method.billing_address
     address.first_name.should == "New First Name"
@@ -96,7 +96,7 @@ describe Braintree::SamsungPayCard do
   it "can search for transactions" do
     transaction_create_result = Braintree::Transaction.sale(
       :payment_method_nonce => Braintree::Test::Nonce::SamsungPayDiscover,
-      :amount => '47.00',
+      :amount => "47.00",
     )
     transaction_create_result.should be_success
     transaction_id = transaction_create_result.transaction.id
@@ -114,8 +114,8 @@ describe Braintree::SamsungPayCard do
     result = Braintree::Transaction.sale(
       :payment_method_nonce => Braintree::Test::Nonce::SamsungPayDiscover,
       :customer_id => customer.id,
-      :amount => '47.00',
-      :options => { :store_in_vault => true },
+      :amount => "47.00",
+      :options => {:store_in_vault => true},
     )
     result.should be_success
 
@@ -138,7 +138,7 @@ describe Braintree::SamsungPayCard do
     samsung_pay_card_details.prepaid.should_not be_nil
     samsung_pay_card_details.product_id.should_not be_nil
     samsung_pay_card_details.source_card_last_4.should_not be_nil
-    samsung_pay_card_details.source_card_last_4.should == '3333'
+    samsung_pay_card_details.source_card_last_4.should == "3333"
     samsung_pay_card_details.token.should_not be_nil
   end
 end

data/spec/integration/braintree/settlement_batch_summary_spec.rb

@@ -12,7 +12,7 @@ describe Braintree::SettlementBatchSummary do
     it "returns an error response if the date cannot be parsed" do
       result = Braintree::SettlementBatchSummary.generate("NOT A DATE :(")
       result.should_not be_success
-      result.errors.for(:settlement_batch_summary).on(:settlement_date).map {|e| e.code}.should include(Braintree::ErrorCodes::SettlementBatchSummary::SettlementDateIsInvalid)
+      result.errors.for(:settlement_batch_summary).on(:settlement_date).map { |e| e.code }.should include(Braintree::ErrorCodes::SettlementBatchSummary::SettlementDateIsInvalid)
     end
 
     it "returns transactions settled on a given day" do
@@ -23,14 +23,14 @@ describe Braintree::SettlementBatchSummary do
           :expiration_date => "05/2012",
           :cardholder_name => "Sergio Ramos"
         },
-        :options => { :submit_for_settlement => true }
+        :options => {:submit_for_settlement => true},
       )
       result = SpecHelper.settle_transaction transaction.id
-      settlement_date = result[:transaction][:settlement_batch_id].split('_').first
+      settlement_date = result[:transaction][:settlement_batch_id].split("_").first
       result = Braintree::SettlementBatchSummary.generate(settlement_date)
 
       result.should be_success
-      amex_records = result.settlement_batch_summary.records.select {|row| row[:card_type] == Braintree::CreditCard::CardType::AmEx }
+      amex_records = result.settlement_batch_summary.records.select { |row| row[:card_type] == Braintree::CreditCard::CardType::AmEx }
       amex_records.first[:count].to_i.should >= 1
       amex_records.first[:amount_settled].to_i.should >= Braintree::Test::TransactionAmounts::Authorize.to_i
     end
@@ -46,14 +46,14 @@ describe Braintree::SettlementBatchSummary do
         :custom_fields => {
           :store_me => "1"
         },
-        :options => { :submit_for_settlement => true }
+        :options => {:submit_for_settlement => true},
       )
       result = SpecHelper.settle_transaction transaction.id
-      settlement_date = result[:transaction][:settlement_batch_id].split('_').first
-      result = Braintree::SettlementBatchSummary.generate(settlement_date, 'store_me')
+      settlement_date = result[:transaction][:settlement_batch_id].split("_").first
+      result = Braintree::SettlementBatchSummary.generate(settlement_date, "store_me")
 
       result.should be_success
-      amex_records = result.settlement_batch_summary.records.select {|row| row[:store_me] == "1" }
+      amex_records = result.settlement_batch_summary.records.select { |row| row[:store_me] == "1" }
       amex_records.should_not be_empty
       amex_records.first[:count].to_i.should >= 1
       amex_records.first[:amount_settled].to_i.should >= Braintree::Test::TransactionAmounts::Authorize.to_i

data/spec/integration/braintree/subscription_spec.rb

@@ -8,7 +8,7 @@ describe Braintree::Subscription do
       :credit_card => {
         :number => Braintree::Test::CreditCardNumbers::Visa,
         :expiration_date => "05/2010"
-      }
+      },
     ).credit_cards[0]
   end
 
@@ -16,26 +16,24 @@ describe Braintree::Subscription do
     it "is successful with a minimum of params" do
       result = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       )
 
-      date_format = /^\d{4}\D\d{1,2}\D\d{1,2}$/
       result.success?.should == true
       result.subscription.id.should =~ /^\w{6}$/
       result.subscription.status.should == Braintree::Subscription::Status::Active
       result.subscription.plan_id.should == "integration_trialless_plan"
 
-      result.subscription.first_billing_date.should match(date_format)
-      result.subscription.next_billing_date.should match(date_format)
-      result.subscription.billing_period_start_date.should match(date_format)
-      result.subscription.billing_period_end_date.should match(date_format)
-      result.subscription.paid_through_date.should match(date_format)
+      expect(result.subscription.first_billing_date).to be_a Date
+      expect(result.subscription.next_billing_date).to be_a Date
+      expect(result.subscription.billing_period_start_date).to be_a Date
+      expect(result.subscription.billing_period_end_date).to be_a Date
+      expect(result.subscription.paid_through_date).to be_a Date
 
       result.subscription.created_at.between?(Time.now - 60, Time.now).should == true
       result.subscription.updated_at.between?(Time.now - 60, Time.now).should == true
 
       result.subscription.failure_count.should == 0
-      result.subscription.next_bill_amount.should == "12.34"
       result.subscription.next_billing_period_amount.should == "12.34"
       result.subscription.payment_method_token.should == @credit_card.token
 
@@ -49,7 +47,7 @@ describe Braintree::Subscription do
     it "returns a transaction with billing period populated" do
       result = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       )
 
       result.success?.should == true
@@ -65,10 +63,9 @@ describe Braintree::Subscription do
       result = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :plan_id => SpecHelper::TrialPlan[:id],
-        :id => new_id
+        :id => new_id,
       )
 
-      date_format = /^\d{4}\D\d{1,2}\D\d{1,2}$/
       result.success?.should == true
       result.subscription.id.should == new_id
     end
@@ -83,11 +80,11 @@ describe Braintree::Subscription do
           },
           :client_token_options => {
             :customer_id => @credit_card.customer_id
-          }
+          },
         )
         result = Braintree::Subscription.create(
           :payment_method_nonce => nonce,
-          :plan_id => SpecHelper::TriallessPlan[:id]
+          :plan_id => SpecHelper::TriallessPlan[:id],
         )
 
         result.success?.should == true
@@ -100,12 +97,12 @@ describe Braintree::Subscription do
         customer = Braintree::Customer.create!
         payment_method_result = Braintree::PaymentMethod.create(
           :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment,
-          :customer_id => customer.id
+          :customer_id => customer.id,
         )
 
         result = Braintree::Subscription.create(
           :payment_method_token => payment_method_result.payment_method.token,
-          :plan_id => SpecHelper::TriallessPlan[:id]
+          :plan_id => SpecHelper::TriallessPlan[:id],
         )
 
         result.should be_success
@@ -117,7 +114,7 @@ describe Braintree::Subscription do
         customer = Braintree::Customer.create!
         payment_method_result = Braintree::PaymentMethod.create(
           :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment,
-          :customer_id => customer.id
+          :customer_id => customer.id,
         )
 
         result = Braintree::Subscription.create(
@@ -142,11 +139,11 @@ describe Braintree::Subscription do
         customer = Braintree::Customer.create!
         result = Braintree::Subscription.create(
           :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment,
-          :plan_id => SpecHelper::TriallessPlan[:id]
+          :plan_id => SpecHelper::TriallessPlan[:id],
         )
 
         result.should_not be_success
-        result.errors.for(:subscription).on(:payment_method_nonce).first.code.should == '91925'
+        result.errors.for(:subscription).on(:payment_method_nonce).first.code.should == "91925"
       end
     end
 
@@ -154,7 +151,7 @@ describe Braintree::Subscription do
       it "inherits from the plan if not provided" do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::BillingDayOfMonthPlan[:id]
+          :plan_id => SpecHelper::BillingDayOfMonthPlan[:id],
         )
 
         result.success?.should == true
@@ -165,7 +162,7 @@ describe Braintree::Subscription do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::BillingDayOfMonthPlan[:id],
-          :billing_day_of_month => 25
+          :billing_day_of_month => 25,
         )
 
         result.success?.should == true
@@ -178,7 +175,7 @@ describe Braintree::Subscription do
           :plan_id => SpecHelper::BillingDayOfMonthPlan[:id],
           :options => {
             :start_immediately => true
-          }
+          },
         )
 
         result.success?.should == true
@@ -191,11 +188,11 @@ describe Braintree::Subscription do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::BillingDayOfMonthPlan[:id],
-          :first_billing_date => Date.today + 3
+          :first_billing_date => Date.today + 3,
         )
 
         result.success?.should == true
-        result.subscription.first_billing_date.should == (Date.today + 3).to_s
+        result.subscription.first_billing_date.should == Date.today + 3
         result.subscription.status.should == Braintree::Subscription::Status::Pending
       end
 
@@ -203,7 +200,7 @@ describe Braintree::Subscription do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::BillingDayOfMonthPlan[:id],
-          :first_billing_date => Date.today - 3
+          :first_billing_date => Date.today - 3,
         )
 
         result.success?.should == false
@@ -215,7 +212,7 @@ describe Braintree::Subscription do
       it "defaults to the default merchant account if no merchant_account_id is provided" do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::TrialPlan[:id]
+          :plan_id => SpecHelper::TrialPlan[:id],
         )
 
         result.success?.should == true
@@ -226,7 +223,7 @@ describe Braintree::Subscription do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :merchant_account_id => SpecHelper::NonDefaultMerchantAccountId
+          :merchant_account_id => SpecHelper::NonDefaultMerchantAccountId,
         )
 
         result.success?.should == true
@@ -239,7 +236,7 @@ describe Braintree::Subscription do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :number_of_billing_cycles => 10
+          :number_of_billing_cycles => 10,
         )
 
         result.success?.should == true
@@ -250,7 +247,7 @@ describe Braintree::Subscription do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :never_expires => true
+          :never_expires => true,
         )
 
         result.success?.should == true
@@ -263,7 +260,7 @@ describe Braintree::Subscription do
         it "with no trial" do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
-            :plan_id => SpecHelper::TriallessPlan[:id]
+            :plan_id => SpecHelper::TriallessPlan[:id],
           )
 
           result.subscription.trial_period.should == false
@@ -274,7 +271,7 @@ describe Braintree::Subscription do
         it "with a trial" do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
-            :plan_id => SpecHelper::TrialPlan[:id]
+            :plan_id => SpecHelper::TrialPlan[:id],
           )
 
           result.subscription.trial_period.should == true
@@ -287,7 +284,7 @@ describe Braintree::Subscription do
             :payment_method_token => @credit_card.token,
             :plan_id => SpecHelper::TrialPlan[:id],
             :trial_duration => 5,
-            :trial_duration_unit => Braintree::Subscription::TrialDurationUnit::Month
+            :trial_duration_unit => Braintree::Subscription::TrialDurationUnit::Month,
           )
 
           result.subscription.trial_period.should == true
@@ -299,7 +296,7 @@ describe Braintree::Subscription do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
             :plan_id => SpecHelper::TrialPlan[:id],
-            :trial_period => false
+            :trial_period => false,
           )
 
           result.subscription.trial_period.should == false
@@ -308,7 +305,7 @@ describe Braintree::Subscription do
         it "doesn't create a transaction if there's a trial period" do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
-            :plan_id => SpecHelper::TrialPlan[:id]
+            :plan_id => SpecHelper::TrialPlan[:id],
           )
 
           result.subscription.transactions.size.should == 0
@@ -319,7 +316,7 @@ describe Braintree::Subscription do
         it "creates a transaction if no trial period" do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
-            :plan_id => SpecHelper::TriallessPlan[:id]
+            :plan_id => SpecHelper::TriallessPlan[:id],
           )
 
           result.subscription.transactions.size.should == 1
@@ -333,7 +330,7 @@ describe Braintree::Subscription do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
             :plan_id => SpecHelper::TriallessPlan[:id],
-            :price => Braintree::Test::TransactionAmounts::Decline
+            :price => Braintree::Test::TransactionAmounts::Decline,
           )
 
           result.success?.should be(false)
@@ -346,7 +343,7 @@ describe Braintree::Subscription do
         it "defaults to the plan's price" do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
-            :plan_id => SpecHelper::TrialPlan[:id]
+            :plan_id => SpecHelper::TrialPlan[:id],
           )
 
           result.subscription.price.should == SpecHelper::TrialPlan[:price]
@@ -356,7 +353,7 @@ describe Braintree::Subscription do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
             :plan_id => SpecHelper::TrialPlan[:id],
-            :price => 98.76
+            :price => 98.76,
           )
 
           result.subscription.price.should == BigDecimal("98.76")
@@ -369,7 +366,7 @@ describe Braintree::Subscription do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :id => "invalid token"
+          :id => "invalid token",
         )
         result.success?.should == false
         result.errors.for(:subscription).on(:id)[0].message.should == "ID is invalid (use only letters, numbers, '-', and '_')."
@@ -380,14 +377,14 @@ describe Braintree::Subscription do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :id => duplicate_token
+          :id => duplicate_token,
         )
         result.success?.should == true
 
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :id => duplicate_token
+          :id => duplicate_token,
         )
         result.success?.should == false
         result.errors.for(:subscription).on(:id)[0].message.should == "ID has already been taken."
@@ -398,7 +395,7 @@ describe Braintree::Subscription do
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
           :trial_period => true,
-          :trial_duration => nil
+          :trial_duration => nil,
         )
         result.success?.should == false
         result.errors.for(:subscription).on(:trial_duration)[0].message.should == "Trial Duration is required."
@@ -410,7 +407,7 @@ describe Braintree::Subscription do
           :plan_id => SpecHelper::TrialPlan[:id],
           :trial_period => true,
           :trial_duration => 2,
-          :trial_duration_unit => nil
+          :trial_duration_unit => nil,
         )
         result.success?.should == false
         result.errors.for(:subscription).on(:trial_duration_unit)[0].message.should == "Trial Duration Unit is invalid."
@@ -422,7 +419,7 @@ describe Braintree::Subscription do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::AddOnDiscountPlan[:id],
-          :options => {:do_not_inherit_add_ons_or_discounts => true}
+          :options => {:do_not_inherit_add_ons_or_discounts => true},
         )
         result.success?.should == true
 
@@ -435,7 +432,7 @@ describe Braintree::Subscription do
       it "inherits the add_ons and discounts from the plan when not specified" do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::AddOnDiscountPlan[:id]
+          :plan_id => SpecHelper::AddOnDiscountPlan[:id],
         )
         result.success?.should == true
 
@@ -499,7 +496,7 @@ describe Braintree::Subscription do
                 :never_expires => true
               }
             ]
-          }
+          },
         )
         result.success?.should == true
 
@@ -545,7 +542,7 @@ describe Braintree::Subscription do
           },
           :discounts => {
             :remove => [SpecHelper::Discount7]
-          }
+          },
         )
         result.success?.should == true
 
@@ -573,7 +570,7 @@ describe Braintree::Subscription do
           },
           :discounts => {
             :add => [{:inherited_from_id => SpecHelper::Discount15}]
-          }
+          },
         )
         result.success?.should == true
         subscription = result.subscription
@@ -624,7 +621,7 @@ describe Braintree::Subscription do
                 :quantity => -10,
               }
             ]
-          }
+          },
         )
         result.success?.should == false
         result.errors.for(:subscription).for(:add_ons).for(:update).for_index(0).on(:amount)[0].code.should == Braintree::ErrorCodes::Subscription::Modification::AmountIsInvalid
@@ -638,19 +635,19 @@ describe Braintree::Subscription do
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
           :descriptor => {
-            :name => '123*123456789012345678',
-            :phone => '3334445555'
-          }
+            :name => "123*123456789012345678",
+            :phone => "3334445555"
+          },
         )
 
         result.success?.should == true
-        result.subscription.descriptor.name.should == '123*123456789012345678'
-        result.subscription.descriptor.phone.should == '3334445555'
+        result.subscription.descriptor.name.should == "123*123456789012345678"
+        result.subscription.descriptor.phone.should == "3334445555"
 
         result.subscription.transactions.size.should == 1
         transaction = result.subscription.transactions.first
-        transaction.descriptor.name.should == '123*123456789012345678'
-        transaction.descriptor.phone.should == '3334445555'
+        transaction.descriptor.name.should == "123*123456789012345678"
+        transaction.descriptor.phone.should == "3334445555"
       end
 
       it "has validation errors if format is invalid" do
@@ -658,10 +655,10 @@ describe Braintree::Subscription do
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
           :descriptor => {
-            :name => 'badcompanyname12*badproduct12',
-            :phone => '%bad4445555',
+            :name => "badcompanyname12*badproduct12",
+            :phone => "%bad4445555",
             :url => "12345678901234"
-          }
+          },
         )
         result.success?.should == false
         result.errors.for(:subscription).for(:descriptor).on(:name)[0].code.should == Braintree::ErrorCodes::Descriptor::NameFormatIsInvalid
@@ -675,23 +672,21 @@ describe Braintree::Subscription do
     it "returns the subscription if valid" do
       subscription = Braintree::Subscription.create!(
         :payment_method_token => @credit_card.token,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       )
 
-      date_format = /^\d{4}\D\d{1,2}\D\d{1,2}$/
       subscription.id.should =~ /^\w{6}$/
       subscription.status.should == Braintree::Subscription::Status::Active
       subscription.plan_id.should == "integration_trialless_plan"
 
-      subscription.first_billing_date.should match(date_format)
-      subscription.next_billing_date.should match(date_format)
-      subscription.billing_period_start_date.should match(date_format)
-      subscription.billing_period_end_date.should match(date_format)
-      subscription.paid_through_date.should match(date_format)
+      expect(subscription.first_billing_date).to be_a Date
+      expect(subscription.next_billing_date).to be_a Date
+      expect(subscription.billing_period_start_date).to be_a Date
+      expect(subscription.billing_period_end_date).to be_a Date
+      expect(subscription.paid_through_date).to be_a Date
 
       subscription.failure_count.should == 0
       subscription.current_billing_cycle.should == 1
-      subscription.next_bill_amount.should == "12.34"
       subscription.next_billing_period_amount.should == "12.34"
       subscription.payment_method_token.should == @credit_card.token
     end
@@ -700,7 +695,7 @@ describe Braintree::Subscription do
       expect do
         Braintree::Subscription.create!(
           :payment_method_token => @credit_card.token,
-          :plan_id => 'not_a_plan_id'
+          :plan_id => "not_a_plan_id",
         )
       end.to raise_error(Braintree::ValidationsFailed)
     end
@@ -710,7 +705,7 @@ describe Braintree::Subscription do
     it "finds a subscription" do
       result = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
-        :plan_id => SpecHelper::TrialPlan[:id]
+        :plan_id => SpecHelper::TrialPlan[:id],
       )
       result.success?.should == true
 
@@ -719,7 +714,7 @@ describe Braintree::Subscription do
 
     it "raises Braintree::NotFoundError if it cannot find" do
       expect {
-        Braintree::Subscription.find('noSuchSubscription')
+        Braintree::Subscription.find("noSuchSubscription")
       }.to raise_error(Braintree::NotFoundError, 'subscription with id "noSuchSubscription" not found')
     end
   end
@@ -729,13 +724,13 @@ describe Braintree::Subscription do
       @subscription = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :price => 54.32,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       ).subscription
     end
 
     it "allows changing the merchant_account_id" do
       result = Braintree::Subscription.update(@subscription.id,
-        :merchant_account_id => SpecHelper::NonDefaultMerchantAccountId
+        :merchant_account_id => SpecHelper::NonDefaultMerchantAccountId,
       )
 
       result.success?.should == true
@@ -746,11 +741,11 @@ describe Braintree::Subscription do
       new_credit_card = Braintree::CreditCard.create!(
         :customer_id => @credit_card.customer_id,
         :number => Braintree::Test::CreditCardNumbers::Visa,
-        :expiration_date => "05/2010"
+        :expiration_date => "05/2010",
       )
 
       result = Braintree::Subscription.update(@subscription.id,
-        :payment_method_token => new_credit_card.token
+        :payment_method_token => new_credit_card.token,
       )
 
       result.subscription.payment_method_token.should == new_credit_card.token
@@ -764,7 +759,7 @@ describe Braintree::Subscription do
         },
         :client_token_options => {
           :customer_id => @credit_card.customer_id,
-        }
+        },
       )
 
       result = Braintree::Subscription.update(@subscription.id, :payment_method_nonce => nonce)
@@ -775,41 +770,41 @@ describe Braintree::Subscription do
     it "allows changing the descriptors" do
       result = Braintree::Subscription.update(@subscription.id,
         :descriptor => {
-          :name => 'aaa*1234',
-          :phone => '3334443333',
+          :name => "aaa*1234",
+          :phone => "3334443333",
           :url => "ebay.com"
-        }
+        },
       )
 
       result.success?.should == true
-      result.subscription.descriptor.name.should == 'aaa*1234'
-      result.subscription.descriptor.phone.should == '3334443333'
-      result.subscription.descriptor.url.should == 'ebay.com'
+      result.subscription.descriptor.name.should == "aaa*1234"
+      result.subscription.descriptor.phone.should == "3334443333"
+      result.subscription.descriptor.url.should == "ebay.com"
     end
 
     it "allows changing the paypal description" do
       customer = Braintree::Customer.create!
       payment_method = Braintree::PaymentMethod.create(
         :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment,
-        :customer_id => customer.id
+        :customer_id => customer.id,
       ).payment_method
 
       subscription = Braintree::Subscription.create(
         :payment_method_token => payment_method.token,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       ).subscription
 
       result = Braintree::Subscription.update(
         subscription.id,
         :options => {
           :paypal => {
-            :description => 'A great product',
+            :description => "A great product",
           },
         },
       )
 
       result.success?.should == true
-      result.subscription.description.should == 'A great product'
+      result.subscription.description.should == "A great product"
     end
 
     context "when successful" do
@@ -818,7 +813,7 @@ describe Braintree::Subscription do
         result = Braintree::Subscription.update(@subscription.id,
           :id => new_id,
           :price => 9999.88,
-          :plan_id => SpecHelper::TrialPlan[:id]
+          :plan_id => SpecHelper::TrialPlan[:id],
         )
 
         result.success?.should == true
@@ -830,7 +825,7 @@ describe Braintree::Subscription do
       context "proration" do
         it "prorates if there is a charge (because merchant has proration option enabled in control panel)" do
           result = Braintree::Subscription.update(@subscription.id,
-            :price => @subscription.price.to_f + 1
+            :price => @subscription.price.to_f + 1,
           )
 
           result.success?.should == true
@@ -841,7 +836,7 @@ describe Braintree::Subscription do
         it "allows the user to force proration if there is a charge" do
           result = Braintree::Subscription.update(@subscription.id,
             :price => @subscription.price.to_f + 1,
-            :options => { :prorate_charges => true }
+            :options => {:prorate_charges => true},
           )
 
           result.success?.should == true
@@ -852,7 +847,7 @@ describe Braintree::Subscription do
         it "allows the user to prevent proration if there is a charge" do
           result = Braintree::Subscription.update(@subscription.id,
             :price => @subscription.price.to_f + 1,
-            :options => { :prorate_charges => false }
+            :options => {:prorate_charges => false},
           )
 
           result.success?.should == true
@@ -862,7 +857,7 @@ describe Braintree::Subscription do
 
         it "doesn't prorate if price decreases" do
           result = Braintree::Subscription.update(@subscription.id,
-            :price => @subscription.price.to_f - 1
+            :price => @subscription.price.to_f - 1,
           )
 
           result.success?.should == true
@@ -875,7 +870,7 @@ describe Braintree::Subscription do
             :price => @subscription.price.to_f + 2100,
             :options => {
               :revert_subscription_on_proration_failure => false
-            }
+            },
           )
 
           result.success?.should == true
@@ -892,7 +887,7 @@ describe Braintree::Subscription do
             :price => @subscription.price.to_f + 2100,
             :options => {
               :revert_subscription_on_proration_failure => true
-            }
+            },
           )
 
           result.success?.should == false
@@ -910,14 +905,14 @@ describe Braintree::Subscription do
       before(:each) do
         @subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::TrialPlan[:id]
+          :plan_id => SpecHelper::TrialPlan[:id],
         ).subscription
       end
 
       it "raises NotFoundError if the subscription can't be found" do
         expect {
           Braintree::Subscription.update(rand(36**9).to_s(36),
-            :price => 58.20
+            :price => 58.20,
           )
         }.to raise_error(Braintree::NotFoundError)
       end
@@ -945,11 +940,11 @@ describe Braintree::Subscription do
         duplicate = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :id => duplicate_id
+          :id => duplicate_id,
         )
         result = Braintree::Subscription.update(
           @subscription.id,
-          :id => duplicate_id
+          :id => duplicate_id,
         )
         result.success?.should == false
         result.errors.for(:subscription).on(:id)[0].code.should == Braintree::ErrorCodes::Subscription::IdIsInUse
@@ -959,14 +954,14 @@ describe Braintree::Subscription do
         subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :price => 54.32,
-          :plan_id => SpecHelper::TriallessPlan[:id]
+          :plan_id => SpecHelper::TriallessPlan[:id],
         ).subscription
 
         result = Braintree::Subscription.cancel(subscription.id)
         result.success?.should == true
 
         result = Braintree::Subscription.update(subscription.id,
-          :price => 123.45
+          :price => 123.45,
         )
         result.success?.should == false
         result.errors.for(:subscription)[0].code.should == Braintree::ErrorCodes::Subscription::CannotEditCanceledSubscription
@@ -978,12 +973,12 @@ describe Braintree::Subscription do
         subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :number_of_billing_cycles => 10
+          :number_of_billing_cycles => 10,
         ).subscription
 
         result = Braintree::Subscription.update(
           subscription.id,
-          :number_of_billing_cycles => 5
+          :number_of_billing_cycles => 5,
         )
 
         result.subscription.number_of_billing_cycles.should == 5
@@ -993,12 +988,12 @@ describe Braintree::Subscription do
         subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :number_of_billing_cycles => 10
+          :number_of_billing_cycles => 10,
         ).subscription
 
         result = Braintree::Subscription.update(
           subscription.id,
-          :never_expires => true
+          :never_expires => true,
         )
 
         result.success?.should == true
@@ -1011,7 +1006,7 @@ describe Braintree::Subscription do
       it "can update add_ons and discounts" do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::AddOnDiscountPlan[:id]
+          :plan_id => SpecHelper::AddOnDiscountPlan[:id],
         )
         result.success?.should == true
         subscription = result.subscription
@@ -1035,7 +1030,7 @@ describe Braintree::Subscription do
                 :quantity => 9
               }
             ]
-          }
+          },
         )
 
         subscription = result.subscription
@@ -1056,7 +1051,7 @@ describe Braintree::Subscription do
       it "allows adding new add_ons and discounts" do
         subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::AddOnDiscountPlan[:id]
+          :plan_id => SpecHelper::AddOnDiscountPlan[:id],
         ).subscription
 
         result = Braintree::Subscription.update(subscription.id,
@@ -1065,7 +1060,7 @@ describe Braintree::Subscription do
           },
           :discounts => {
             :add => [{:inherited_from_id => SpecHelper::Discount15}]
-          }
+          },
         )
 
         result.success?.should == true
@@ -1105,7 +1100,7 @@ describe Braintree::Subscription do
       it "allows replacing entire set of add_ons and discounts" do
         subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::AddOnDiscountPlan[:id]
+          :plan_id => SpecHelper::AddOnDiscountPlan[:id],
         ).subscription
 
         result = Braintree::Subscription.update(subscription.id,
@@ -1115,7 +1110,7 @@ describe Braintree::Subscription do
           :discounts => {
             :add => [{:inherited_from_id => SpecHelper::Discount15}]
           },
-          :options => {:replace_all_add_ons_and_discounts => true}
+          :options => {:replace_all_add_ons_and_discounts => true},
         )
 
         result.success?.should == true
@@ -1135,7 +1130,7 @@ describe Braintree::Subscription do
       it "allows deleting of add_ons and discounts" do
         subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::AddOnDiscountPlan[:id]
+          :plan_id => SpecHelper::AddOnDiscountPlan[:id],
         ).subscription
 
         result = Braintree::Subscription.update(subscription.id,
@@ -1144,7 +1139,7 @@ describe Braintree::Subscription do
           },
           :discounts => {
             :remove => [SpecHelper::Discount7]
-          }
+          },
         )
         result.success?.should == true
 
@@ -1166,7 +1161,7 @@ describe Braintree::Subscription do
       @subscription = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :price => 54.32,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       ).subscription
     end
 
@@ -1175,7 +1170,7 @@ describe Braintree::Subscription do
       subscription = Braintree::Subscription.update!(@subscription.id,
         :id => new_id,
         :price => 9999.88,
-        :plan_id => SpecHelper::TrialPlan[:id]
+        :plan_id => SpecHelper::TrialPlan[:id],
       )
 
       subscription.id.should =~ /#{new_id}/
@@ -1186,7 +1181,7 @@ describe Braintree::Subscription do
     it "raises a ValidationsFailed if invalid" do
       expect do
         Braintree::Subscription.update!(@subscription.id,
-          :plan_id => 'not_a_plan_id'
+          :plan_id => "not_a_plan_id",
         )
       end.to raise_error(Braintree::ValidationsFailed)
     end
@@ -1198,7 +1193,7 @@ describe Braintree::Subscription do
       subscription = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :price => 54.32,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       ).subscription
 
       result = Braintree::Subscription.cancel(subscription.id)
@@ -1208,7 +1203,7 @@ describe Braintree::Subscription do
 
     it "returns a validation error if record not found" do
       expect {
-        r = Braintree::Subscription.cancel('noSuchSubscription')
+        r = Braintree::Subscription.cancel("noSuchSubscription")
       }.to raise_error(Braintree::NotFoundError, 'subscription with id "noSuchSubscription" not found')
     end
 
@@ -1216,7 +1211,7 @@ describe Braintree::Subscription do
       subscription = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :price => 54.32,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       ).subscription
 
       result = Braintree::Subscription.cancel(subscription.id)
@@ -1234,7 +1229,7 @@ describe Braintree::Subscription do
       subscription = Braintree::Subscription.create!(
         :payment_method_token => @credit_card.token,
         :price => 54.32,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       )
 
       updated_subscription = Braintree::Subscription.cancel!(subscription.id)
@@ -1249,13 +1244,13 @@ describe Braintree::Subscription do
         subscription_with_trial = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :id => "subscription1_#{id}"
+          :id => "subscription1_#{id}",
         ).subscription
 
         subscription_without_trial = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :id => "subscription2_#{id}"
+          :id => "subscription2_#{id}",
         ).subscription
 
         subscriptions_in_trial_period = Braintree::Subscription.search do |search|
@@ -1281,7 +1276,7 @@ describe Braintree::Subscription do
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
           :id => "subscription1_#{id}",
-          :price => "11.38"
+          :price => "11.38",
         ).subscription
 
         collection = Braintree::Subscription.search do |search|
@@ -1315,13 +1310,13 @@ describe Braintree::Subscription do
         subscription1 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :id => "subscription1_#{id}"
+          :id => "subscription1_#{id}",
         ).subscription
 
         subscription2 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :id => "subscription2_#{id}"
+          :id => "subscription2_#{id}",
         ).subscription
 
         collection = Braintree::Subscription.search do |search|
@@ -1339,14 +1334,14 @@ describe Braintree::Subscription do
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
           :merchant_account_id => SpecHelper::DefaultMerchantAccountId,
-          :price => "1"
+          :price => "1",
         ).subscription
 
         subscription2 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
           :merchant_account_id => SpecHelper::NonDefaultMerchantAccountId,
-          :price => "1"
+          :price => "1",
         ).subscription
 
         collection = Braintree::Subscription.search do |search|
@@ -1372,13 +1367,13 @@ describe Braintree::Subscription do
         trialless_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :price => "2"
+          :price => "2",
         ).subscription
 
         trial_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :price => "2"
+          :price => "2",
         ).subscription
 
         collection = Braintree::Subscription.search do |search|
@@ -1396,13 +1391,13 @@ describe Braintree::Subscription do
         subscription_500 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[: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|
@@ -1419,13 +1414,13 @@ describe Braintree::Subscription do
         active_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :price => "6"
+          :price => "6",
         ).subscription
 
         past_due_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :price => "6"
+          :price => "6",
         ).subscription
 
         SpecHelper.make_past_due(past_due_subscription, 5)
@@ -1446,7 +1441,7 @@ describe Braintree::Subscription do
       it "passes a smoke test" do
         subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::TrialPlan[:id]
+          :plan_id => SpecHelper::TrialPlan[:id],
         ).subscription
 
         collection = Braintree::Subscription.search do |search|
@@ -1466,19 +1461,19 @@ describe Braintree::Subscription do
         subscription_5 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TrialPlan[:id],
-          :number_of_billing_cycles => 5
+          :number_of_billing_cycles => 5,
         ).subscription
 
         subscription_9 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :number_of_billing_cycles => 10
+          :number_of_billing_cycles => 10,
         ).subscription
 
         subscription_15 = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :plan_id => SpecHelper::TriallessPlan[:id],
-          :number_of_billing_cycles => 15
+          :number_of_billing_cycles => 15,
         ).subscription
 
         collection = Braintree::Subscription.search do |search|
@@ -1495,12 +1490,12 @@ describe Braintree::Subscription do
       it "returns matching results" do
         matching_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::TriallessPlan[:id]
+          :plan_id => SpecHelper::TriallessPlan[:id],
         ).subscription
 
         non_matching_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::TriallessPlan[:id]
+          :plan_id => SpecHelper::TriallessPlan[:id],
         ).subscription
 
         collection = Braintree::Subscription.search do |search|
@@ -1516,12 +1511,12 @@ describe Braintree::Subscription do
       it "returns matching results" do
         matching_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::TriallessPlan[:id]
+          :plan_id => SpecHelper::TriallessPlan[:id],
         ).subscription
 
         non_matching_subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::TrialPlan[:id]
+          :plan_id => SpecHelper::TrialPlan[:id],
         ).subscription
 
         five_days_from_now = Time.now + (5 * 24 * 60 * 60)
@@ -1538,7 +1533,7 @@ describe Braintree::Subscription do
       before(:each) do
         @subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => SpecHelper::TriallessPlan[:id]
+          :plan_id => SpecHelper::TriallessPlan[:id],
         ).subscription
         @created_at = @subscription.created_at
       end
@@ -1550,7 +1545,7 @@ describe Braintree::Subscription do
           search.id.is @subscription.id
           search.created_at.between(
             @created_at - 60,
-            @created_at + 60
+            @created_at + 60,
           )
         end
 
@@ -1583,7 +1578,7 @@ describe Braintree::Subscription do
           search.id.is @subscription.id
           search.created_at.between(
             @created_at + 300,
-            @created_at + 400
+            @created_at + 400,
           )
         end
 
@@ -1607,7 +1602,7 @@ describe Braintree::Subscription do
           search.id.is @subscription.id
           search.created_at.between(
             now - 60,
-            now + 60
+            now + 60,
           )
         end
 
@@ -1646,7 +1641,7 @@ describe Braintree::Subscription do
           search.id.is @subscription.id
           search.created_at.between(
             now + 300,
-            now + 400
+            now + 400,
           )
         end
 
@@ -1658,7 +1653,7 @@ describe Braintree::Subscription do
           search.id.is @subscription.id
           search.created_at.between(
             Date.today - 1,
-            Date.today + 1
+            Date.today + 1,
           )
         end
 
@@ -1675,7 +1670,7 @@ describe Braintree::Subscription do
       collection = Braintree::Subscription.search
       collection.maximum_size.should > 100
 
-      subscriptions_ids = collection.map {|t| t.id }.uniq.compact
+      subscriptions_ids = collection.map { |t| t.id }.uniq.compact
       subscriptions_ids.size.should == collection.maximum_size
     end
   end
@@ -1684,7 +1679,7 @@ describe Braintree::Subscription do
     it "is successful with only subscription id" do
       subscription = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       ).subscription
       SpecHelper.make_past_due(subscription)
 
@@ -1702,7 +1697,7 @@ describe Braintree::Subscription do
     it "is successful with subscription id and amount" do
       subscription = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       ).subscription
       SpecHelper.make_past_due(subscription)
 
@@ -1720,7 +1715,7 @@ describe Braintree::Subscription do
     it "is successful with subscription id and submit_for_settlement" do
       subscription = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       ).subscription
       SpecHelper.make_past_due(subscription)
 
@@ -1738,7 +1733,7 @@ describe Braintree::Subscription do
     it "is successful with subscription id, amount and submit_for_settlement" do
       subscription = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
-        :plan_id => SpecHelper::TriallessPlan[:id]
+        :plan_id => SpecHelper::TriallessPlan[:id],
       ).subscription
       SpecHelper.make_past_due(subscription)