solidus_braintree 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f340c33dec5f35dd03bac9f9a2bf3095427830660f1734a2d935bc67a467f50
-  data.tar.gz: ab812a051e994167f02e06ed837ab787bb04f066b28c70fb7722ef5df69926f2
+  metadata.gz: b7ae76586a99aff5a6eb02f0ab111d2d7d204c2e4b69cdb67b076b462a724baa
+  data.tar.gz: 4af1563fbbfe0de86743e720779e6afcb229a90d6fa68be6d2528a1ad5aed2a2
 SHA512:
-  metadata.gz: 2e76189208e65294af94852934d92336abebead463a9d5cff9d0fa3f2143a4180695d44aae868df09edd7442c1d405d5c110d76604fa966f271b28467d954375
-  data.tar.gz: 9ca05b003010435f31f98d7d48bdfaeed1276854759d9e213252c68936e0eb23c7dd0524d808c7d9a5640d0da1e57e8fe7e26e417be7733fbf4ab2af82e1fb42
+  metadata.gz: 845b6fccabb214dfbda78b8d5480e2efc8c9ecffebb3d41084f57a4c7bd3008f81333f84e43024b9e019006458888cc3d5a46f26073c60ffee9b63c2abd7ecc6
+  data.tar.gz: 00bfd9d0d54cdd8b9abd65d0dd8f9e3b99d6bdcbc4ea3d4540339dad8e584e44c053c1da927e9706ae3898cad6e5f9fbc11fce9f981ce69e3317ea530d2256ef

data/.circleci/config.yml

@@ -20,7 +20,7 @@ commands:
             sudo apt-get update
             sudo apt-get install -yq libvips-dev
       - solidusio_extensions/test-branch:
-          branch: master
+          branch: main
           command: |
             export FRONTEND=starter
             sudo gem update --system
@@ -66,14 +66,14 @@ workflows:
       - run-specs-with-sqlite
       - lint-code
 
-  "Weekly run specs against master":
+  "Weekly run specs against main":
     triggers:
       - schedule:
           cron: "0 0 * * 4" # every Thursday
           filters:
             branches:
               only:
-                - master
+                - main
     jobs:
       - run-specs-with-postgres
       - run-specs-with-mysql

data/.rspec

@@ -1,2 +1,2 @@
 --color
---require spec_helper
+--require solidus_braintree_spec_helper

data/Gemfile

@@ -3,13 +3,9 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
+branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
 gem 'solidus', github: 'solidusio/solidus', branch: branch
 
-# The solidus_frontend gem has been pulled out since v3.2
-gem 'solidus_frontend', github: 'solidusio/solidus_frontend' if branch == 'master'
-gem 'solidus_frontend' if branch >= 'v3.2' # rubocop:disable Bundler/DuplicatedGem
-
 # Needed to help Bundler figure out how to resolve dependencies,
 # otherwise it takes forever to resolve them.
 # See https://github.com/bundler/bundler/issues/6677

data/README.md

