spree_braintree_vzero 3.5.1 → 3.6.0

data/gemfiles/spree_3_7.gemfile

@@ -8,5 +8,7 @@ gem "pg"
 gem "mysql2"
 gem "webmock", ">= 2.3.1"
 gem "rails-controller-testing"
+gem "spree_auth_devise", "~> 3.5.2"
+
 
 gemspec path: "../"

data/gemfiles/spree_4_0.gemfile

@@ -7,5 +7,6 @@ gem "pg"
 gem "mysql2"
 gem "webmock", ">= 2.3.1"
 gem "rails-controller-testing"
+gem "spree_auth_devise", "~> 4.0.0"
 
 gemspec path: "../"

data/gemfiles/{spree_3_5.gemfile → spree_4_1.gemfile}

@@ -2,11 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "spree", "~> 3.5.0"
-gem "pg"
-gem "mysql2"
-gem "webmock", ">= 2.3.1"
+gem "spree", "~> 4.1.0"
+gem "spree_auth_devise", "~> 4.1.0"
 gem "rails-controller-testing"
-gem 'sprockets', '~> 3.7'
 
 gemspec path: "../"

data/gemfiles/{spree_4_0_spree_auth_devise.gemfile → spree_4_2.gemfile}

@@ -2,11 +2,11 @@
 
 source "https://rubygems.org"
 
-gem "spree", "~> 4.0.0"
+gem "spree", "~> 4.2.0"
+gem "spree_auth_devise", "~> 4.2.0"
 gem "pg"
 gem "mysql2"
 gem "webmock", ">= 2.3.1"
 gem "rails-controller-testing"
-gem "spree_auth_devise", "~> 4.0.0"
 
 gemspec path: "../"

data/gemfiles/spree_master.gemfile

@@ -3,9 +3,7 @@
 source "https://rubygems.org"
 
 gem "spree", github: "spree/spree", branch: "master"
-gem "pg"
-gem "mysql2"
-gem "webmock", ">= 2.3.1"
+gem "spree_auth_devise", github: "spree/spree_auth_devise", branch: "master"
 gem "rails-controller-testing"
 
 gemspec path: "../"

data/lib/spree_braintree_vzero/engine.rb

@@ -1,3 +1,5 @@
+require 'braintree'
+
 module SpreeBraintreeVzero
   class Engine < Rails::Engine
     require 'spree/core'
@@ -17,7 +19,7 @@ module SpreeBraintreeVzero
 
     config.to_prepare &method(:activate).to_proc
 
