solidus_braintree 2.0.0 → 3.0.0

data/spec/support/solidus_braintree/with_prepended_view_fixtures.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+RSpec.shared_context 'with prepended view fixtures' do
+  let(:view_fixtures_path) { 'spec/fixtures/views' }
+
+  before do
+    ApplicationController.prepend_view_path view_fixtures_path
+  end
+
+  after do
+    view_paths = ApplicationController.view_paths.to_a
+
+    view_paths.delete_if do |view_path|
+      view_path.to_path.match?(/#{view_fixtures_path}$/)
+    end
+
+    ApplicationController.view_paths = view_paths
+  end
+end

data/spec/{features → system}/backend/configuration_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-RSpec.describe "viewing the configuration interface" do
+RSpec.describe "viewing the configuration interface", type: :feature do
   stub_authorization!
 
   # Regression to ensure this page still renders on old versions of solidus

data/spec/{features → system}/backend/new_payment_spec.rb

@@ -1,7 +1,6 @@
-require 'spec_helper'
-require 'spree/testing_support/order_walkthrough'
+require 'solidus_braintree_helper'
 
-shared_context "with backend checkout setup" do
+RSpec.shared_context "with backend checkout setup" do
   let(:braintree) { new_gateway(active: true) }
   let!(:gateway) { create :payment_method }
   let(:order) { create(:completed_order_with_totals, number: 'R9999999') }
@@ -26,7 +25,7 @@ shared_context "with backend checkout setup" do
   end
 end
 
-describe 'creating a new payment', type: :feature, js: true do
+RSpec.describe 'creating a new payment', type: :feature, js: true do
   stub_authorization!
 
   context "with valid credit card data", vcr: {

data/spec/{features → system}/frontend/braintree_credit_card_checkout_spec.rb

@@ -1,7 +1,6 @@
-require 'spec_helper'
-require 'spree/testing_support/order_walkthrough'
+require 'solidus_braintree_helper'
 
-shared_context "with frontend checkout setup" do
+RSpec.shared_context "with frontend checkout setup" do
   let(:braintree) { new_gateway(active: true) }
   let!(:gateway) { create :payment_method }
   let(:three_d_secure_enabled) { false }
@@ -26,7 +25,7 @@ shared_context "with frontend checkout setup" do
     end
 
     order = if Spree.solidus_gem_version >= Gem::Version.new('2.6.0')
-              Spree::TestingSupport::OrderWalkthrough.up_to(:delivery)
+              SolidusBraintree::OrderWalkthrough.up_to(:delivery)
             else
               OrderWalkthrough.up_to(:delivery)
             end
@@ -36,13 +35,13 @@ shared_context "with frontend checkout setup" do
     order.number = "R9999999"
     order.recalculate
 
-    allow_any_instance_of(Spree::CheckoutController).to receive_messages(current_order: order)
-    allow_any_instance_of(Spree::CheckoutController).to receive_messages(try_spree_current_user: user)
-    allow_any_instance_of(Spree::CheckoutController).to receive_messages(spree_current_user: user)
+    allow_any_instance_of(CheckoutsController).to receive_messages(current_order: order)
+    allow_any_instance_of(CheckoutsController).to receive_messages(try_spree_current_user: user)
+    allow_any_instance_of(CheckoutsController).to receive_messages(spree_current_user: user)
     allow_any_instance_of(Spree::Payment).to receive(:number).and_return("123ABC")
     allow_any_instance_of(SolidusBraintree::Source).to receive(:nonce).and_return("fake-valid-nonce")
 
-    visit spree.checkout_state_path(:delivery)
+    visit checkout_state_path(:delivery)
     click_button "Save and Continue"
     choose("Braintree")
   end
@@ -52,12 +51,12 @@ shared_context "with frontend checkout setup" do
   end
 end
 
-describe 'entering credit card details', type: :feature, js: true do
+RSpec.describe 'entering credit card details', type: :feature, js: true do
   context 'when page loads' do
     include_context "with frontend checkout setup"
 
     it "selectors display correctly" do
-      expect(page).to have_selector("#payment_method_#{braintree.id}", visible: :visible)
+      expect(page).to have_selector("fieldset[name='payment-method-#{braintree.id}']", visible: :visible)
       expect(page).to have_selector("iframe#braintree-hosted-field-number")
       expect(page).to have_selector("iframe[type='number']")
     end
@@ -98,9 +97,12 @@ describe 'entering credit card details', type: :feature, js: true do
     end
 
     it "checks out successfully" do
-      within("#order_details") do
+      within(".confirm-step") do
         expect(page).to have_content("CONFIRM")
       end
+
+      check('accept_terms_and_conditions')
+
       click_button("Place Order")
       expect(page).to have_content("Your order has been processed successfully")
     end
@@ -111,10 +113,12 @@ describe 'entering credit card details', type: :feature, js: true do
       it 'checks out successfully' do
         authenticate_3ds
 
-        within("#order_details") do
+        within(".confirm-step") do
           expect(page).to have_content("CONFIRM")
         end
 
+        check('accept_terms_and_conditions')
+
         click_button("Place Order")
         expect(page).to have_content("Your order has been processed successfully")
       end
@@ -142,13 +146,13 @@ describe 'entering credit card details', type: :feature, js: true do
 
     it "displays an alert with a meaningful error message" do
       expect(page).to have_text I18n.t("solidus_braintree.errors.empty_fields")
-      expect(page).to have_selector("input[type='submit']:enabled")
+      expect(page).to have_selector("[type='submit']:enabled")
     end
 
     # Same error should be produced when submitting an empty form again
     context "when user tries to resubmit an empty form", vcr: { cassette_name: "checkout/invalid_credit_card" } do
       it "displays an alert with a meaningful error message" do
-        expect(page).to have_selector("input[type='submit']:enabled")
+        expect(page).to have_selector("[type='submit']:enabled")
 
         click_button "Save and Continue"
         expect(page).to have_text I18n.t("solidus_braintree.errors.empty_fields")
@@ -171,9 +175,13 @@ describe 'entering credit card details', type: :feature, js: true do
           fill_in("cvv", with: "123")
         end
         click_button("Save and Continue")
-        within("#order_details") do
+
+        within(".confirm-step") do
           expect(page).to have_content("CONFIRM")
         end
+
+        check('accept_terms_and_conditions')
+
         click_button("Place Order")
         expect(page).to have_content("Your order has been processed successfully")
       end

data/spec/{features → system}/frontend/paypal_checkout_spec.rb

@@ -1,6 +1,9 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
+require 'support/solidus_braintree/with_prepended_view_fixtures'
+
+RSpec.describe "Checkout", type: :feature, js: true do
+  include_context 'with prepended view fixtures'
 
-describe "Checkout", type: :feature, js: true do
   Capybara.default_max_wait_time = 60
 
   # let!(:store) do
@@ -149,7 +152,7 @@ describe "Checkout", type: :feature, js: true do
   end
 
   def add_mug_to_cart
-    visit spree.root_path
+    visit root_path
     click_link mug.name
     click_button "add-to-cart-button"
   end

data/spec/{features → system}/frontend/venmo_checkout_spec.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-require 'spree/testing_support/order_walkthrough'
+require 'solidus_braintree_helper'
 
-describe "Checkout", type: :feature, js: true do
+RSpec.describe "Checkout", type: :feature, js: true do
   let(:braintree_preferences) { { venmo: true }.merge(preferences) }
   let(:preferences) { {} }
   let(:user) { create(:user) }
@@ -134,22 +133,22 @@ describe "Checkout", type: :feature, js: true do
 
   def go_to_payment_checkout_page(order_number: 'R300000001' )
     order = if Spree.solidus_gem_version >= Gem::Version.new('2.6.0')
-              Spree::TestingSupport::OrderWalkthrough.up_to(:address)
+              SolidusBraintree::OrderWalkthrough.up_to(:address)
             else
               OrderWalkthrough.up_to(:address)
             end
 
     order.update!(user: user, number: order_number) # constant order number for VCRs
 
-    allow_any_instance_of(Spree::CheckoutController).to receive_messages(current_order: order)
+    allow_any_instance_of(CheckoutsController).to receive_messages(current_order: order)
 
     first_user = Spree::User.first
-    allow_any_instance_of(Spree::CheckoutController).to receive_messages(try_spree_current_user: first_user)
-    allow_any_instance_of(Spree::CheckoutController).to receive_messages(spree_current_user: first_user)
+    allow_any_instance_of(CheckoutsController).to receive_messages(try_spree_current_user: first_user)
+    allow_any_instance_of(CheckoutsController).to receive_messages(spree_current_user: first_user)
 
     allow_any_instance_of(Spree::Payment).to receive(:gateway_order_id).and_return(order_number)
 
-    visit spree.checkout_state_path(order.state)
+    visit checkout_state_path(order.state)
     next_checkout_step
   end
 
@@ -188,7 +187,7 @@ describe "Checkout", type: :feature, js: true do
 
   def disable_hosted_fields_form_listener
     # Once the submit button is enabled, the submit listener has been added
-    find("#checkout_form_payment input[type='submit']:not(:disabled)")
+    find("#checkout_form_payment [type='submit']:not(:disabled)")
     page.execute_script("$('#checkout_form_payment').off('submit');")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_braintree
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Stembolt
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-17 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.4.0.dev
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -54,7 +54,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.4.0.dev
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -64,7 +64,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.4.0.dev
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.4.0.dev
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -126,34 +126,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Uses the javascript API for seamless braintree payments
 email: braintree+gemfile@stembolt.com
 executables: []
@@ -173,45 +145,17 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/solidus_braintree_manifest.js
-- app/assets/images/solidus_braintree/venmo/venmo_active_blue_button_280x48.svg
-- app/assets/images/solidus_braintree/venmo/venmo_active_blue_button_320x48.svg
-- app/assets/images/solidus_braintree/venmo/venmo_active_blue_button_375x48.svg
-- app/assets/images/solidus_braintree/venmo/venmo_active_white_button_280x48.svg
-- app/assets/images/solidus_braintree/venmo/venmo_active_white_button_320x48.svg
-- app/assets/images/solidus_braintree/venmo/venmo_active_white_button_375x48.svg
-- app/assets/images/solidus_braintree/venmo/venmo_blue_acceptance_mark.svg
-- app/assets/images/solidus_braintree/venmo/venmo_blue_button_280x48.svg
-- app/assets/images/solidus_braintree/venmo/venmo_blue_button_320x48.svg
-- app/assets/images/solidus_braintree/venmo/venmo_blue_button_375x48.svg
-- app/assets/images/solidus_braintree/venmo/venmo_blue_logo.svg
-- app/assets/images/solidus_braintree/venmo/venmo_white_acceptance_mark.svg
-- app/assets/images/solidus_braintree/venmo/venmo_white_button_280x48.svg
-- app/assets/images/solidus_braintree/venmo/venmo_white_button_320x48.svg
-- app/assets/images/solidus_braintree/venmo/venmo_white_button_375x48.svg
-- app/assets/images/solidus_braintree/venmo/venmo_white_logo.svg
-- app/assets/javascripts/solidus_braintree/apple_pay_button.js
-- app/assets/javascripts/solidus_braintree/checkout.js
-- app/assets/javascripts/solidus_braintree/client.js
-- app/assets/javascripts/solidus_braintree/constants.js
-- app/assets/javascripts/solidus_braintree/frontend.js
-- app/assets/javascripts/solidus_braintree/hosted_form.js
-- app/assets/javascripts/solidus_braintree/paypal_button.js
-- app/assets/javascripts/solidus_braintree/paypal_messaging.js
-- app/assets/javascripts/solidus_braintree/promise.js
-- app/assets/javascripts/solidus_braintree/venmo_button.js
 - app/assets/javascripts/spree/backend/solidus_braintree.js
-- app/assets/javascripts/spree/frontend/paypal_button.js
-- app/assets/javascripts/spree/frontend/solidus_braintree.js
+- app/assets/javascripts/spree/backend/solidus_braintree/client.js
+- app/assets/javascripts/spree/backend/solidus_braintree/constants.js
+- app/assets/javascripts/spree/backend/solidus_braintree/hosted_form.js
+- app/assets/javascripts/spree/backend/solidus_braintree/promise.js
 - app/assets/stylesheets/spree/backend/solidus_braintree.scss
-- app/assets/stylesheets/spree/frontend/solidus_braintree.scss
 - app/decorators/controllers/solidus_braintree/admin_payments_controller_decorator.rb
-- app/decorators/controllers/solidus_braintree/checkout_controller_decorator.rb
 - app/decorators/controllers/solidus_braintree/client_tokens_controller.rb
-- app/decorators/controllers/solidus_braintree/orders_controller_decorator.rb
 - app/decorators/models/solidus_braintree/spree/store_decorator.rb
 - app/decorators/models/solidus_braintree/spree/user_decorator.rb
 - app/helpers/solidus_braintree/braintree_admin_helper.rb
-- app/helpers/solidus_braintree/braintree_checkout_helper.rb
 - app/models/application_record.rb
 - app/models/solidus_braintree/address.rb
 - app/models/solidus_braintree/avs_result.rb
@@ -223,21 +167,15 @@ files:
 - app/models/solidus_braintree/transaction.rb
 - app/models/solidus_braintree/transaction_address.rb
 - app/models/solidus_braintree/transaction_import.rb
-- app/overrides/spree/payments/payment/add_paypal_funding_source_to_payment.rb
 - app/views/spree/api/payments/source_views/_braintree.json.jbuilder
-- app/views/spree/checkout/existing_payment/_braintree.html.erb
-- app/views/spree/shared/_apple_pay_button.html.erb
-- app/views/spree/shared/_braintree_errors.html.erb
-- app/views/spree/shared/_braintree_head_scripts.html.erb
-- app/views/spree/shared/_braintree_hosted_fields.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/dummy-app
 - bin/rails
+- bin/rails-dummy-app
 - bin/rails-engine
 - bin/rails-sandbox
 - bin/rake
+- bin/rspec
 - bin/sandbox
 - bin/setup
 - config/locales/en.yml
@@ -255,17 +193,59 @@ files:
 - db/migrate/20211222170950_add_paypal_funding_source_to_solidus_paypal_braintree_sources.rb
 - db/migrate/20220104150301_add_venmo_to_braintree_configuration.rb
 - db/migrate/20230109080950_rename_solidus_paypal_braintree_source_type.rb
+- db/migrate/20230210104310_add_device_data_to_braintree_sources.rb
 - lib/controllers/backend/solidus_braintree/configurations_controller.rb
-- lib/controllers/frontend/solidus_braintree/checkouts_controller.rb
-- lib/controllers/frontend/solidus_braintree/transactions_controller.rb
 - lib/generators/solidus_braintree/install/install_generator.rb
-- lib/generators/solidus_braintree/install/templates/initializer.rb
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_active_blue_button_280x48.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_active_blue_button_320x48.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_active_blue_button_375x48.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_active_white_button_280x48.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_active_white_button_320x48.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_active_white_button_375x48.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_blue_acceptance_mark.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_blue_button_280x48.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_blue_button_320x48.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_blue_button_375x48.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_blue_logo.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_white_acceptance_mark.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_white_button_280x48.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_white_button_320x48.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_white_button_375x48.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/images/solidus_braintree/venmo/venmo_white_logo.svg
+- lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/paypal_button.js
+- lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree.js
+- lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree/ajax.js
+- lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree/apple_pay_button.js
+- lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree/checkout.js
+- lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree/client.js
+- lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree/constants.js
+- lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree/frontend.js
+- lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree/hosted_form.js
+- lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree/paypal_button.js
+- lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree/paypal_messaging.js
+- lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree/promise.js
+- lib/generators/solidus_braintree/install/templates/app/assets/javascripts/spree/frontend/solidus_braintree/venmo_button.js
+- lib/generators/solidus_braintree/install/templates/app/assets/stylesheets/spree/frontend/solidus_braintree.scss
+- lib/generators/solidus_braintree/install/templates/app/controllers/solidus_braintree/checkouts_controller.rb
+- lib/generators/solidus_braintree/install/templates/app/controllers/solidus_braintree/transactions_controller.rb
+- lib/generators/solidus_braintree/install/templates/app/helpers/solidus_braintree/braintree_checkout_helper.rb
+- lib/generators/solidus_braintree/install/templates/app/views/checkouts/existing_payment/_braintree.html.erb
+- lib/generators/solidus_braintree/install/templates/app/views/checkouts/payment/_braintree.html.erb
+- lib/generators/solidus_braintree/install/templates/app/views/payments/_braintree_payment_details.html.erb
+- lib/generators/solidus_braintree/install/templates/app/views/spree/shared/_apple_pay_button.html.erb
+- lib/generators/solidus_braintree/install/templates/app/views/spree/shared/_braintree_errors.html.erb
+- lib/generators/solidus_braintree/install/templates/app/views/spree/shared/_braintree_head_scripts.html.erb
+- lib/generators/solidus_braintree/install/templates/app/views/spree/shared/_braintree_hosted_fields.html.erb
+- lib/generators/solidus_braintree/install/templates/app/views/spree/shared/_paypal_cart_button.html.erb
+- lib/generators/solidus_braintree/install/templates/app/views/spree/shared/_paypal_checkout_button.html.erb
+- lib/generators/solidus_braintree/install/templates/app/views/spree/shared/_paypal_messaging.html.erb
+- lib/generators/solidus_braintree/install/templates/app/views/spree/shared/_venmo_button.html.erb
+- lib/generators/solidus_braintree/install/templates/config/initializers/solidus_braintree.rb
 - lib/solidus_braintree.rb
 - lib/solidus_braintree/country_mapper.rb
 - lib/solidus_braintree/engine.rb
 - lib/solidus_braintree/extension_configuration.rb
 - lib/solidus_braintree/request_protection.rb
-- lib/solidus_braintree/testing_support/factories.rb
 - lib/solidus_braintree/version.rb
 - lib/solidus_paypal_braintree.rb
 - lib/views/backend/solidus_braintree/configurations/list.html.erb
@@ -274,19 +254,11 @@ files:
 - lib/views/backend/spree/admin/shared/preference_fields/_preference_select.html.erb
 - lib/views/backend_v1.2/spree/admin/payments/source_forms/_braintree.html.erb
 - lib/views/backend_v2.4/spree/admin/shared/preference_fields/_hash.html.erb
-- lib/views/frontend/solidus_braintree/payments/_payment.html.erb
-- lib/views/frontend/spree/checkout/payment/_braintree.html.erb
-- lib/views/frontend/spree/shared/_paypal_checkout_button.html.erb
 - solidus_braintree.gemspec
 - spec/controllers/solidus_braintree/checkouts_controller_spec.rb
 - spec/controllers/solidus_braintree/client_tokens_controller_spec.rb
 - spec/controllers/solidus_braintree/configurations_controller_spec.rb
 - spec/controllers/solidus_braintree/transactions_controller_spec.rb
-- spec/features/backend/configuration_spec.rb
-- 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
@@ -319,7 +291,7 @@ files:
 - spec/fixtures/cassettes/source/last4.yml
 - spec/fixtures/cassettes/transaction/import/valid.yml
 - spec/fixtures/cassettes/transaction/import/valid/capture.yml
-- spec/fixtures/views/spree/orders/edit.html.erb
+- spec/fixtures/views/carts/_cart_footer.html.erb
 - spec/helpers/solidus_braintree/braintree_admin_helper_spec.rb
 - spec/helpers/solidus_braintree/braintree_checkout_helper_spec.rb
 - spec/models/solidus_braintree/address_spec.rb
@@ -332,12 +304,19 @@ files:
 - spec/models/solidus_braintree/transaction_spec.rb
 - spec/models/spree/store_spec.rb
 - spec/requests/spree/api/orders_controller_spec.rb
-- spec/spec_helper.rb
-- spec/support/capybara.rb
-- spec/support/gateway_helpers.rb
-- spec/support/order_ready_for_payment.rb
-- spec/support/vcr.rb
-- spec/support/views.rb
+- spec/solidus_braintree_helper.rb
+- spec/support/solidus_braintree/capybara.rb
+- spec/support/solidus_braintree/factories.rb
+- spec/support/solidus_braintree/gateway_helpers.rb
+- spec/support/solidus_braintree/order_ready_for_payment.rb
+- spec/support/solidus_braintree/order_walkthrough.rb
+- spec/support/solidus_braintree/vcr.rb
+- spec/support/solidus_braintree/with_prepended_view_fixtures.rb
+- spec/system/backend/configuration_spec.rb
+- spec/system/backend/new_payment_spec.rb
+- spec/system/frontend/braintree_credit_card_checkout_spec.rb
+- spec/system/frontend/paypal_checkout_spec.rb
+- spec/system/frontend/venmo_checkout_spec.rb
 homepage: https://github.com/solidusio/solidus_braintree
 licenses:
 - BSD-3-Clause
@@ -354,7 +333,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4'
@@ -373,11 +352,6 @@ test_files:
 - spec/controllers/solidus_braintree/client_tokens_controller_spec.rb
 - spec/controllers/solidus_braintree/configurations_controller_spec.rb
 - spec/controllers/solidus_braintree/transactions_controller_spec.rb
-- spec/features/backend/configuration_spec.rb
-- 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
@@ -410,7 +384,7 @@ test_files:
 - spec/fixtures/cassettes/source/last4.yml
 - spec/fixtures/cassettes/transaction/import/valid.yml
 - spec/fixtures/cassettes/transaction/import/valid/capture.yml
-- spec/fixtures/views/spree/orders/edit.html.erb
+- spec/fixtures/views/carts/_cart_footer.html.erb
 - spec/helpers/solidus_braintree/braintree_admin_helper_spec.rb
 - spec/helpers/solidus_braintree/braintree_checkout_helper_spec.rb
 - spec/models/solidus_braintree/address_spec.rb
@@ -423,9 +397,16 @@ test_files:
 - spec/models/solidus_braintree/transaction_spec.rb
 - spec/models/spree/store_spec.rb
 - spec/requests/spree/api/orders_controller_spec.rb
-- spec/spec_helper.rb
-- spec/support/capybara.rb
-- spec/support/gateway_helpers.rb
-- spec/support/order_ready_for_payment.rb
-- spec/support/vcr.rb
-- spec/support/views.rb
+- spec/solidus_braintree_helper.rb
+- spec/support/solidus_braintree/capybara.rb
+- spec/support/solidus_braintree/factories.rb
+- spec/support/solidus_braintree/gateway_helpers.rb
+- spec/support/solidus_braintree/order_ready_for_payment.rb
+- spec/support/solidus_braintree/order_walkthrough.rb
+- spec/support/solidus_braintree/vcr.rb
+- spec/support/solidus_braintree/with_prepended_view_fixtures.rb
+- spec/system/backend/configuration_spec.rb
+- spec/system/backend/new_payment_spec.rb
+- spec/system/frontend/braintree_credit_card_checkout_spec.rb
+- spec/system/frontend/paypal_checkout_spec.rb
+- spec/system/frontend/venmo_checkout_spec.rb

data/app/assets/javascripts/solidus_braintree/frontend.js

@@ -1,14 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-//= require solidus_braintree/constants
-//= require solidus_braintree/promise
-//= require solidus_braintree/client
-//= require solidus_braintree/hosted_form
-//= require solidus_braintree/paypal_button
-//= require solidus_braintree/paypal_messaging
-//= require solidus_braintree/apple_pay_button
-//= require solidus_braintree/venmo_button

data/app/assets/javascripts/spree/frontend/solidus_braintree.js

@@ -1 +0,0 @@
-//= require solidus_braintree/frontend

data/app/decorators/controllers/solidus_braintree/checkout_controller_decorator.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusBraintree
-  module CheckoutControllerDecorator
-    def self.prepended(base)
-      base.helper ::SolidusBraintree::BraintreeCheckoutHelper
-    end
-
-    ::Spree::CheckoutController.prepend(self) if SolidusSupport.frontend_available?
-  end
-end

data/app/decorators/controllers/solidus_braintree/orders_controller_decorator.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusBraintree
-  module OrdersControllerDecorator
-    def self.prepended(base)
-      base.helper ::SolidusBraintree::BraintreeCheckoutHelper
-    end
-
-    ::Spree::OrdersController.prepend(self) if SolidusSupport.frontend_available?
-  end
-end

data/app/overrides/spree/payments/payment/add_paypal_funding_source_to_payment.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-Deface::Override.new(
-  name: "payments/payment/add_paypal_funding_source_to_payment",
-  virtual_path: "spree/payments/_payment",
-  original: "0b5b5ae53626059cb3a202ef95d10827dd399925",
-  insert_after: "erb[loud]:contains('content_tag(:span, payment.payment_method.name)')",
-  partial: "solidus_braintree/payments/payment"
-)

data/app/views/spree/checkout/existing_payment/_braintree.html.erb

@@ -1,10 +0,0 @@
-<tr id="<%= dom_id(wallet_payment_source, 'spree')%>" class="<%= cycle('even', 'odd') %>">
-  <td>
-    <%= radio_button_tag "order[wallet_payment_source_id]",
-                          wallet_payment_source.id,
-                          default,
-                          class: "existing-cc-radio" %>
-  </td>
-  <td><%= wallet_payment_source.payment_source.friendly_payment_type %></td>
-  <td><%= wallet_payment_source.payment_source.display_number %></td>
-</tr>