braintree 2.102.0 → 3.1.0

data/spec/integration/spec_helper.rb

@@ -5,7 +5,6 @@ unless defined?(INTEGRATION_SPEC_HELPER_LOADED)
   SSL_TEST_PORT = ENV['SSL_TEST_PORT'] || 8444
 
   require File.dirname(__FILE__) + "/../spec_helper"
-  require File.dirname(__FILE__) + "/../hacks/tcp_socket"
 
   def start_ssl_server
     web_server_pid_file = File.expand_path(File.join(File.dirname(__FILE__), "..", "httpsd.pid"))
@@ -13,9 +12,7 @@ unless defined?(INTEGRATION_SPEC_HELPER_LOADED)
     FileUtils.rm(web_server_pid_file) if File.exist?(web_server_pid_file)
     command = File.expand_path(File.join(File.dirname(__FILE__), "..", "script", "httpsd.rb"))
     `#{command} #{web_server_pid_file}`
-    TCPSocket.wait_for_service :host => "127.0.0.1", :port => SSL_TEST_PORT
-
-    yield
+    TCPSocket.new("127.0.0.1",SSL_TEST_PORT)
 
     10.times { unless File.exists?(web_server_pid_file); sleep 1; end }
   ensure

data/spec/spec_helper.rb

@@ -4,7 +4,6 @@ unless defined?(SPEC_HELPER_LOADED)
   require "rubygems"
   require "bundler/setup"
   require "rspec"
-  require "libxml"
   require "pry"
 
   braintree_lib = "#{project_root}/lib"
@@ -28,10 +27,6 @@ unless defined?(SPEC_HELPER_LOADED)
     end
   end
 
-  def now_in_eastern
-    (Time.now.utc - 5*60*60).strftime("%Y-%m-%d")
-  end
-
   module SpecHelper
 
     DefaultMerchantAccountId = "sandbox_credit_card"
@@ -188,16 +183,11 @@ unless defined?(SPEC_HELPER_LOADED)
       end
 
       def matches?(xml_string)
-        @libxml_parse = Braintree::Xml::Parser.hash_from_xml(xml_string, Braintree::Xml::Libxml)
-        @rexml_parse = Braintree::Xml::Parser.hash_from_xml(xml_string, Braintree::Xml::Rexml)
+        @libxml_parse = Braintree::Xml::Parser.hash_from_xml(xml_string)
         if @libxml_parse != @expected_hash
           @results = @libxml_parse
           @failed_parser = "libxml"
           false
-        elsif @rexml_parse != @expected_hash
-          @results = @rexml_parse
-          @failed_parser = "rexml"
-          false
         else
           true
         end

data/spec/unit/braintree/address_spec.rb

@@ -94,12 +94,4 @@ describe Braintree::Address do
       end.to raise_error(NoMethodError, /protected method .new/)
     end
   end
-
-  describe "update" do
-    it "raises an exception if hash includes an invalid key" do
-      expect do
-        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
 end

data/spec/unit/braintree/credit_card_spec.rb

@@ -15,7 +15,6 @@ describe Braintree::CreditCard do
         :billing_address_id,
         :cardholder_name,
         :cvv,
-        :device_session_id,
         :expiration_date,
         :expiration_month,
         :expiration_year,
@@ -23,7 +22,6 @@ describe Braintree::CreditCard do
         :token,
         :venmo_sdk_payment_method_code,
         :device_data,
-        :fraud_merchant_id,
         :payment_method_nonce,
         {:external_vault=>[:network_transaction_id]},
         {:options => [:make_default, :verification_merchant_account_id, :verify_card, :verification_amount, :venmo_sdk_session, :fail_on_duplicate_payment_method, :verification_account_type]},
@@ -37,6 +35,7 @@ describe Braintree::CreditCard do
           :first_name,
           :last_name,
           :locality,
+          :phone_number,
           :postal_code,
           :region,
           :street_address
@@ -62,7 +61,6 @@ describe Braintree::CreditCard do
         :billing_address_id,
         :cardholder_name,
         :cvv,
-        :device_session_id,
         :expiration_date,
         :expiration_month,
         :expiration_year,
@@ -70,7 +68,6 @@ describe Braintree::CreditCard do
         :token,
         :venmo_sdk_payment_method_code,
         :device_data,