-    initializer 'spree.braintree_vzero.payment_methods', after: 'spree.register.payment_methods' do |app|
+    config.after_initialize do |app|
       app.config.spree.payment_methods += [
         Spree::Gateway::BraintreeVzeroDropInUi,
         Spree::Gateway::BraintreeVzeroPaypalExpress,

data/lib/spree_braintree_vzero/version.rb

@@ -9,8 +9,8 @@ module SpreeBraintreeVzero
 
   module VERSION
     MAJOR = 3
-    MINOR = 5
-    TINY  = 1
+    MINOR = 6
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -78,7 +78,7 @@ describe Spree::CheckoutController, :vcr, type: :controller do
       it 'amount in payment should be updated' do
         expect(order.reload.payments.sum(:amount)).to eq 0
         put :update, params: { state: 'confirm' }
-        expect(order.reload.payments.last.amount).to eq order.order_total_after_store_credit
+        expect(order.reload.payments.last.amount).to eq order.total
       end
     end
   end

data/spec/features/spree/admin/log_entries_spec.rb

@@ -28,7 +28,12 @@ describe 'Log entries', :vcr, type: :feature do
         find_all("#payment_#{payment.id} a")[0].click
       end
 
-      click_link 'Logs'
+      if Spree.version.to_f < 4.0
+        click_link 'Logs'
+      else
+        all('a', text: 'Logs')[0].click
+      end
+
       within('#listing_log_entries') do
         expect(page).to have_css('.log_entry.success')
         expect(page).not_to have_css('.log_entry.fail')
@@ -50,8 +55,18 @@ describe 'Log entries', :vcr, type: :feature do
       expect(message).to be_present
 
       visit spree.admin_order_payments_path(order)
-      find("#payment_#{payment.id} a").click
-      click_link 'Logs'
+      if Spree.version.to_f < 4.0
+        find("#payment_#{payment.id} a").click
+      else
+        find_all("#payment_#{payment.id} a")[0].click
+      end
+
+      if Spree.version.to_f < 4.0
+        click_link 'Logs'
+      else
+        all('a', text: 'Logs')[0].click
+      end
+
       within('#listing_log_entries') do
         expect(page).not_to have_css('.log_entry.success')
         expect(page).to have_css('.log_entry.fail')

data/spec/models/gateway/braintree_vzero_base_spec.rb

@@ -116,9 +116,10 @@ describe Spree::Gateway::BraintreeVzeroBase, :vcr do
         it 'saves Braintree::Address id to Spree::Address when address is being saved' do
           gateway.preferred_pass_billing_and_shipping_address = true
           address = create(:address)
-          order.ship_address = address
-          order.bill_address = address
-          order.save
+
+          order.update!(ship_address: address, bill_address: address)
+          user.update!(ship_address: address, bill_address: address)
+
           purchase
           order.reload
 
@@ -133,8 +134,10 @@ describe Spree::Gateway::BraintreeVzeroBase, :vcr do
           gateway.preferred_pass_billing_and_shipping_address = true
           ship_address = create(:address, first_name: 'foo')
           bill_address = create(:address, first_name: 'bar')
-          order.ship_address = ship_address
-          order.bill_address = bill_address
+
+          order.update!(ship_address: ship_address, bill_address: bill_address)
+          user.update!(ship_address: ship_address, bill_address: bill_address)
+
           order.save
           purchase
           order.reload

data/spec/models/spree/address_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Spree::Address do
+  describe '.vaulted_duplicates' do
+    subject { described_class.vaulted_duplicates(given_address) }
+
+    let(:given_address) { create(:address) }
+    let(:vaulted_duplicate) do
+      Spree::Address.create(given_address.attributes.symbolize_keys.except(:id, :updated_at, :created_at, :braintree_id, :preferences).
+                                                                    merge(braintree_id: rand(100)))
+    end
+    let(:some_address) { create(:address) }
+
+    it 'returns only vaulted duplicates of given address' do
+      expect(subject).to contain_exactly vaulted_duplicate
+    end
+  end
+end

data/spec/support/vcr.rb

@@ -5,6 +5,6 @@ VCR.configure do |config|
   config.hook_into :webmock
   config.ignore_localhost = true
   config.configure_rspec_metadata!
-  config.default_cassette_options = { match_requests_on: [:method, :host], record: :new_episodes }
+  config.default_cassette_options = { match_requests_on: [:method, :host], record: :once }
   config.ignore_hosts 'codeclimate.com'
 end

data/spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/using_Vault/sends_address_data_when_address_is_new.yml

@@ -0,0 +1,72 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.sandbox.braintreegateway.com/merchants/6g9mpsybnt3htx2t/customers/2
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip
+      Accept:
+      - application/xml
+      User-Agent:
+      - Braintree Ruby Gem 3.1.0
+      X-Apiversion:
+      - '6'
+      Content-Type:
+      - application/xml
+      Authorization:
+      - Basic djY2MjhraHNoYjVrOW52dDpkN2FhYzU0NDRmMzdhMTY5ZTVhMWVlOTkzYmI1MmY1Mw==
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Date:
+      - Thu, 03 Dec 2020 13:28:35 GMT
+      Content-Type:
+      - application/xml; charset=utf-8
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Content-Type-Options:
+      - nosniff
+      X-Download-Options:
+      - noopen
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      X-Authentication:
+      - basic_auth
+      X-User:
+      - c97s5s74wf6cmypv
+      Vary:
+      - Accept-Encoding, Origin
+      Content-Encoding:
+      - gzip
+      Etag:
+      - W/"cdc2dd1286ed5b9f9b8282c940bd6f87"
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      X-Runtime:
+      - '0.104716'
+      X-Request-Id:
+      - 95722415-01a2-4bee-b287-f6fa5bb5d9dc
+      Content-Security-Policy:
+      - frame-ancestors 'self'
+      X-Broxyid:
+      - 95722415-01a2-4bee-b287-f6fa5bb5d9dc
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubDomains
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAPoyF8AA5RSy07DMBC89ysi313nISFauSkSCKRK3AoCbtt4m1j4Edkuafh64qYvqScutmZmxztrmy/3WiU/6Ly0ZkGyaUoSNJUV0tQL8rZ+pvdkWU54tfPBanTlJEm4FGXO2bBGMJBVAybQAd/VM936fmNC0YR9Hji7VmP1VjofqAGN5co2hrMrIuoKTujJImcXGMXK6hZMXz6OO2cnIoqoQapSS4dKwdR3YCR0/ls+dICqauQ0HsPZWBYNbWMNJkaqBQluh4SNAWF/w3W48TLc1lYOIaCgEJLQt7ggYoBBaiRlnuYpzTJapOssnefFPE2/hrxnw8G/a8X//BfD2P/wKHQrUQk/RqqV3YCKt/1ZvP+Kl1n4+lhtX2vOLsoxupCBVuCEPzYH56A/TgZCOPQeb7RhhvNP+AMAAP//AwAWVZ08PAIAAA==
+  recorded_at: Thu, 03 Dec 2020 13:28:35 GMT
+recorded_with: VCR 6.0.0

data/spree_braintree_vzero.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_braintree_vzero'
   s.version     = SpreeBraintreeVzero.version
-  s.summary     = 'Spree Braintree v.zero'
-  s.description = 'Braintree v.zero extension for Spree Commerce'
+  s.summary     = 'Official Braintree + PayPal for Spree Commerce'
+  s.description = 'Official Braintree + PayPal for Spree Commerce'
   s.required_ruby_version = '>= 2.0.0'
 
   s.author    = 'Spark Solutions'
@@ -22,14 +22,13 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  spree_version = '>= 3.1.0', '< 5.0'
+  spree_version = '>= 3.1.0'
   s.add_dependency 'spree_core', spree_version
   s.add_dependency 'spree_backend', spree_version
   s.add_dependency 'spree_frontend', spree_version
   s.add_dependency 'spree_extension'
   s.add_dependency 'braintree', '>= 2.40.0'
   s.add_dependency 'deface', '~> 1.0'
-  s.add_dependency 'whenever'
 
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'capybara'
@@ -48,5 +47,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'vcr'
-  s.add_development_dependency 'webmock', '~> 2.3' # https://github.com/bblimke/webmock/issues/683
+  s.add_development_dependency 'webmock', '~> 3.12' # https://github.com/bblimke/webmock/issues/683
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_braintree_vzero
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Spark Solutions
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: spree_backend
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: spree_frontend
   requirement: !ruby/object:Gem::Requirement
@@ -57,9 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,9 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
@@ -112,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: whenever
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -370,21 +338,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
-description: Braintree v.zero extension for Spree Commerce
+        version: '3.12'
+description: Official Braintree + PayPal for Spree Commerce
 email: we@sparksolutions.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -394,6 +363,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/images/backend-settle.svg
 - app/assets/images/credit_cards/icons/jcb.png
 - app/assets/javascripts/spree/backend/payments.js
 - app/assets/javascripts/spree/backend/spree_braintree_vzero.js
@@ -403,13 +373,14 @@ files:
 - app/controllers/spree/api/v1/braintree_client_token_controller.rb
 - app/controllers/spree/checkout_controller_decorator.rb
 - app/controllers/spree/orders_controller_decorator.rb
-- app/controllers/spree/user_sessions_controller_decorator.rb
 - app/helpers/spree/admin/decorated_navigation_helper.rb
 - app/helpers/spree/admin/payment_methods_helper.rb
 - app/helpers/spree/braintree_helper.rb
 - app/models/braintree/successful_result_decorator.rb
+- app/models/concerns/spree/gateway/braintree_vzero/legacy_rails_patch.rb
 - app/models/spree/address_decorator.rb
 - app/models/spree/braintree_checkout.rb
+- app/models/spree/braintree_vzero/order_decorator.rb
 - app/models/spree/gateway/braintree_vzero_base.rb
 - app/models/spree/gateway/braintree_vzero_base/address.rb
 - app/models/spree/gateway/braintree_vzero_base/braintree_user.rb
@@ -419,7 +390,7 @@ files:
 - app/models/spree/gateway/braintree_vzero_drop_in_ui.rb
 - app/models/spree/gateway/braintree_vzero_hosted_fields.rb
 - app/models/spree/gateway/braintree_vzero_paypal_express.rb
-- app/models/spree/order_decorator.rb
+- app/models/spree/log_entry_decorator.rb
 - app/models/spree/payment_decorator.rb
 - app/models/spree/payment_processing_decorator.rb
 - app/models/spree/preferences/preferable_decorator.rb
@@ -451,6 +422,7 @@ files:
 - app/views/spree/checkout/payment/braintree_vzero/_dropin_on_ready_callback.js.erb
 - app/views/spree/checkout/payment/braintree_vzero/_hosted_fields_on_field_event_callback.js.erb
 - app/views/spree/checkout/payment/braintree_vzero/_hosted_fields_styles.js.erb
+- app/views/spree/checkout/payment/braintree_vzero/_non_three_d_secure.html.erb
 - app/views/spree/checkout/payment/braintree_vzero/_payment.html.erb
 - app/views/spree/checkout/payment/braintree_vzero/_three_d_secure.html.erb
 - app/views/spree/shared/braintree_vzero/_dropin.js.erb
@@ -469,14 +441,11 @@ files:
 - db/migrate/20151202095956_add_risk_id_and_risk_decision_to_spree_braintree_checkouts.rb
 - db/migrate/20151211100203_add_braintree_last_digits_and_braintree_card_type_to_spree_braintree_checkouts.rb
 - db/migrate/20160112153422_add_admin_payment_to_spree_braintree_checkout.rb
-- gemfiles/spree_3_5.gemfile
-- gemfiles/spree_3_5_spree_auth_devise.gemfile
 - gemfiles/spree_3_7.gemfile
-- gemfiles/spree_3_7_spree_auth_devise.gemfile
 - gemfiles/spree_4_0.gemfile
-- gemfiles/spree_4_0_spree_auth_devise.gemfile
+- gemfiles/spree_4_1.gemfile
+- gemfiles/spree_4_2.gemfile
 - gemfiles/spree_master.gemfile
-- gemfiles/spree_master_spree_auth_devise.gemfile
 - lib/generators/spree_braintree_vzero/install/install_generator.rb
 - lib/spree_braintree_vzero.rb
 - lib/spree_braintree_vzero/engine.rb
@@ -496,6 +465,7 @@ files:
 - spec/models/gateway/braintree_vzero_base_spec.rb
 - spec/models/gateway/braintree_vzero_dropin_ui_spec.rb
 - spec/models/gateway/braintree_vzero_hosted_fields_spec.rb
+- spec/models/spree/address_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/spec_helper.rb
 - spec/support/vcr.rb
@@ -519,6 +489,7 @@ files:
 - spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/returns_suceess_with_valid_nonce.yml
 - spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/using_Vault/saves_Braintree_Address_id_to_Spree_Address_when_address_is_being_saved.yml
 - spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/using_Vault/saves_unique_Braintree_Addresses_ids.yml
+- spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/using_Vault/sends_address_data_when_address_is_new.yml
 - spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/using_Vault/sends_empty_address_id_when_address_is_already_in_vault.yml
 - spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/using_Vault/stores_Transaction.yml
 - spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/with_3DSecure_option_turned_on/performs_3DSecure_check.yml
@@ -555,7 +526,7 @@ homepage: http://sparksolutions.co
 licenses:
 - BSD-3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -571,10 +542,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
-summary: Spree Braintree v.zero
+summary: Official Braintree + PayPal for Spree Commerce
 test_files:
 - spec/controllers/spree/api/v1/braintree_client_token_controller_spec.rb
 - spec/controllers/spree/checkout_controller_spec.rb
@@ -588,6 +559,7 @@ test_files:
 - spec/models/gateway/braintree_vzero_base_spec.rb
 - spec/models/gateway/braintree_vzero_dropin_ui_spec.rb
 - spec/models/gateway/braintree_vzero_hosted_fields_spec.rb
+- spec/models/spree/address_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/spec_helper.rb
 - spec/support/vcr.rb
@@ -611,6 +583,7 @@ test_files:
 - spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/returns_suceess_with_valid_nonce.yml
 - spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/using_Vault/saves_Braintree_Address_id_to_Spree_Address_when_address_is_being_saved.yml
 - spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/using_Vault/saves_unique_Braintree_Addresses_ids.yml
+- spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/using_Vault/sends_address_data_when_address_is_new.yml
 - spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/using_Vault/sends_empty_address_id_when_address_is_already_in_vault.yml
 - spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/using_Vault/stores_Transaction.yml
 - spec/vcr/Spree_Gateway_BraintreeVzeroBase/valid_credentials/_purchase/with_3DSecure_option_turned_on/performs_3DSecure_check.yml

data/app/controllers/spree/user_sessions_controller_decorator.rb

@@ -1,15 +0,0 @@
-module Spree
-  module UserSessionsControllerDecorator
-    def self.prepended(base)
-      base.before_action :associate_user, only: :create
-    end
-
-    def current_order_params
-      { currency: current_currency, guest_token: cookies.signed[:guest_token], store_id: current_store.id }
-    end
-  end
-end
-
-if defined?(::Spree::UserSessionsController)
-  ::Spree::UserSessionsController.prepend(Spree::UserSessionsControllerDecorator)
-end