braintree 2.4.0 → 2.5.1

data/spec/integration/braintree/transparent_redirect_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/../spec_helper"
 describe Braintree::TransparentRedirect do
   it "raises a DownForMaintenanceError when app is in maintenance mode on TR requests" do
     tr_data = Braintree::TransparentRedirect.create_customer_data({:redirect_url => "http://example.com"}.merge({}))
-    query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, {}, Braintree::Configuration.base_merchant_url + "/test/maintenance")
+    query_string_response = SpecHelper.simulate_form_post_for_tr(tr_data, {}, Braintree::Configuration.instantiate.base_merchant_url + "/test/maintenance")
     expect do
       Braintree::Customer.create_from_transparent_redirect(query_string_response)
     end.to raise_error(Braintree::DownForMaintenanceError)

data/spec/spec_helper.rb

@@ -14,8 +14,9 @@ unless defined?(SPEC_HELPER_LOADED)
   Braintree::Configuration.merchant_id = "integration_merchant_id"
   Braintree::Configuration.public_key = "integration_public_key"
   Braintree::Configuration.private_key = "integration_private_key"
-  Braintree::Configuration.logger = Logger.new("/dev/null")
-  Braintree::Configuration.logger.level = Logger::INFO
+  logger = Logger.new("/dev/null")
+  logger.level = Logger::INFO
+  Braintree::Configuration.logger = logger
 
   module Kernel
     alias_method :original_warn, :warn
@@ -30,6 +31,56 @@ unless defined?(SPEC_HELPER_LOADED)
     DefaultMerchantAccountId = "sandbox_credit_card"
     NonDefaultMerchantAccountId = "sandbox_credit_card_non_default"
 
+    TrialPlan = {
+      :description => "Plan for integration tests -- with trial",
+      :id => "integration_trial_plan",
+      :price => BigDecimal.new("43.21"),
+      :trial_period => true,
+      :trial_duration => 2,
+      :trial_duration_unit => Braintree::Subscription::TrialDurationUnit::Day
+    }
+
+    TriallessPlan = {
+      :description => "Plan for integration tests -- without a trial",
+      :id => "integration_trialless_plan",
+      :price => BigDecimal.new("12.34"),
+      :trial_period => false
+    }
+
+    AddOnDiscountPlan = {
+      :description => "Plan for integration tests -- with add-ons and discounts",
+      :id => "integration_plan_with_add_ons_and_discounts",
+      :price => BigDecimal.new("9.99"),
+      :trial_period => true,
+      :trial_duration => 2,
+      :trial_duration_unit => Braintree::Subscription::TrialDurationUnit::Day
+    }
+
+    BillingDayOfMonthPlan = {
+      :description => "Plan for integration tests -- with billing day of month",
+      :id => "integration_plan_with_billing_day_of_month",
+      :price => BigDecimal.new("8.88"),
+      :billing_day_of_month => 5
+    }
+
+    AddOnIncrease10 = "increase_10"
+    AddOnIncrease20 = "increase_20"
+    AddOnIncrease30 = "increase_30"
+
+    Discount7 = "discount_7"
+    Discount11 = "discount_11"
+    Discount15 = "discount_15"
+
+    def self.make_past_due(subscription, number_of_days_past_due = 1)
+      Braintree::Configuration.instantiate.http.put(
+        "/subscriptions/#{subscription.id}/make_past_due?days_past_due=#{number_of_days_past_due}"
+      )
+    end
+
+    def self.settle_transaction(transaction_id)
+      Braintree::Configuration.instantiate.http.put("/transactions/#{transaction_id}/settle")
+    end
+
     def self.stub_time_dot_now(desired_time)
       Time.class_eval do
         class << self
@@ -48,9 +99,9 @@ unless defined?(SPEC_HELPER_LOADED)
       end
     end
 
-    def self.simulate_form_post_for_tr(tr_data_string, form_data_hash, url=Braintree::TransparentRedirect.url)
+    def self.simulate_form_post_for_tr(tr_data_string, form_data_hash, url = Braintree::TransparentRedirect.url)
       response = nil