-        :fraud_merchant_id,
         :payment_method_nonce,
         {:external_vault=>[:network_transaction_id]},
         {:options => [:make_default, :verification_merchant_account_id, :verify_card, :verification_amount, :venmo_sdk_session, :fail_on_duplicate_payment_method, :verification_account_type]},
@@ -84,6 +81,7 @@ describe Braintree::CreditCard do
           :first_name,
           :last_name,
           :locality,
+          :phone_number,
           :postal_code,
           :region,
           :street_address,
@@ -103,21 +101,6 @@ describe Braintree::CreditCard do
     end
   end
 
-  describe "self.create_from_transparent_redirect" do
-    it "raises an exception if the query string is forged" do
-      expect do
-        Braintree::CreditCard.create_from_transparent_redirect("http_status=200&forged=query_string")
-      end.to raise_error(Braintree::ForgedQueryString)
-    end
-  end
-
-  describe "self.create_credit_card_url" do
-    it "returns the url" do
-      config = Braintree::Configuration.instantiate
-      Braintree::CreditCard.create_credit_card_url.should == "http#{config.ssl? ? 's' : ''}://#{config.server}:#{config.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(:gateway, :token => 123)
@@ -196,7 +179,8 @@ describe Braintree::CreditCard do
         :expiration_year => "2020",
         :last_4 => "1111",
         :token => "tok1",
-        :updated_at => Time.now
+        :updated_at => Time.now,
+        :is_network_tokenized => false,
       )
       output = credit_card.inspect
       output.should include(%q(bin: "411111"))