@@ -1,7 +1,7 @@
 # SolidusBraintree
 
 [![CircleCI](https://circleci.com/gh/solidusio/solidus_braintree.svg?style=shield)](https://circleci.com/gh/solidusio/solidus_braintree)
-[![codecov](https://codecov.io/gh/solidusio/solidus_braintree/branch/master/graph/badge.svg)](https://codecov.io/gh/solidusio/solidus_braintree)
+[![codecov](https://codecov.io/gh/solidusio/solidus_braintree/branch/main/graph/badge.svg)](https://codecov.io/gh/solidusio/solidus_braintree)
 
 `solidus_braintree` is an extension that adds support for using [Braintree](https://www.braintreepayments.com) as a payment source in your [Solidus](https://solidus.io/) store. It uses Braintree's [JavaScript v3 SDK](https://braintree.github.io/braintree-web/current/) to support the following Braintree payment method types:
 
@@ -35,13 +35,13 @@ Here are the versions of SolidusBraintree and their compatible Solidus and front
 
 | Version              | Maintenance Status          | Frontend               | Branch   |
 |----------------------|-----------------------------|------------------------|----------|
-| SolidusBraintree 3.0 | New features                | SolidusStarterFrontend | [master] |
+| SolidusBraintree 3.0 | New features                | SolidusStarterFrontend | [main]   |
 | SolidusBraintree 2.0 | Security patches, bug fixes | SolidusFrontend        | [v2.x]   |
 | SolidusBraintree 1.2 | Deprecated                  | SolidusFrontend        | [v1.x]   |
 
 [v1.x]: https://github.com/solidusio/solidus_braintree/tree/v1.x
 [v2.x]: https://github.com/solidusio/solidus_braintree/tree/v2.x
-[master]: https://github.com/solidusio/solidus_braintree/tree/master
+[main]: https://github.com/solidusio/solidus_braintree/tree/main
 
 ## Basic Setup
 

data/Rakefile

@@ -10,3 +10,6 @@ task :default do
     sh 'bin/rspec'
   end
 end
+
+CLOBBER.include('dummy-app')
+CLOBBER.include('sandbox')

data/bin/dummy-app

@@ -28,10 +28,8 @@ if [ ! -d "dummy-app" ]; then
 fi
 
 cd ./dummy-app
-unbundled bundle add solidus --github solidusio/solidus --branch "${BRANCH:-master}" --version '> 0.a'
+unbundled bundle add solidus --github solidusio/solidus --branch "${BRANCH:-main}" --version '> 0.a'
 unbundled bundle exec rake db:drop db:create
 unbundled bundle exec rails generate solidus:install --auto-accept --payment-method=none --no-seed --no-sample "$@"
 unbundled bundle add $extension_name --path ..
 unbundled bundle exec rails generate $extension_name:install --migrate --specs=all
-
-

data/bin/rspec

@@ -2,6 +2,7 @@
 
 set -e
 
+echo "Updating the dummy app..."
 bin/rails-dummy-app generate solidus_braintree:install --force --migrate --specs=all
 
 cd dummy-app/

data/bin/sandbox

@@ -22,7 +22,7 @@ if [ ! -z $SOLIDUS_BRANCH ]
 then
   BRANCH=$SOLIDUS_BRANCH
 else
-  BRANCH="master"
+  BRANCH="main"
 fi
 
 extension_name="solidus_braintree"
@@ -47,7 +47,7 @@ if [ ! -d "sandbox" ]; then
 fi
 
 cd ./sandbox
-unbundled bundle add solidus --github solidusio/solidus --branch "${BRANCH:-master}" --version '> 0.a'
+unbundled bundle add solidus --github solidusio/solidus --branch "${BRANCH:-main}" --version '> 0.a'
 unbundled bundle exec rake db:drop db:create
 unbundled bundle exec rails generate solidus:install --payment-method=none --auto-accept "$@"
 unbundled bundle add ${extension_name} --path '../'

data/lib/generators/solidus_braintree/install/install_generator.rb

@@ -119,7 +119,7 @@ module SolidusBraintree
             when 'all' then %w[spec]
             when 'frontend'
               %w[
-                spec/solidus_braintree_helper.rb
+                spec/solidus_braintree_spec_helper.rb
                 spec/system/frontend
                 spec/support
                 spec/fixtures

data/lib/solidus_braintree/engine.rb

@@ -56,12 +56,22 @@ module SolidusBraintree
 
       initializer "solidus_braintree_admin_menu_item", after: "register_solidus_braintree_gateway" do
         Spree::Backend::Config.configure do |config|
-          config.menu_items << config.class::MenuItem.new(
-            [:braintree],
-            'cc-paypal',
-            url: '/solidus_braintree/configurations/list',
-            condition: -> { can?(:list, SolidusBraintree::Configuration) }
-          )
+          config.menu_items <<
+            if Spree.solidus_gem_version >= Gem::Version.new('4.2')
+              config.class::MenuItem.new(
+                label: :braintree,
+                icon: 'cc-paypal',
+                url: '/solidus_braintree/configurations/list',
+                condition: -> { can?(:list, SolidusBraintree::Configuration) }
+              )
+            else
+              config.class::MenuItem.new(
+                [:braintree],
+                'cc-paypal',
+                url: '/solidus_braintree/configurations/list',
+                condition: -> { can?(:list, SolidusBraintree::Configuration) }
+              )
+            end
         end
       end
     end

data/lib/solidus_braintree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBraintree
-  VERSION = '3.0.1'
+  VERSION = '3.1.0'
 end

data/solidus_braintree.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activemerchant', '~> 1.48'
   spec.add_dependency 'braintree', '~> 3.4'
   spec.add_dependency 'solidus_api', ['>= 3.4.0.dev', '< 5']
+  spec.add_dependency 'solidus_backend', ['>= 3.4.0.dev', '< 5']
   spec.add_dependency 'solidus_core', ['>= 3.4.0.dev', '< 5']
   spec.add_dependency 'solidus_support', ['>= 0.8.1', '< 1']
 

data/spec/controllers/solidus_braintree/checkouts_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 require 'support/solidus_braintree/order_ready_for_payment'
 
 RSpec.describe SolidusBraintree::CheckoutsController, type: :controller do

data/spec/controllers/solidus_braintree/client_tokens_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe SolidusBraintree::ClientTokensController do
   routes { SolidusBraintree::Engine.routes }

data/spec/controllers/solidus_braintree/configurations_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe SolidusBraintree::ConfigurationsController, type: :controller do
   routes { SolidusBraintree::Engine.routes }

data/spec/controllers/solidus_braintree/transactions_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe SolidusBraintree::TransactionsController, type: :controller do
   routes { SolidusBraintree::Engine.routes }

data/spec/helpers/solidus_braintree/braintree_admin_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe SolidusBraintree::BraintreeAdminHelper do
   describe '#braintree_transaction_link' do

data/spec/helpers/solidus_braintree/braintree_checkout_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe SolidusBraintree::BraintreeCheckoutHelper do
   let!(:store) { create :store }

data/spec/models/solidus_braintree/address_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe SolidusBraintree::Address do
   describe "::split_name" do

data/spec/models/solidus_braintree/avs_result_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe SolidusBraintree::AVSResult do
   describe 'AVS response message' do

data/spec/models/solidus_braintree/gateway_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 require 'webmock'
 require 'support/solidus_braintree/order_ready_for_payment'
 

data/spec/models/solidus_braintree/response_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe SolidusBraintree::Response do
   let(:failed_transaction) { nil }

data/spec/models/solidus_braintree/source_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 require 'support/solidus_braintree/order_ready_for_payment'
 
 RSpec.describe SolidusBraintree::Source, type: :model do

data/spec/models/solidus_braintree/transaction_address_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe SolidusBraintree::TransactionAddress do
   describe "#valid?" do

data/spec/models/solidus_braintree/transaction_import_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe SolidusBraintree::TransactionImport do
   let(:order) { Spree::Order.new }

data/spec/models/solidus_braintree/transaction_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe SolidusBraintree::Transaction do
   describe "#valid?" do

data/spec/models/spree/store_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe Spree::Store do
   describe 'before_create :build_default_configuration' do

data/spec/requests/spree/api/orders_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe Spree::Api::OrdersController, type: :request do
   stub_authorization!

data/spec/{solidus_braintree_helper.rb → solidus_braintree_spec_helper.rb}

@@ -1,7 +1,9 @@
-require 'solidus_starter_frontend_helper'
+require 'solidus_starter_frontend_spec_helper'
 
 require 'support/solidus_braintree/capybara'
 require 'support/solidus_braintree/factories'
 require 'support/solidus_braintree/gateway_helpers'
 require 'support/solidus_braintree/order_walkthrough'
 require 'support/solidus_braintree/vcr'
+
+Braintree::Configuration.logger = Rails.logger

data/spec/support/solidus_braintree/order_ready_for_payment.rb

@@ -21,7 +21,7 @@ RSpec.shared_context 'when order is ready for payment' do
 
   let(:order) do
     order = Spree::Order.create!(
-      line_items: [create(:line_item, price: 50)],
+      line_items: create_list(:line_item, 1, price: 50),
       email: 'test@example.com',
       bill_address: address,
       ship_address: address,

data/spec/support/solidus_braintree/vcr.rb

@@ -35,8 +35,4 @@ VCR.configure do |c|
 
     !r1_resource.nil? && r1_resource == r2_resource
   end
-
-  # https://github.com/titusfortner/webdrivers/wiki/Using-with-VCR-or-WebMock
-  driver_hosts = Webdrivers::Common.subclasses.map { |driver| URI(driver.base_url).host }
-  c.ignore_hosts(*driver_hosts)
 end

data/spec/system/backend/configuration_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe "viewing the configuration interface", type: :feature do
   stub_authorization!

data/spec/system/backend/new_payment_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.shared_context "with backend checkout setup" do
   let(:braintree) { new_gateway(active: true) }

data/spec/system/frontend/braintree_credit_card_checkout_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.shared_context "with frontend checkout setup" do
   let(:braintree) { new_gateway(active: true) }

data/spec/system/frontend/paypal_checkout_spec.rb

@@ -1,4 +1,4 @@
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 require 'support/solidus_braintree/with_prepended_view_fixtures'
 
 RSpec.describe "Checkout", type: :feature, js: true do

data/spec/system/frontend/venmo_checkout_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'solidus_braintree_helper'
+require 'solidus_braintree_spec_helper'
 
 RSpec.describe "Checkout", type: :feature, js: true do
   let(:braintree_preferences) { { venmo: true }.merge(preferences) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_braintree
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Stembolt
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -58,6 +58,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: solidus_backend
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.0.dev
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.0.dev
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
@@ -305,7 +325,7 @@ files:
 - spec/models/solidus_braintree/transaction_spec.rb
 - spec/models/spree/store_spec.rb
 - spec/requests/spree/api/orders_controller_spec.rb
-- spec/solidus_braintree_helper.rb
+- spec/solidus_braintree_spec_helper.rb
 - spec/support/solidus_braintree/capybara.rb
 - spec/support/solidus_braintree/factories.rb
 - spec/support/solidus_braintree/gateway_helpers.rb
@@ -343,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.23
 signing_key:
 specification_version: 4
 summary: Officially supported Braintree extension
@@ -397,7 +417,7 @@ test_files:
 - spec/models/solidus_braintree/transaction_spec.rb
 - spec/models/spree/store_spec.rb
 - spec/requests/spree/api/orders_controller_spec.rb
-- spec/solidus_braintree_helper.rb
+- spec/solidus_braintree_spec_helper.rb
 - spec/support/solidus_braintree/capybara.rb
 - spec/support/solidus_braintree/factories.rb
 - spec/support/solidus_braintree/gateway_helpers.rb