solidus_braintree 2.0.0 → 3.0.1

data/spec/controllers/solidus_braintree/client_tokens_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe SolidusBraintree::ClientTokensController do
+RSpec.describe SolidusBraintree::ClientTokensController do
   routes { SolidusBraintree::Engine.routes }
 
   cassette_options = { cassette_name: "braintree/token" }

data/spec/controllers/solidus_braintree/configurations_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe SolidusBraintree::ConfigurationsController, type: :controller do
+RSpec.describe SolidusBraintree::ConfigurationsController, type: :controller do
   routes { SolidusBraintree::Engine.routes }
 
   let!(:store_1) { create :store }

data/spec/controllers/solidus_braintree/transactions_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
 RSpec.describe SolidusBraintree::TransactionsController, type: :controller do
   routes { SolidusBraintree::Engine.routes }
@@ -130,7 +130,7 @@ RSpec.describe SolidusBraintree::TransactionsController, type: :controller do
       context "when format is HTML" do
         context "when import! leaves the order in confirm" do
           it "redirects the user to the confirm page" do
-            expect(post_create).to redirect_to spree.checkout_state_path("confirm")
+            expect(post_create).to redirect_to '/checkout/confirm'
           end
         end
 
@@ -138,7 +138,7 @@ RSpec.describe SolidusBraintree::TransactionsController, type: :controller do
           before { allow(order).to receive(:complete?).and_return(true) }
 
           it "displays the order to the user" do
-            expect(post_create).to redirect_to spree.order_path(order)
+            expect(post_create).to redirect_to "/orders/#{order.number}"
           end
         end
       end

data/spec/fixtures/views/carts/_cart_footer.html.erb

@@ -0,0 +1,18 @@
+<% order = order_form.object %>
+
+<footer class="cart-footer">
+  <p class="cart-footer__total">
+    <%= t('spree.total') %>: <strong><%= order.display_total %></strong>
+  </p>
+
+  <div class="cart-footer__primary-action">
+    <%= order_form.button(
+      I18n.t('spree.checkout'),
+      class: 'button-primary',
+      id: 'checkout-link',
+      name: :checkout
+    ) %>
+  </div>
+
+  <%= render "spree/shared/paypal_cart_button" %>
+</footer>

data/spec/helpers/solidus_braintree/braintree_admin_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'solidus_braintree_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 'spec_helper'
+require 'solidus_braintree_helper'
 
 RSpec.describe SolidusBraintree::BraintreeCheckoutHelper do
   let!(:store) { create :store }

data/spec/models/solidus_braintree/address_spec.rb

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

data/spec/models/solidus_braintree/avs_result_spec.rb

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

data/spec/models/solidus_braintree/gateway_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 require 'webmock'
-require 'support/order_ready_for_payment'
+require 'support/solidus_braintree/order_ready_for_payment'
 
 RSpec.describe SolidusBraintree::Gateway do
   let(:gateway) do
@@ -16,7 +16,8 @@ RSpec.describe SolidusBraintree::Gateway do
       nonce: 'fake-valid-nonce',
       user: user,
       payment_type: payment_type,
-      payment_method: gateway
+      payment_method: gateway,
+      device_data: 'fake-device-data'
     )
   end
 
@@ -220,6 +221,37 @@ RSpec.describe SolidusBraintree::Gateway do
           expect(authorize.message).to eq 'authorized'
           expect(authorize.authorization).to be_present
         end