-      Net::HTTP.start("localhost", Braintree::Configuration.port) do |http|
+      Net::HTTP.start("localhost", Braintree::Configuration.instantiate.port) do |http|
         request = Net::HTTP::Post.new("/" + url.split("/", 4)[3])
         request.add_field "Content-Type", "application/x-www-form-urlencoded"
         request.body = Braintree::Util.hash_to_query_string({:tr_data => tr_data_string}.merge(form_data_hash))

data/spec/unit/braintree/address_spec.rb

@@ -3,31 +3,31 @@ require File.dirname(__FILE__) + "/../spec_helper"
 describe Braintree::Address do
   describe "==" do
     it "returns true if given an address with the same id and customer_id" do
-      first = Braintree::Address._new(:customer_id => "c1", :id => 'a1')
-      second = Braintree::Address._new(:customer_id => "c1", :id => "a1")
+      first = Braintree::Address._new(:gateway, :customer_id => "c1", :id => 'a1')
+      second = Braintree::Address._new(:gateway, :customer_id => "c1", :id => "a1")
 
       first.should == second
       second.should == first
     end
 
     it "returns false if given an address with a different id and the same customer_id" do
-      first = Braintree::Address._new(:customer_id => "c1", :id => "a1")
-      second = Braintree::Address._new(:customer_id => "c1", :id => "not a1")
+      first = Braintree::Address._new(:gateway, :customer_id => "c1", :id => "a1")
+      second = Braintree::Address._new(:gateway, :customer_id => "c1", :id => "not a1")
 
       first.should_not == second
       second.should_not == first
     end
 
     it "returns false if given an address with a different customer_id and the same id" do
-      first = Braintree::Address._new(:customer_id => "c1", :id => "a1")
-      second = Braintree::Address._new(:customer_id => "not c1", :id => "a1")
+      first = Braintree::Address._new(:gateway, :customer_id => "c1", :id => "a1")
+      second = Braintree::Address._new(:gateway, :customer_id => "not c1", :id => "a1")
 
       first.should_not == second
       second.should_not == first
     end
 
     it "returns false when not given an address" do
-      address = Braintree::Address._new(:id => "a1")
+      address = Braintree::Address._new(:gateway, :id => "a1")
       address.should_not == "not an address"
     end
   end
@@ -79,7 +79,7 @@ describe Braintree::Address do
   describe "update" do
     it "raises an exception if hash includes an invalid key" do
       expect do
-        Braintree::Address._new({}).update(:street_address => "456 E Main", :invalid_key2 => "foo")
+        Braintree::Address._new(Braintree::Configuration.gateway, {}).update(:street_address => "456 E Main", :invalid_key2 => "foo")
       end.to raise_error(ArgumentError, "invalid keys: invalid_key2")
     end
   end

data/spec/unit/braintree/base_module_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/../spec_helper"
 describe Braintree::BaseModule do
   describe "return_object_or_raise" do
     it "inspects the error_result when inspecting the exception" do
-      result = Braintree::ErrorResult.new(:errors => {})
+      result = Braintree::ErrorResult.new(:gateway, :errors => {})
       begin
         klass = Class.new { include Braintree::BaseModule }
         klass.return_object_or_raise(:obj) { result }

data/spec/unit/braintree/configuration_spec.rb

@@ -16,48 +16,48 @@ describe Braintree::Configuration do
     Braintree::Configuration.environment = @original_environment
   end
 
-  describe "self.base_merchant_path" do
+  describe "base_merchant_path" do
     it "returns /merchants/{merchant_id}" do
-      Braintree::Configuration.base_merchant_path.should == "/merchants/integration_merchant_id"
+      Braintree::Configuration.instantiate.base_merchant_path.should == "/merchants/integration_merchant_id"
     end
   end
 
-  describe "self.base_merchant_url" do
+  describe "base_merchant_url" do
     it "returns the expected url for the development env" do
       Braintree::Configuration.environment = :development
