solidus_paypal_braintree 1.0.0 → 1.1.0

data/spec/models/solidus_paypal_braintree/gateway_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe SolidusPaypalBraintree::Gateway do
   let(:user) { create :user }
 
   let(:source) do
-    SolidusPaypalBraintree::Source.new(
+    SolidusPaypalBraintree::Source.create!(
       nonce: 'fake-valid-nonce',
       user: user,
       payment_type: payment_type,

data/spec/models/solidus_paypal_braintree/source_spec.rb

@@ -11,6 +11,67 @@ RSpec.describe SolidusPaypalBraintree::Source, type: :model do
     expect(described_class.new(payment_type: 'AndroidPay')).to be_invalid
   end
 
+  describe 'attributes' do
+    context 'with paypal_funding_source' do
+      subject { build(:solidus_paypal_braintree_source, :paypal) }
+
+      it 'can be nil' do
+        subject.paypal_funding_source = nil
+
+        expect(subject).to be_valid
+      end
+
+      it 'makes empty strings nil' do
+        subject.paypal_funding_source = ''
+
+        result = subject.save
+
+        expect(result).to eq(true)
+        expect(subject.paypal_funding_source).to be_nil
+      end
+
+      it 'gets correctly mapped as an enum' do
+        subject.paypal_funding_source = 'applepay'
+
+        result = subject.save
+
+        expect(result).to eq(true)
+        expect(subject.paypal_funding_source).to eq('applepay')
+        expect(subject.applepay_funding?).to eq(true)
+      end
+
+      it "doesn't become nil when the payment_type is a PAYPAL" do
+        subject.payment_type = described_class::PAYPAL
+        subject.paypal_funding_source = 'venmo'
+
+        result = subject.save
+
+        expect(result).to eq(true)
+        expect(subject.venmo_funding?).to eq(true)
+      end
+
+      it 'becomes nil when the payment_type is a CREDIT CARD' do
+        subject.payment_type = described_class::CREDIT_CARD
+        subject.paypal_funding_source = 'venmo'
+
+        result = subject.save
+
+        expect(result).to eq(true)
+        expect(subject.paypal_funding_source).to be_nil
+      end
+
+      it 'becomes nil when the payment_type is APPLE PAY' do
+        subject.payment_type = described_class::APPLE_PAY
+        subject.paypal_funding_source = 'venmo'
+
+        result = subject.save
+
+        expect(result).to eq(true)
+        expect(subject.paypal_funding_source).to be_nil
+      end
+    end
+  end
+
   describe '#payment_method' do
     it 'uses spree_payment_method' do
       expect(described_class.new.build_payment_method).to be_a Spree::PaymentMethod
@@ -199,6 +260,22 @@ RSpec.describe SolidusPaypalBraintree::Source, type: :model do
     end
   end
 
+  describe "#venmo?" do
+    subject { described_class.new(payment_type: type).venmo? }
+
+    context "when the payment type is VenmoAccount" do
+      let(:type) { "VenmoAccount" }
+
+      it { is_expected.to be true }
+    end
+
+    context "when the payment type is not VenmoAccount" do
+      let(:type) { "Swish" }
+
+      it { is_expected.to be false }
+    end
+  end
+
   shared_context 'with unknown source token' do
     let(:braintree_payment_method) { double }
 
@@ -297,6 +374,16 @@ RSpec.describe SolidusPaypalBraintree::Source, type: :model do
 
       it { is_expected.to eq 'user@example.com' }
     end
+
+    context "when is a Venmo source" do
+      let(:type) { "VenmoAccount" }
+
+      before do
+        allow(payment_source).to receive(:username).and_return('venmojoe')
+      end
+
+      it { is_expected.to eq('venmojoe') }
+    end
   end
 
   describe "#card_type" do
@@ -339,6 +426,58 @@ RSpec.describe SolidusPaypalBraintree::Source, type: :model do
     end
   end
 
+  describe '#display_paypal_funding_source' do
+    let(:payment_source) { described_class.new }
+
+    context 'when the EN locale exists' do
+      it 'translates the funding source' do
+        payment_source.paypal_funding_source = 'card'
+
+        result = payment_source.display_paypal_funding_source
+
+        expect(result).to eq('Credit or debit card')
+      end
+    end
+
+    context "when the locale doesn't exist" do
+      it 'returns the paypal_funding_source as the default' do
+        allow(payment_source).to receive(:paypal_funding_source).and_return('non-existent')
+
+        result = payment_source.display_paypal_funding_source
+
+        expect(result).to eq('non-existent')
+      end
+    end
+  end
+
+  describe '#display_payment_type' do
+    subject { described_class.new(payment_type: type).display_payment_type }
+
+    context 'when type is CreditCard' do
+      let(:type) { 'CreditCard' }
+
+      it 'returns "Payment Type: Credit Card' do
+        expect(subject).to eq('Payment Type: Credit Card')
+      end
+    end
+
+    context 'when type is PayPalAccount' do
+      let(:type) { 'PayPalAccount' }
+
+      it 'returns "Payment Type: PayPal' do
+        expect(subject).to eq('Payment Type: PayPal')
+      end
+    end
+
+    context 'when type is VenmoAccount' do
+      let(:type) { 'VenmoAccount' }
+
+      it 'returns "Payment Type: Venmo' do
+        expect(subject).to eq('Payment Type: Venmo')
+      end
+    end
+  end
+
   describe '#reusable?' do
     subject { payment_source.reusable? }
 

data/spec/models/solidus_paypal_braintree/transaction_address_spec.rb

@@ -219,34 +219,16 @@ describe SolidusPaypalBraintree::TransactionAddress do
       end
     end
 
-    context 'when using first_name and last_name' do
-      let(:address_params) { super().merge({ first_name: "Bruce", last_name: "Wayne" }) }
+    unless SolidusSupport.combined_first_and_last_name_in_address?
+      context 'when using first_name and last_name' do
+        let(:address_params) { super().merge({ first_name: "Bruce", last_name: "Wayne" }) }
 
-      it 'displays a deprecation warning' do
-        expect(Spree::Deprecation).to receive(:warn).
-          with("first_name and last_name are deprecated. Use name instead.", any_args)
+        it 'displays a deprecation warning' do
+          expect(Spree::Deprecation).to receive(:warn).
+            with("first_name and last_name are deprecated. Use name instead.", any_args)
 
-        subject
-      end
-    end
-  end
-
-  describe "#split" do
-    subject { described_class.new.split_name(name) }
-
-    context "with a one word name" do
-      let(:name) { "Bruce" }
-
-      it "correctly splits" do
-        expect(subject).to eq ["Bruce"]
-      end
-    end
-
-    context "with a multi word name" do
-      let(:name) { "Bruce Wayne The Batman" }
-
-      it "correctly splits" do
-        expect(subject).to eq ["Bruce", "Wayne The Batman"]
+          subject
+        end
       end
     end
   end

data/spec/models/solidus_paypal_braintree/transaction_import_spec.rb

@@ -66,6 +66,12 @@ describe SolidusPaypalBraintree::TransactionImport do
       expect(subject.payment_method).to eq braintree_gateway
     end
 
+    it 'takes the paypal funding source from the transaction' do
+      transaction.paypal_funding_source = 'paypal'
+
+      expect(subject.paypal_funding_source).to eq('paypal')
+    end
+
     context 'when order has a user' do
       let(:user) { Spree.user_class.new }
       let(:order) { Spree::Order.new user: user }
@@ -201,6 +207,17 @@ describe SolidusPaypalBraintree::TransactionImport do
           expect(order.shipping_address.state).to eq new_york
         end
 
+        context 'when transaction has paypal funding source' do
+          it 'saves it to the payment source' do
+            transaction.paypal_funding_source = 'paypal'
+
+            subject
+
+            source = SolidusPaypalBraintree::Source.last
+            expect(source.paypal_funding_source).to eq('paypal')
+          end
+        end
+
         context 'with a tax category' do
           before do
             zone = Spree::Zone.create name: 'nyc tax'

data/spec/spec_helper.rb

@@ -8,6 +8,9 @@ require 'solidus_dev_support/rspec/coverage'
 
 require File.expand_path('dummy/config/environment.rb', __dir__)
 
+require 'rails-controller-testing'
+Rails::Controller::Testing.install
+
 # Requires factories and other useful helpers defined in spree_core.
 require 'solidus_dev_support/rspec/feature_helper'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_paypal_braintree
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Stembolt
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.65'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.65'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: solidus_api
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +47,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,21 +77,27 @@ dependencies:
         version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +171,23 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/config/solidus_paypal_braintree_manifest.js
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_active_blue_button_280x48.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_active_blue_button_320x48.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_active_blue_button_375x48.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_active_white_button_280x48.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_active_white_button_320x48.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_active_white_button_375x48.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_blue_acceptance_mark.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_blue_button_280x48.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_blue_button_320x48.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_blue_button_375x48.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_blue_logo.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_white_acceptance_mark.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_white_button_280x48.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_white_button_320x48.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_white_button_375x48.svg
+- app/assets/images/solidus_paypal_braintree/venmo/venmo_white_logo.svg
 - app/assets/javascripts/solidus_paypal_braintree/apple_pay_button.js
 - app/assets/javascripts/solidus_paypal_braintree/checkout.js
 - app/assets/javascripts/solidus_paypal_braintree/client.js
@@ -174,6 +197,7 @@ files:
 - app/assets/javascripts/solidus_paypal_braintree/paypal_button.js
 - app/assets/javascripts/solidus_paypal_braintree/paypal_messaging.js
 - app/assets/javascripts/solidus_paypal_braintree/promise.js
+- app/assets/javascripts/solidus_paypal_braintree/venmo_button.js
 - app/assets/javascripts/spree/backend/solidus_paypal_braintree.js
 - app/assets/javascripts/spree/frontend/paypal_button.js
 - app/assets/javascripts/spree/frontend/solidus_paypal_braintree.js
@@ -198,6 +222,7 @@ files:
 - app/models/solidus_paypal_braintree/transaction.rb
 - app/models/solidus_paypal_braintree/transaction_address.rb
 - app/models/solidus_paypal_braintree/transaction_import.rb
+- app/overrides/spree/payments/payment/add_paypal_funding_source_to_payment.rb
 - app/views/spree/api/payments/source_views/_paypal_braintree.json.jbuilder
 - app/views/spree/checkout/existing_payment/_paypal_braintree.html.erb
 - app/views/spree/shared/_apple_pay_button.html.erb
@@ -206,6 +231,7 @@ files:
 - app/views/spree/shared/_paypal_braintree_head_scripts.html.erb
 - app/views/spree/shared/_paypal_cart_button.html.erb
 - app/views/spree/shared/_paypal_messaging.html.erb
+- app/views/spree/shared/_venmo_button.html.erb
 - bin/console
 - bin/rails
 - bin/setup
@@ -221,6 +247,8 @@ files:
 - db/migrate/20170508085402_add_not_null_constraint_to_sources_payment_type.rb
 - db/migrate/20190705115327_add_paypal_button_preferences_to_braintree_configurations.rb
 - db/migrate/20190911141712_add_3d_secure_to_braintree_configuration.rb
+- db/migrate/20211222170950_add_paypal_funding_source_to_solidus_paypal_braintree_sources.rb
+- db/migrate/20220104150301_add_venmo_to_braintree_configuration.rb
 - lib/controllers/backend/solidus_paypal_braintree/configurations_controller.rb
 - lib/controllers/frontend/solidus_paypal_braintree/checkouts_controller.rb
 - lib/controllers/frontend/solidus_paypal_braintree/transactions_controller.rb
@@ -234,8 +262,10 @@ files:
 - lib/views/backend/solidus_paypal_braintree/configurations/list.html.erb
 - lib/views/backend/spree/admin/payments/source_forms/_paypal_braintree.html.erb
 - lib/views/backend/spree/admin/payments/source_views/_paypal_braintree.html.erb
+- lib/views/backend/spree/admin/shared/preference_fields/_preference_select.html.erb
 - lib/views/backend_v1.2/spree/admin/payments/source_forms/_paypal_braintree.html.erb
 - lib/views/backend_v2.4/spree/admin/shared/preference_fields/_hash.html.erb
+- lib/views/frontend/solidus_paypal_braintree/payments/_payment.html.erb
 - lib/views/frontend/spree/checkout/payment/_paypal_braintree.html.erb
 - lib/views/frontend/spree/shared/_paypal_checkout_button.html.erb
 - solidus_paypal_braintree.gemspec
@@ -247,6 +277,7 @@ files:
 - spec/features/backend/new_payment_spec.rb
 - spec/features/frontend/braintree_credit_card_checkout_spec.rb
 - spec/features/frontend/paypal_checkout_spec.rb
+- spec/features/frontend/venmo_checkout_spec.rb
 - spec/fixtures/cassettes/admin/invalid_credit_card.yml
 - spec/fixtures/cassettes/admin/resubmit_credit_card.yml
 - spec/fixtures/cassettes/admin/valid_credit_card.yml
@@ -257,6 +288,7 @@ files:
 - spec/fixtures/cassettes/checkout/resubmit_credit_card.yml
 - spec/fixtures/cassettes/checkout/update.yml
 - spec/fixtures/cassettes/checkout/valid_credit_card.yml
+- spec/fixtures/cassettes/checkout/valid_venmo_transaction.yml
 - spec/fixtures/cassettes/gateway/authorize.yml
 - spec/fixtures/cassettes/gateway/authorize/credit_card/address.yml
 - spec/fixtures/cassettes/gateway/authorize/merchant_account/EUR.yml
@@ -278,6 +310,7 @@ files:
 - spec/fixtures/cassettes/transaction/import/valid/capture.yml
 - spec/fixtures/views/spree/orders/edit.html.erb
 - spec/helpers/solidus_paypal_braintree/braintree_admin_helper_spec.rb
+- spec/helpers/solidus_paypal_braintree/braintree_checkout_helper_spec.rb
 - spec/models/solidus_paypal_braintree/address_spec.rb
 - spec/models/solidus_paypal_braintree/avs_result_spec.rb
 - spec/models/solidus_paypal_braintree/gateway_spec.rb
@@ -301,27 +334,29 @@ licenses:
 metadata:
   homepage_uri: https://github.com/solidusio/solidus_paypal_braintree
   source_code_uri: https://github.com/solidusio/solidus_paypal_braintree
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.20
 signing_key:
 specification_version: 4
 summary: Officially supported Paypal/Braintree extension
 test_files:
 - spec/spec_helper.rb
+- spec/features/frontend/venmo_checkout_spec.rb
 - spec/features/frontend/braintree_credit_card_checkout_spec.rb
 - spec/features/frontend/paypal_checkout_spec.rb
 - spec/features/backend/configuration_spec.rb
@@ -356,6 +391,7 @@ test_files:
 - spec/fixtures/cassettes/checkout/invalid_credit_card.yml
 - spec/fixtures/cassettes/checkout/update.yml
 - spec/fixtures/cassettes/checkout/resubmit_credit_card.yml
+- spec/fixtures/cassettes/checkout/valid_venmo_transaction.yml
 - spec/fixtures/cassettes/gateway/cancel/missing.yml
 - spec/fixtures/cassettes/gateway/cancel/refunds.yml
 - spec/fixtures/cassettes/gateway/cancel/void.yml
@@ -377,3 +413,4 @@ test_files:
 - spec/controllers/solidus_paypal_braintree/client_tokens_controller_spec.rb
 - spec/controllers/solidus_paypal_braintree/checkouts_controller_spec.rb
 - spec/helpers/solidus_paypal_braintree/braintree_admin_helper_spec.rb
+- spec/helpers/solidus_paypal_braintree/braintree_checkout_helper_spec.rb