+
+        context 'with available device data' do
+          it 'passes the device data as a parameter in the request' do
+            expect_any_instance_of(Braintree::TransactionGateway).
+              to receive(:sale).
+              with(hash_including({ device_data: "fake-device-data" })).and_call_original
+            authorize
+          end
+        end
+
+        context 'without device_data' do
+          let(:source) do
+            SolidusBraintree::Source.create!(
+              nonce: 'fake-valid-nonce',
+              user: user,
+              payment_type: payment_type,
+              payment_method: gateway
+            )
+          end
+
+          before do
+            allow_any_instance_of(Braintree::TransactionGateway).to receive(:sale).and_call_original
+          end
+
+          it 'does not pass any device data in the request' do
+            expect_any_instance_of(Braintree::TransactionGateway)
+              .not_to receive(:sale).with(hash_including({ device_data: "" }))
+
+            authorize
+          end
+        end
       end
 
       context 'with different merchant account for currency', vcr: {

data/spec/models/solidus_braintree/response_spec.rb

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

data/spec/models/solidus_braintree/source_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
+require 'support/solidus_braintree/order_ready_for_payment'
 
 RSpec.describe SolidusBraintree::Source, type: :model do
   include_context 'when order is ready for payment'
@@ -536,4 +537,19 @@ RSpec.describe SolidusBraintree::Source, type: :model do
       it { is_expected.to be_falsy }
     end
   end
+
+  describe "#device_data" do
+    let(:payment_source) { build(:solidus_braintree_source) }
+
+    context "when blank on validation" do
+      before do
+        payment_source.device_data = ""
+        payment_source.valid?
+      end
+
+      it "is set to nil" do
+        expect(payment_source.device_data).to be_nil
+      end
+    end
+  end
 end

data/spec/models/solidus_braintree/transaction_address_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe SolidusBraintree::TransactionAddress do
+RSpec.describe SolidusBraintree::TransactionAddress do
   describe "#valid?" do
     subject { address.valid? }
 

data/spec/models/solidus_braintree/transaction_import_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe SolidusBraintree::TransactionImport do
+RSpec.describe SolidusBraintree::TransactionImport do
   let(:order) { Spree::Order.new }
   let!(:country) { create :country, iso: "US" }
   let(:braintree_gateway) { SolidusBraintree::Gateway.new }

data/spec/models/solidus_braintree/transaction_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe SolidusBraintree::Transaction do
+RSpec.describe SolidusBraintree::Transaction do
   describe "#valid?" do
     subject { transaction.valid? }
 

data/spec/models/spree/store_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe Spree::Store do
+RSpec.describe Spree::Store do
   describe 'before_create :build_default_configuration' do
     context 'when a braintree_configuration record already exists' do
       it 'does not overwrite it' do

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

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'solidus_braintree_helper'
 
-describe Spree::Api::OrdersController, type: :request do
+RSpec.describe Spree::Api::OrdersController, type: :request do
   stub_authorization!
 
   describe 'get show' do

data/spec/solidus_braintree_helper.rb

@@ -0,0 +1,7 @@
+require 'solidus_starter_frontend_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'

data/{lib/solidus_braintree/testing_support → spec/support/solidus_braintree}/factories.rb

@@ -28,26 +28,28 @@ FactoryBot.define do
       payment_type { SolidusBraintree::Source::APPLE_PAY }
     end
   end
-end
 
-FactoryBot.modify do
-  # The Solidus address factory randomizes the zipcode.
-  # The OrderWalkThrough we use in the credit card checkout spec uses this factory for the user addresses.
-  # For credit card payments we transmit the billing address to braintree, for paypal payments the shipping address.
-  # As we match the body in our VCR settings VCR can not match the request anymore and therefore cannot replay existing
-  # cassettes.
-  #
+  factory :solidus_braintree_address, parent: :address do
+    trait :with_fixed_zipcode do
+      # The Solidus address factory randomizes the zipcode. The OrderWalkThrough
+      # we use in the credit card checkout spec uses this factory for the user
+      # addresses. For credit card payments we transmit the billing address to
+      # braintree, for paypal payments the shipping address. As we match the
+      # body in our VCR settings VCR can not match the request anymore and
+      # therefore cannot replay existing cassettes.
 
-  factory :address do
-    zipcode { '21088-0255' }
+      zipcode { '21088-0255' }
+    end
 
     if SolidusSupport.combined_first_and_last_name_in_address?
-      transient do
-        firstname { "John" }
-        lastname { "Doe" }
-      end
+      trait :with_first_and_last_name do
+        transient do
+          firstname { "John" }
+          lastname { "Doe" }
+        end
 
-      name { "#{firstname} #{lastname}" }
+        name { "#{firstname} #{lastname}" }
+      end
     end
   end
 end

data/spec/support/{order_ready_for_payment.rb → solidus_braintree/order_ready_for_payment.rb}

@@ -1,8 +1,15 @@
-shared_context 'when order is ready for payment' do
+RSpec.shared_context 'when order is ready for payment' do
   let!(:country) { create :country }
 
   let(:user) { create :user }
-  let(:address) { create :address, zipcode: "90210", lastname: "Doe", country: country }
+
+  let(:address) do
+    create :solidus_braintree_address,
+      :with_first_and_last_name,
+      zipcode: "90210",
+      lastname: "Doe",
+      country: country
+  end
 
   before do
     create :shipping_method, cost: 5

data/spec/support/solidus_braintree/order_walkthrough.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module SolidusBraintree
+  class OrderWalkthrough
+    def self.up_to(state, user: nil)
+      new.up_to(state, user: user)
+    end
+
+    def up_to(state, user: nil)
+      # Need to create a valid zone too...
+      @zone = ::FactoryBot.create(:zone)
+      @country = ::FactoryBot.create(:country)
+      @state = ::FactoryBot.create(:state, country: @country)
+
+      @zone.members << ::Spree::ZoneMember.create(zoneable: @country)
+
+      # A shipping method must exist for rates to be displayed on checkout page
+      ::FactoryBot.create(:shipping_method, zones: [@zone]).tap do |sm|
+        sm.calculator.preferred_amount = 10
+        sm.calculator.preferred_currency = ::Spree::Config[:currency]
+        sm.calculator.save
+      end
+
+      order = ::Spree::Order.create!(
+        user: user,
+        email: "solidus@example.com",
+        store: ::Spree::Store.first || ::FactoryBot.create(:store)
+      )
+      add_line_item!(order)
+      order.next!
+
+      states_to_process = if state == :complete
+                            states
+                          else
+                            end_state_position = states.index(state.to_sym)
+                            states[..end_state_position]
+                          end
+
+      states_to_process.each do |state_to_process|
+        send(state_to_process, order)
+      end
+
+      order
+    end
+
+    private
+
+    def add_line_item!(order)
+      ::FactoryBot.create(:line_item, order: order)
+      order.reload
+    end
+
+    def address(order)
+      order.bill_address =
+        ::FactoryBot.create(:solidus_braintree_address, :with_fixed_zipcode, country: @country, state: @state)
+
+      order.ship_address =
+        ::FactoryBot.create(:solidus_braintree_address, :with_fixed_zipcode, country: @country, state: @state)
+
+      order.next!
+    end
+
+    def delivery(order)
+      order.next!
+    end
+
+    def payment(order)
+      credit_card = ::FactoryBot.create(:credit_card, user: order.user)
+      order.payments.create!(payment_method: credit_card.payment_method, amount: order.total, source: credit_card)
+      # TODO: maybe look at some way of making this payment_state change automatic
+      order.payment_state = 'paid'
+      order.next!
+    end
+
+    def confirm(order)
+      order.complete!
+    end
+
+    def complete(order)
+      # noop?
+    end
+
+    def states
+      [:address, :delivery, :payment, :confirm]
+    end
+  end
+end

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