-      port = Braintree::Configuration.port
-      Braintree::Configuration.base_merchant_url.should == "http://localhost:#{port}/merchants/integration_merchant_id"
+      port = Braintree::Configuration.instantiate.port
+      Braintree::Configuration.instantiate.base_merchant_url.should == "http://localhost:#{port}/merchants/integration_merchant_id"
     end
 
     it "returns the expected url for the sandbox env" do
       Braintree::Configuration.environment = :sandbox
-      Braintree::Configuration.base_merchant_url.should == "https://sandbox.braintreegateway.com:443/merchants/integration_merchant_id"
+      Braintree::Configuration.instantiate.base_merchant_url.should == "https://sandbox.braintreegateway.com:443/merchants/integration_merchant_id"
     end
 
     it "returns the expected url for the production env" do
       Braintree::Configuration.environment = :production
-      Braintree::Configuration.base_merchant_url.should == "https://www.braintreegateway.com:443/merchants/integration_merchant_id"
+      Braintree::Configuration.instantiate.base_merchant_url.should == "https://www.braintreegateway.com:443/merchants/integration_merchant_id"
     end
   end
 
-  describe "self.ca_file" do
+  describe "ca_file" do
     it "qa" do
       Braintree::Configuration.environment = :qa
-      ca_file = Braintree::Configuration.ca_file
+      ca_file = Braintree::Configuration.instantiate.ca_file
       ca_file.should match(/sandbox_braintreegateway_com.ca.crt$/)
       File.exists?(ca_file).should == true
     end
 
     it "sandbox" do
       Braintree::Configuration.environment = :sandbox
-      ca_file = Braintree::Configuration.ca_file
+      ca_file = Braintree::Configuration.instantiate.ca_file
       ca_file.should match(/sandbox_braintreegateway_com.ca.crt$/)
       File.exists?(ca_file).should == true
     end
 
     it "production" do
       Braintree::Configuration.environment = :production
-      ca_file = Braintree::Configuration.ca_file
+      ca_file = Braintree::Configuration.instantiate.ca_file
       ca_file.should match(/www_braintreegateway_com.ca.crt$/)
       File.exists?(ca_file).should == true
     end
@@ -85,11 +85,16 @@ describe Braintree::Configuration do
       begin
         old_logger = Braintree::Configuration.logger
         Braintree::Configuration.logger = nil
-        Braintree::Configuration.logger.level.should == Logger::INFO
+        Braintree::Configuration.instantiate.logger.level.should == Logger::INFO
       ensure
         Braintree::Configuration.logger = old_logger
       end
     end
+
+    it "lazily initializes so that you can do Braintree::Configuration.logger.level = when configuring the client lib" do
+      Braintree::Configuration.logger = nil
+      Braintree::Configuration.logger.should_not == nil
+    end
   end
 
   describe "self.merchant_id" do
@@ -122,12 +127,12 @@ describe Braintree::Configuration do
   describe "self.port" do
     it "is 443 for production" do
       Braintree::Configuration.environment = :production
-      Braintree::Configuration.port.should == 443
+      Braintree::Configuration.instantiate.port.should == 443
     end
 
     it "is 443 for sandbox" do
       Braintree::Configuration.environment = :sandbox
-      Braintree::Configuration.port.should == 443
+      Braintree::Configuration.instantiate.port.should == 443
     end
 
     it "is 3000 or GATEWAY_PORT environment variable for development" do
@@ -135,10 +140,10 @@ describe Braintree::Configuration do
       old_gateway_port = ENV['GATEWAY_PORT']
       begin
         ENV['GATEWAY_PORT'] = nil
-        Braintree::Configuration.port.should == 3000
+        Braintree::Configuration.instantiate.port.should == 3000
 
         ENV['GATEWAY_PORT'] = '1234'
-        Braintree::Configuration.port.should == '1234'
+        Braintree::Configuration.instantiate.port.should == '1234'
       ensure
         ENV['GATEWAY_PORT'] = old_gateway_port
       end
@@ -148,17 +153,17 @@ describe Braintree::Configuration do
   describe "self.protocol" do
     it "is http for development" do
       Braintree::Configuration.environment = :development
