braintree 2.104.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]},
@@ -63,7 +61,6 @@ describe Braintree::CreditCard do
         :billing_address_id,
         :cardholder_name,
         :cvv,
-        :device_session_id,
         :expiration_date,
         :expiration_month,
         :expiration_year,
@@ -71,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]},
@@ -105,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)
@@ -253,7 +234,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(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/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]},
@@ -182,7 +180,6 @@ describe Braintree::Customer do
           :billing_address_id,
           :cardholder_name,
           :cvv,
-          :device_session_id,
           :expiration_date,
           :expiration_month,
           :expiration_year,
@@ -190,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 => [
@@ -259,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

@@ -198,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 })
@@ -327,7 +320,7 @@ describe Braintree::Dispute do
       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
@@ -398,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

@@ -5,6 +5,7 @@ describe Braintree::Transaction::PayPalDetails 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",
@@ -30,6 +31,7 @@ describe Braintree::Transaction::PayPalDetails do
       )
 
       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")

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(

data/spec/unit/braintree/util_spec.rb

@@ -171,6 +171,22 @@ describe Braintree::Util do
     end
   end
 
+  describe "self.replace_key" do
+    it "replaces the target key with the replacement key" do
+      Braintree::Util.replace_key(
+        {:a => {:b => "some value"}},
+        :b,
+        :c).should == {:a => {:c => "some value"}}
+    end
+
+    it "returns hash with all of the original keys if the target key does not exist" do
+      Braintree::Util.replace_key(
+        {:some_key => "some value"},
+        :not_found,
+        :new_key).should == {:some_key => "some value"}
+    end
+  end
+
   describe "self._flatten_hash_keys" do
     it "flattens hash keys" do
       Braintree::Util._flatten_hash_keys(:nested => {
@@ -259,7 +275,7 @@ describe Braintree::Util do
       "UNSUPPORTED_CLIENT" => Braintree::UpgradeRequiredError,
       "RESOURCE_LIMIT" => Braintree::TooManyRequestsError,
       "INTERNAL" => Braintree::ServerError,
-      "SERVICE_AVAILABILITY" => Braintree::DownForMaintenanceError,
+      "SERVICE_AVAILABILITY" => Braintree::ServiceUnavailableError,
     }
 
     errors.each do |graphQLError, exception|
@@ -321,6 +337,18 @@ describe Braintree::Util do
       end.to raise_error(Braintree::AuthorizationError)
     end
 
+    it "raises a NotFoundError if resource is not found" do
+      expect do
+        Braintree::Util.raise_exception_for_status_code(404)
+      end.to raise_error(Braintree::NotFoundError)
+    end
+
+    it "raises a RequestTimeoutError if the request times out" do
+      expect do
+        Braintree::Util.raise_exception_for_status_code(408)
+      end.to raise_error(Braintree::RequestTimeoutError)
+    end
+
     it "raises an UpgradeRequired if the client library is EOL'd" do
       expect do
         Braintree::Util.raise_exception_for_status_code(426)
@@ -339,10 +367,16 @@ describe Braintree::Util do
       end.to raise_error(Braintree::ServerError)
     end
 
-    it "raises a DownForMaintenanceError if the server is down for maintenance" do
+    it "raises a ServiceUnavailableError if the server is unavailable" do
       expect do
         Braintree::Util.raise_exception_for_status_code(503)
-      end.to raise_error(Braintree::DownForMaintenanceError)
+      end.to raise_error(Braintree::ServiceUnavailableError)
+    end
+
+    it "raises a GatewayTimeoutError if the gateway times out" do
+      expect do
+        Braintree::Util.raise_exception_for_status_code(504)
+      end.to raise_error(Braintree::GatewayTimeoutError)
     end
 
     it "raises an UnexpectedError if some other code is returned" do

data/spec/unit/braintree/webhook_notification_spec.rb

@@ -275,7 +275,7 @@ describe Braintree::WebhookNotification do
         notification.kind.should == Braintree::WebhookNotification::Kind::TransactionDisbursed
         notification.transaction.id.should == "my_id"
         notification.transaction.amount.should == 1_00
-        notification.transaction.disbursement_details.disbursement_date.should == "2013-07-09"
+        notification.transaction.disbursement_details.disbursement_date.should == Date.parse("2013-07-09")
       end
 
       it "builds a sample notification for a disbursement_exception webhook" do

data/spec/unit/braintree/xml/parser_spec.rb

@@ -57,24 +57,29 @@ describe Braintree::Xml::Parser do
       xml.should parse_to(:root => {:customers => [{:name => "Adam"}, {:name => "Ben"}]})
     end
 
-    it "parses using libxml when not using ruby 2.0" do
-      xml = "<root><foo type=\"integer\">123</foo></root>"
-      stub_const("RUBY_VERSION", "2.1.1")
-      ::Braintree::Xml::Libxml.should_receive(:parse).and_call_original
-
-      Braintree::Xml::Parser.hash_from_xml(xml)
+    it "parses an array" do
+      xml = <<-END
+        <root>
+          <customers type="array">
+            <customer><name>Adam</name><customer-id>1</customer-id></customer>
+            <customer><name>Ben</name><customer-id>2</customer-id></customer>
+          </customers>
+        </root>
+      END
+      xml.should parse_to(:root => {:customers => [{:name => "Adam", :customer_id => "1"}, {:name => "Ben", :customer_id => "2"}]})
     end
 
-    it "parses using rexml when using ruby 2.0 to avoid Libxml segfault" do
-      segfault_prone_library_in_ruby_2_0 = ::Braintree::Xml::Libxml
-
-      xml = "<root><foo type=\"integer\">123</foo></root>"
-      stub_const("RUBY_VERSION", "2.0.0")
-
-      ::Braintree::Xml::Rexml.should_receive(:parse).and_call_original
-      segfault_prone_library_in_ruby_2_0.should_not_receive(:parse)
-
-      Braintree::Xml::Parser.hash_from_xml(xml)
+    it "parses nested objects" do
+      xml = <<-END
+        <root>
+          <paypal-details>
+            <deets type="array"><super-secrets><secret-code>1234</secret-code></super-secrets></deets>
+            <payer-email>abc@test.com</payer-email>
+            <payment-id>1234567890</payment-id>
+          </paypal-details>
+        </root>
+      END
+      xml.should parse_to(:root => {:paypal_details => {:deets => [{:secret_code => "1234"}], :payer_email => "abc@test.com", :payment_id => "1234567890"}})
     end
   end
 end