@@ -210,6 +194,7 @@ describe Braintree::CreditCard do
       output.should include(%q(token: "tok1"))
       output.should include(%Q(updated_at: #{credit_card.updated_at.inspect}))
       output.should include(%Q(created_at: #{credit_card.created_at.inspect}))
+      output.should include(%q(is_network_tokenized?: false))
     end
   end
 
@@ -224,10 +209,32 @@ describe Braintree::CreditCard do
     end
   end
 
+  describe "is_network_tokenized?" do
+    it "returns true" do
+      credit_card = Braintree::CreditCard._new(
+        :gateway,
+        :bin => "510510",
+        :last_4 => "5100",
+        :is_network_tokenized => true
+      )
+      credit_card.is_network_tokenized?.should == true
+    end
+
+    it "returns false" do
+      credit_card = Braintree::CreditCard._new(
+        :gateway,
+        :bin => "510510",
+        :last_4 => "5100",
+        :is_network_tokenized => false
+      )
+      credit_card.is_network_tokenized?.should == false
+    end
+  end
+
   describe "self.update" do
     it "raises an exception if attributes contain an invalid key" do
       expect do
-        Braintree::CreditCard._new(Braintree::Configuration.gateway, {}).update(:invalid_key => 'val')
+        Braintree::CreditCard.update(:gateway, :invalid_key => 'val')
       end.to raise_error(ArgumentError, "invalid keys: invalid_key")
     end
   end

data/spec/unit/braintree/credit_card_verification_spec.rb

@@ -42,6 +42,13 @@ describe Braintree::CreditCardVerification do
     Braintree::CreditCardVerification._new(:amount => BigDecimal("12.34")).amount.should == BigDecimal("12.34")
   end
 
+  it "accepts network_transaction_id" do
+    verification = Braintree::CreditCardVerification._new(
+      :network_transaction_id => "123456789012345"
+    )
+    expect(verification.network_transaction_id).to eq "123456789012345"
+  end
+
   describe "self.create" do
     it "rejects invalid parameters" do
       expect do

data/spec/unit/braintree/customer_spec.rb

@@ -91,7 +91,6 @@ describe Braintree::Customer do
           :billing_address_id,
           :cardholder_name,
           :cvv,
-          :device_session_id,
           :expiration_date,
           :expiration_month,
           :expiration_year,
@@ -99,7 +98,6 @@ describe Braintree::Customer do
           :token,
           :venmo_sdk_payment_method_code,
           :device_data,
-          :fraud_merchant_id,
           :payment_method_nonce,
           {:external_vault=>[:network_transaction_id]},
           {:options => [:make_default, :verification_merchant_account_id, :verify_card, :verification_amount, :venmo_sdk_session, :fail_on_duplicate_payment_method, :verification_account_type]},
@@ -113,6 +111,7 @@ describe Braintree::Customer do
             :first_name,
             :last_name,
             :locality,
+            :phone_number,
             :postal_code,
             :region,
             :street_address
@@ -151,6 +150,7 @@ describe Braintree::Customer do
               :first_name,
               :last_name,
               :locality,
+              :phone_number,
               :postal_code,
               :region,
               :street_address,
@@ -180,7 +180,6 @@ describe Braintree::Customer do
           :billing_address_id,
           :cardholder_name,
           :cvv,
-          :device_session_id,
           :expiration_date,
           :expiration_month,
           :expiration_year,
@@ -188,7 +187,6 @@ describe Braintree::Customer do
           :token,
           :venmo_sdk_payment_method_code,
           :device_data,
-          :fraud_merchant_id,
           :payment_method_nonce,
           {:external_vault=>[:network_transaction_id]},
           {:options => [
@@ -211,6 +209,7 @@ describe Braintree::Customer do
             :first_name,
             :last_name,
             :locality,
+            :phone_number,
             :postal_code,
             :region,
             :street_address,
@@ -244,6 +243,7 @@ describe Braintree::Customer do
               :first_name,
               :last_name,
               :locality,
+              :phone_number,
               :postal_code,
               :region,
               :street_address,
@@ -255,14 +255,6 @@ describe Braintree::Customer do
     end
   end
 
-  describe "self.create_from_transparent_redirect" do
-    it "raises an exception if the query string is forged" do
-      expect do
-        Braintree::Customer.create_from_transparent_redirect("http_status=200&forged=query_string")
-      end.to raise_error(Braintree::ForgedQueryString)
-    end
-  end
-
   describe "==" do
     it "returns true when given a customer with the same id" do
       first = Braintree::Customer._new(:gateway, :id => 123)

data/spec/unit/braintree/dispute_spec.rb

@@ -42,6 +42,7 @@ describe Braintree::Dispute do
         :amount => "31.00",
         :id => "open_disputed_transaction",
         :created_at => Time.utc(2009, 2, 9, 12, 59, 59),
+        :installment_count => nil,
         :order_id => nil,
         :purchase_order_number => "po",
         :payment_instrument_subtype => "Visa",
@@ -197,13 +198,6 @@ describe Braintree::Dispute do
 
     describe "with optional params" do
       it "does not raise an exception if the optional parameters are valid" do
-        Braintree::Http.stub(:new).and_return double.as_null_object
-        expect do
-          Braintree::Dispute.add_text_evidence("dispute_id", { content: "a", tag: "", sequence_number: 3 })
-        end.to_not raise_error
-      end
-
-      it "does not raise an exception if the category parameter is provided" do
         Braintree::Http.stub(:new).and_return double.as_null_object
         expect do
           Braintree::Dispute.add_text_evidence("dispute_id", { content: "a", category: "", sequence_number: 3 })
@@ -319,12 +313,14 @@ describe Braintree::Dispute do
 
       dispute.transaction.amount.should == 31.00
       dispute.transaction.id.should == "open_disputed_transaction"
+      dispute.transaction.created_at.should == Time.utc(2009, 2, 9, 12, 59, 59)
+      dispute.transaction.installment_count.should == nil
       dispute.transaction.order_id.should == nil
       dispute.transaction.purchase_order_number.should == "po"
       dispute.transaction.payment_instrument_subtype.should == "Visa"
     end
 
-    it "converts status_history hash into an array of Dispute::HistoryEvent objects" do
+    it "converts status_history hash into an array of Dispute::StatusHistory objects" do
       dispute = Braintree::Dispute._new(attributes)
 
       dispute.status_history.length.should == 1
@@ -395,10 +391,6 @@ describe Braintree::Dispute do
   describe "comments" do
     let(:dispute) { Braintree::Dispute._new(attributes) }
 
-    it "#forwarded_comments returns `processor_comments`" do
-      expect(dispute.forwarded_comments).to eq(dispute.processor_comments)
-    end
-
     it "#processor_comments" do
       expect(dispute.processor_comments).to eq(attributes[:processor_comments])
     end

data/spec/unit/braintree/http_spec.rb

@@ -130,7 +130,7 @@ END
       expect(default_headers["Accept-Encoding"]).to eq("gzip")
       expect(default_headers["Content-Type"]).to eq("application/xml")
       expect(default_headers["User-Agent"]).to match(/Braintree Ruby Gem .*/)
-      expect(default_headers["X-ApiVersion"]).to eq("5")
+      expect(default_headers["X-ApiVersion"]).to eq("6")
     end
 
     it "overwrites defaults with override headers" do
@@ -144,7 +144,7 @@ END
       expect(headers["Authorization"]).to eq("token")
       expect(headers["Content-Type"]).to eq("application/xml")
       expect(headers["User-Agent"]).to match(/Braintree Ruby Gem .*/)
-      expect(headers["X-ApiVersion"]).to eq("5")
+      expect(headers["X-ApiVersion"]).to eq("6")
     end
 
     it "extends default headers when new headers are specified" do
@@ -156,7 +156,7 @@ END
       expect(headers["Accept-Encoding"]).to eq("gzip")
       expect(headers["Content-Type"]).to eq("application/xml")
       expect(headers["User-Agent"]).to match(/Braintree Ruby Gem .*/)
-      expect(headers["X-ApiVersion"]).to eq("5")
+      expect(headers["X-ApiVersion"]).to eq("6")
       expect(headers["New-Header"]).to eq("New Value")
     end
   end

data/spec/unit/braintree/local_payment_completed_spec.rb

@@ -32,5 +32,19 @@ describe Braintree::LocalPaymentCompleted do
       local_payment_completed.transaction.order_id.should eq("an-order-id")
       local_payment_completed.transaction.status.should eq(Braintree::Transaction::Status::Authorized)
     end
+
+    it "initializes the object with the appropriate attributes set if no transaction is provided" do
+      params = {
+        payment_id: "a-payment-id",
+        payer_id: "a-payer-id",
+        payment_method_nonce: "a-nonce",
+      }
+      local_payment_completed = Braintree::LocalPaymentCompleted._new(params)
+
+      local_payment_completed.payment_id.should eq("a-payment-id")
+      local_payment_completed.payer_id.should eq("a-payer-id")
+      local_payment_completed.payment_method_nonce.should eq("a-nonce")
+      local_payment_completed.transaction.should be_nil
+    end
   end
 end

data/spec/unit/braintree/transaction/paypal_details_spec.rb

@@ -0,0 +1,59 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+
+describe Braintree::Transaction::PayPalDetails do
+  describe "initialize" do
+    it "sets all fields" do
+      details = Braintree::Transaction::PayPalDetails.new(
+        :authorization_id => "id",
+        :billing_agreement_id => "billing-agreement-id",
+        :capture_id => "capture-id",
+        :custom_field => "custom-field",
+        :debug_id => "debug-id",
+        :description => "description",
+        :image_url => "www.image.com",
+        :implicitly_vaulted_payment_method_global_id => "global-id",
+        :implicitly_vaulted_payment_method_token => "payment-method-token",
+        :payee_email => "payee@example.com",
+        :payee_id => "payee-id",
+        :payer_email => "payer@example.com",
+        :payer_first_name => "Grace",
+        :payer_id => "payer-id",
+        :payer_last_name => "Hopper",
+        :payer_status =>"status",
+        :payment_id => "payment-id",
+        :refund_from_transaction_fee_amount => "1.00",
+        :refund_from_transaction_fee_currency_iso_code => "123",
+        :refund_id => "refund-id",
+        :seller_protection_status => "seller-protection-status",
+        :token => "token",
+        :transaction_fee_amount => "2.00",
+        :transaction_fee_currency_iso_code => "123"
+      )
+
+      expect(details.authorization_id).to eq("id")
+      expect(details.billing_agreement_id).to eq("billing-agreement-id")
+      expect(details.capture_id).to eq("capture-id")
+      expect(details.custom_field).to eq("custom-field")
+      expect(details.debug_id).to eq("debug-id")
+      expect(details.description).to eq("description")
+      expect(details.image_url).to eq("www.image.com")
+      expect(details.implicitly_vaulted_payment_method_global_id).to eq("global-id")
+      expect(details.implicitly_vaulted_payment_method_token).to eq("payment-method-token")
+      expect(details.payee_email).to eq("payee@example.com")
+      expect(details.payee_id).to eq("payee-id")
+      expect(details.payer_email).to eq("payer@example.com")
+      expect(details.payer_first_name).to eq("Grace")
+      expect(details.payer_id).to eq("payer-id")
+      expect(details.payer_last_name).to eq("Hopper")
+      expect(details.payer_status).to eq("status")
+      expect(details.payment_id).to eq("payment-id")
+      expect(details.refund_from_transaction_fee_amount).to eq("1.00")
+      expect(details.refund_from_transaction_fee_currency_iso_code).to eq("123")
+      expect(details.refund_id).to eq("refund-id")
+      expect(details.seller_protection_status).to eq("seller-protection-status")
+      expect(details.token).to eq("token")
+      expect(details.transaction_fee_amount).to eq("2.00")
+      expect(details.transaction_fee_currency_iso_code).to eq("123")
+    end
+  end
+end

data/spec/unit/braintree/transaction_spec.rb

@@ -17,14 +17,6 @@ describe Braintree::Transaction do
     end
   end
 
-  describe "self.create_from_transparent_redirect" do
-    it "raises an exception if the query string is forged" do
-      expect do
-        Braintree::Transaction.create_from_transparent_redirect("http_status=200&forged=query_string")
-      end.to raise_error(Braintree::ForgedQueryString)
-    end
-  end
-
   describe "self.find" do
     it "raises error if passed empty string" do
       expect do
@@ -45,13 +37,6 @@ describe Braintree::Transaction do
     end
   end
 
-  describe "self.create_transaction_url" do
-    it "returns the url" do
-      config = Braintree::Configuration.instantiate
-      Braintree::Transaction.create_transaction_url.should == "http#{config.ssl? ? 's' : ''}://#{config.server}:#{config.port}/merchants/integration_merchant_id/transactions/all/create_via_transparent_redirect_request"
-    end
-  end
-
   describe "self.submit_for_settlement" do
     it "raises an ArgumentError if transaction_id is an invalid format" do
       expect do
@@ -106,7 +91,7 @@ describe Braintree::Transaction do
         }
       )
       disbursement = transaction.disbursement_details
-      disbursement.disbursement_date.should == "2013-04-03"
+      disbursement.disbursement_date.should == Date.parse("2013-04-03")
       disbursement.settlement_amount.should == "120.00"
       disbursement.settlement_currency_iso_code.should == "USD"
       disbursement.settlement_currency_exchange_rate.should == "1"
@@ -171,25 +156,6 @@ describe Braintree::Transaction do
       transaction.three_d_secure_info.liability_shift_possible.should == true
     end
 
-    it "sets up ideal_payment_details" do
-      transaction = Braintree::Transaction._new(
-        :gateway,
-        :ideal_payment => {
-          :ideal_payment_id => "idealpayment_abc_123",
-          :ideal_transaction_id => "1150000008857321",
-          :masked_iban => "12************7890",
-          :bic => "RABONL2U",
-          :image_url => "http://www.example.com/ideal.png"
-        }
-      )
-
-      transaction.ideal_payment_details.ideal_payment_id.should == "idealpayment_abc_123"
-      transaction.ideal_payment_details.ideal_transaction_id.should == "1150000008857321"
-      transaction.ideal_payment_details.masked_iban.should == "12************7890"
-      transaction.ideal_payment_details.bic.should == "RABONL2U"
-      transaction.ideal_payment_details.image_url.should == "http://www.example.com/ideal.png"
-    end
-
     it "sets up history attributes in status_history" do
       time = Time.utc(2010,1,14)
       transaction = Braintree::Transaction._new(
@@ -276,16 +242,18 @@ describe Braintree::Transaction do
   end
 
   describe "inspect" do
-    it "includes the id, type, amount, and status first" do
+    it "includes the id, type, amount, status, and processed_with_network_token?" do
       transaction = Braintree::Transaction._new(
         :gateway,
         :id => "1234",
         :type => "sale",
         :amount => "100.00",
-        :status => Braintree::Transaction::Status::Authorized
+        :status => Braintree::Transaction::Status::Authorized,
+        :processed_with_network_token => false,
       )
       output = transaction.inspect
       output.should include(%Q(#<Braintree::Transaction id: "1234", type: "sale", amount: "100.0", status: "authorized"))
+      output.should include(%Q(processed_with_network_token?: false))
     end
   end
 
@@ -394,4 +362,16 @@ describe Braintree::Transaction do
       )
     end
   end
+
+  describe "processed_with_network_token?" do
+    it "is true if the transaction was processed with a network token" do
+      transaction = Braintree::Transaction._new(:gateway, :processed_with_network_token => true)
+      transaction.processed_with_network_token?.should == true
+    end
+
+    it "is false if the transaction was not processed with a network token" do
+      transaction = Braintree::Transaction._new(:gateway, :processed_with_network_token => false)
+      transaction.processed_with_network_token?.should == false
+    end
+  end
 end