-      Braintree::Configuration.protocol.should == "http"
+      Braintree::Configuration.instantiate.protocol.should == "http"
     end
 
     it "is https for production" do
       Braintree::Configuration.environment = :production
-      Braintree::Configuration.protocol.should == "https"
+      Braintree::Configuration.instantiate.protocol.should == "https"
     end
 
     it "is https for sandbox" do
       Braintree::Configuration.environment = :sandbox
-      Braintree::Configuration.protocol.should == "https"
+      Braintree::Configuration.instantiate.protocol.should == "https"
     end
 
   end
@@ -166,50 +171,50 @@ describe Braintree::Configuration do
   describe "self.server" do
     it "is localhost for development" do
       Braintree::Configuration.environment = :development
-      Braintree::Configuration.server.should == "localhost"
+      Braintree::Configuration.instantiate.server.should == "localhost"
     end
 
     it "is www.braintreegateway.com for production" do
       Braintree::Configuration.environment = :production
-      Braintree::Configuration.server.should == "www.braintreegateway.com"
+      Braintree::Configuration.instantiate.server.should == "www.braintreegateway.com"
     end
 
     it "is sandbox.braintreegateway.com for sandbox" do
       Braintree::Configuration.environment = :sandbox
-      Braintree::Configuration.server.should == "sandbox.braintreegateway.com"
+      Braintree::Configuration.instantiate.server.should == "sandbox.braintreegateway.com"
     end
   end
 
-  describe "self.ssl?" do
+  describe "ssl?" do
     it "returns false for development" do
       Braintree::Configuration.environment = :development
-      Braintree::Configuration.ssl?.should == false
+      Braintree::Configuration.instantiate.ssl?.should == false
     end
 
     it "returns true for production" do
       Braintree::Configuration.environment = :production
-      Braintree::Configuration.ssl?.should == true
+      Braintree::Configuration.instantiate.ssl?.should == true
     end
 
     it "returns true for sandbox" do
       Braintree::Configuration.environment = :sandbox
-      Braintree::Configuration.ssl?.should == true
+      Braintree::Configuration.instantiate.ssl?.should == true
     end
   end
 
-  describe "self.user_agent" do
+  describe "user_agent" do
     after :each do
       Braintree::Configuration.custom_user_agent = nil
     end
 
     it "appends the default user_agent with the given value" do
       Braintree::Configuration.custom_user_agent = "ActiveMerchant 1.2.3"
-      Braintree::Configuration.user_agent.should == "Braintree Ruby Gem #{Braintree::Version::String} (ActiveMerchant 1.2.3)"
+      Braintree::Configuration.instantiate.user_agent.should == "Braintree Ruby Gem #{Braintree::Version::String} (ActiveMerchant 1.2.3)"
     end
 
     it "does not append anything if there is no custom_user_agent" do
       Braintree::Configuration.custom_user_agent = nil
-      Braintree::Configuration.user_agent.should == "Braintree Ruby Gem #{Braintree::Version::String}"
+      Braintree::Configuration.instantiate.user_agent.should == "Braintree Ruby Gem #{Braintree::Version::String}"
     end
   end
 end

data/spec/unit/braintree/credit_card_spec.rb

@@ -11,7 +11,7 @@ describe Braintree::CreditCard do
 
   describe "self.create_signature" do
     it "should be what we expect" do
-      Braintree::CreditCard._create_signature.should == [
+      Braintree::CreditCardGateway._create_signature.should == [
         :cardholder_name,
         :cvv,
         :expiration_date,
@@ -41,7 +41,7 @@ describe Braintree::CreditCard do
 
   describe "self.update_signature" do
     it "should be what we expect" do
-      Braintree::CreditCard._update_signature.should == [
+      Braintree::CreditCardGateway._update_signature.should == [
         :cardholder_name,
         :cvv,
         :expiration_date,
@@ -79,52 +79,53 @@ describe Braintree::CreditCard do
 
   describe "self.create_credit_card_url" do
     it "returns the url" do
-      port = Braintree::Configuration.port
+      port = Braintree::Configuration.instantiate.port
       Braintree::CreditCard.create_credit_card_url.should == "http://localhost:#{port}/merchants/integration_merchant_id/payment_methods/all/create_via_transparent_redirect_request"
     end
   end
 
   describe "==" do
     it "returns true if given a credit card with the same token" do
-      first = Braintree::CreditCard._new(:token => 123)
-      second = Braintree::CreditCard._new(:token => 123)
+      first = Braintree::CreditCard._new(:gateway, :token => 123)
+      second = Braintree::CreditCard._new(:gateway, :token => 123)
 
       first.should == second
       second.should == first
     end
 
     it "returns false if given a credit card with a different token" do
-      first = Braintree::CreditCard._new(:token => 123)
-      second = Braintree::CreditCard._new(:token => 124)
+      first = Braintree::CreditCard._new(:gateway, :token => 123)
+      second = Braintree::CreditCard._new(:gateway, :token => 124)
 
       first.should_not == second
       second.should_not == first
     end
 
     it "returns false if not given a credit card" do
-      credit_card = Braintree::CreditCard._new(:token => 123)
+      credit_card = Braintree::CreditCard._new(:gateway, :token => 123)
       credit_card.should_not == "not a credit card"
     end
   end
 
   describe "default?" do
     it "is true if the credit card is the default credit card for the customer" do
-      Braintree::CreditCard._new(:default => true).default?.should == true
+      Braintree::CreditCard._new(:gateway, :default => true).default?.should == true
     end
 
     it "is false if the credit card is not the default credit card for the customer" do
-      Braintree::CreditCard._new(:default => false).default?.should == false
+      Braintree::CreditCard._new(:gateway, :default => false).default?.should == false
     end
   end
 
   describe "inspect" do
     it "includes the token first" do
-      output = Braintree::CreditCard._new(:token => "cc123").inspect
+      output = Braintree::CreditCard._new(:gateway, :token => "cc123").inspect
       output.should include("#<Braintree::CreditCard token: \"cc123\",")
     end
 
     it "includes all customer attributes" do
       credit_card = Braintree::CreditCard._new(
+        :gateway,
         :bin => "411111",
         :card_type => "Visa",
         :cardholder_name => "John Miller",
@@ -154,6 +155,7 @@ describe Braintree::CreditCard do
   describe "masked_number" do
     it "uses the bin and last_4 to build the masked number" do
       credit_card = Braintree::CreditCard._new(
+        :gateway,
         :bin => "510510",
         :last_4 => "5100"
       )
@@ -164,7 +166,7 @@ describe Braintree::CreditCard do
   describe "self.update" do
     it "raises an exception if attributes contain an invalid key" do
       expect do
-        Braintree::CreditCard._new({}).update(:invalid_key => 'val')
+        Braintree::CreditCard._new(Braintree::Configuration.gateway, {}).update(:invalid_key => 'val')
       end.to raise_error(ArgumentError, "invalid keys: invalid_key")
     end
   end

data/spec/unit/braintree/credit_card_verification_spec.rb

@@ -13,8 +13,24 @@ describe Braintree::CreditCardVerification do
         :processor_response_text => "Do Not Honor",
         :merchant_account_id => "some_id"
       )
+
       verification.inspect.should == %(#<Braintree::CreditCardVerification status: "verified", processor_response_code: "2000", processor_response_text: "Do Not Honor", cvv_response_code: "I", avs_error_response_code: "I", avs_postal_code_response_code: "I", avs_street_address_response_code: "I", merchant_account_id: "some_id", gateway_rejection_reason: nil>)
     end
+
+    it "has a status" do
+      verification = Braintree::CreditCardVerification._new(
+        :status => "verified",
+        :avs_error_response_code => "I",
+        :avs_postal_code_response_code => "I",
+        :avs_street_address_response_code => "I",
+        :cvv_response_code => "I",
+        :processor_response_code => "2000",
+        :processor_response_text => "Do Not Honor",
+        :merchant_account_id => "some_id"
+      )
+
+      verification.status.should == Braintree::CreditCardVerification::Status::VERIFIED
+    end
   end
 end