solidus_stripe 4.2.0 → 4.3.0

data/bin/rails-engine

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/solidus_stripe/engine', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/bin/rails-sandbox

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+app_root = 'sandbox'
+
+unless File.exist? "#{app_root}/bin/rails"
+  warn 'Creating the sandbox app...'
+  Dir.chdir "#{__dir__}/.." do
+    system "#{__dir__}/sandbox" or begin
+      warn 'Automatic creation of the sandbox app failed'
+      exit 1
+    end
+  end
+end
+
+Dir.chdir app_root
+exec 'bin/rails', *ARGV

data/bin/sandbox

@@ -72,9 +72,11 @@ unbundled bundle exec rails generate spree:install \
   --user_class=Spree::User \
   --enforce_available_locales=true \
   --with-authentication=false \
+  --payment-method=none \
   $@
 
 unbundled bundle exec rails generate solidus:auth:install
+unbundled bundle exec rails generate ${extension_name}:install
 
 echo
 echo "🚀 Sandbox app successfully created for $extension_name!"

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: Hello world

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

@@ -9,16 +9,12 @@ module SolidusStripe
         append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/solidus_stripe\n"
       end
 
-      def add_migrations
-        run 'bundle exec rake railties:install:migrations FROM=solidus_stripe'
-      end
-
       def add_migrations
         run 'bin/rails railties:install:migrations FROM=solidus_stripe'
       end
 
       def run_migrations
-        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Metrics/LineLength
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Layout/LineLength
         if run_migrations
           run 'bin/rails db:migrate'
         else

data/lib/solidus_stripe/configuration.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module SolidusStripe
+  class Configuration
+    # Define here the settings for this extensions, e.g.:
+    #
+    # attr_accessor :my_setting
+  end
+
+  class << self
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    alias config configuration
+
+    def configure
+      yield configuration
+    end
+  end
+end

data/lib/solidus_stripe/engine.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/core'
+require 'solidus_core'
+require 'solidus_support'
 
 module SolidusStripe
   class Engine < Rails::Engine
@@ -15,20 +16,8 @@ module SolidusStripe
       g.test_framework :rspec
     end
 
-    if SolidusSupport.backend_available?
-      paths["app/views"] << "lib/views/backend"
-    end
-
-    if SolidusSupport.frontend_available?
-      paths["app/views"] << "lib/views/frontend"
-    end
-
-    if SolidusSupport.api_available?
-      paths["app/views"] << "lib/views/api"
-    end
-
     initializer "spree.payment_method.add_stripe_credit_card", after: "spree.register.payment_methods" do |app|
-      app.config.spree.payment_methods << Spree::PaymentMethod::StripeCreditCard
+      app.config.spree.payment_methods << "Spree::PaymentMethod::StripeCreditCard"
     end
   end
 end

data/lib/solidus_stripe/testing_support/card_input_helper.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module SolidusCardInputHelper
+  def fill_in_card(card = {})
+    card[:number] ||= "4242 4242 4242 4242"
+    card[:code] ||= "123"
+    card[:exp_month] ||= "01"
+    card[:exp_year] ||= "#{Time.zone.now.year + 1}"
+
+    if preferred_v3_elements || preferred_v3_intents
+      within_frame find('#card_number iframe') do
+        fill_in_number("cardnumber", card)
+      end
+      within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: card[:code] }
+      within_frame(find '#card_expiry iframe') do
+        fill_in_expiration("exp-date", card)
+      end
+    else
+      fill_in_number("Card Number", card)
+      fill_in "Card Code", with: card[:code]
+      fill_in_expiration("Expiration", card)
+    end
+  end
+
+  private
+
+  def fill_in_number(field_name, card)
+    card[:number].split('').each { |n| find_field(field_name).native.send_keys(n) }
+  end
+
+  def fill_in_expiration(field_name, card)
+    "#{card[:exp_month]}#{card[:exp_year].last(2)}".split('').each { |n| find_field(field_name).native.send_keys(n) }
+  end
+end

data/lib/solidus_stripe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusStripe
-  VERSION = "4.2.0"
+  VERSION = '4.3.0'
 end

data/lib/solidus_stripe.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "active_merchant"
-require "solidus_core"
-require "solidus_support"
-require "solidus_stripe/engine"
-require "solidus_stripe/version"
+require 'active_merchant'
+
+require 'solidus_stripe/configuration'
+require 'solidus_stripe/version'
+require 'solidus_stripe/engine'

data/lib/views/frontend/spree/checkout/payment/v2/_javascript.html.erb

@@ -66,7 +66,7 @@
 <%- if @order.has_checkout_step?('address') -%>
   <script>
     Spree.stripeAdditionalInfo = {
-      name: "<%= @order.bill_address.full_name %>",
+      name: "<%= SolidusSupport.combined_first_and_last_name_in_address? ? @order.bill_address.name : @order.bill_address.full_name %>",
       address_line1: "<%= @order.bill_address.address1 %>",
       address_line2: "<%= @order.bill_address.address2 %>",
       address_city: "<%= @order.bill_address.city %>",

data/lib/views/frontend/spree/checkout/payment/v3/_form_elements.html.erb

@@ -1,10 +1,11 @@
 <div id="payment-request-button" data-stripe-config="<%= payment_method.stripe_config(current_order).to_json %>" data-v3-api="<%= stripe_v3_api %>"></div>
 
 <% param_prefix = "payment_source[#{payment_method.id}]" %>
+<% name = SolidusSupport.combined_first_and_last_name_in_address? ? @order.name : "#{@order.billing_firstname} #{@order.billing_lastname}" %>
 
 <div class="field field-required">
   <%= label_tag "name_on_card_#{payment_method.id}", t('spree.name_on_card') %>
-  <%= text_field_tag "#{param_prefix}[name]", "#{@order.billing_firstname} #{@order.billing_lastname}", { id: "name_on_card_#{payment_method.id}", autocomplete: "cc-name" } %>
+  <%= text_field_tag "#{param_prefix}[name]", name, { id: "name_on_card_#{payment_method.id}", autocomplete: "cc-name" } %>
 </div>
 
 <div class="field field-required" data-hook="card_number">

data/solidus_stripe.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = 'https://github.com/solidusio/solidus_stripe'
   spec.metadata['changelog_uri'] = 'https://github.com/solidusio/solidus_stripe/blob/master/CHANGELOG.md'
 
-  spec.required_ruby_version = Gem::Requirement.new('~> 2.4')
+  spec.required_ruby_version = '>= 2.4.0'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
   spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'solidus_core', ['>= 2.3', '< 3']
-  spec.add_dependency 'solidus_support', '~> 0.5'
-  spec.add_dependency 'activemerchant', '>= 1.100'
+  spec.add_dependency 'solidus_core', ['>= 2.3', '< 4']
+  spec.add_dependency 'solidus_support', '~> 0.8'
+  spec.add_dependency 'activemerchant', '>= 1.105'
 
-  spec.add_development_dependency 'solidus_dev_support'
+  spec.add_development_dependency 'solidus_dev_support', '~> 2.3'
 end

data/spec/features/stripe_checkout_spec.rb

@@ -56,6 +56,10 @@ RSpec.describe "Stripe checkout", type: :feature do
     # Delivery
     expect(page).to have_current_path("/checkout/delivery")
     expect(page).to have_content("UPS Ground")
+    click_on "Save and Continue"
+
+    # Payment
+    expect(page).to have_current_path("/checkout/payment")
   end
 
   # This will fetch a token from Stripe.com and then pass that to the webserver.
@@ -65,15 +69,8 @@ RSpec.describe "Stripe checkout", type: :feature do
     let(:preferred_v3_elements) { false }
     let(:preferred_v3_intents) { false }
 
-    before do
-      click_on "Save and Continue"
-      expect(page).to have_current_path("/checkout/payment")
-    end
-
     it "can process a valid payment", js: true do
-      fill_in "Card Number", with: "4242 4242 4242 4242"
-      fill_in "Card Code", with: "123"
-      fill_in "Expiration", with: "01 / #{Time.now.year + 1}"
+      fill_in_card
       click_button "Save and Continue"
       expect(page).to have_current_path("/checkout/confirm")
       click_button "Place Order"
@@ -81,9 +78,7 @@ RSpec.describe "Stripe checkout", type: :feature do
     end
 
     it "can re-use saved cards", js: true do
-      fill_in "Card Number", with: "4242 4242 4242 4242"
-      fill_in "Card Code", with: "123"
-      fill_in "Expiration", with: "01 / #{Time.now.year + 1}"
+      fill_in_card
       click_button "Save and Continue"
 
       expect(page).to have_current_path("/checkout/confirm")
@@ -128,36 +123,31 @@ RSpec.describe "Stripe checkout", type: :feature do
     end
 
     it "shows an error with a missing credit card number", js: true do
-      fill_in "Expiration", with: "01 / #{Time.now.year + 1}"
+      fill_in_card({ number: "", code: "" })
       click_button "Save and Continue"
       expect(page).to have_content("Could not find payment information")
     end
 
     it "shows an error with a missing expiration date", js: true do
-      fill_in "Card Number", with: "4242 4242 4242 4242"
+      fill_in_card({ exp_month: "", exp_year: "" })
       click_button "Save and Continue"
       expect(page).to have_content("Your card's expiration year is invalid.")
     end
 
     it "shows an error with an invalid credit card number", js: true do
-      fill_in "Card Number", with: "1111 1111 1111 1111"
-      fill_in "Expiration", with: "01 / #{Time.now.year + 1}"
+      fill_in_card({ number: "1111 1111 1111 1111" })
       click_button "Save and Continue"
       expect(page).to have_content("Your card number is incorrect.")
     end
 
     it "shows an error with invalid security fields", js: true do
-      fill_in "Card Number", with: "4242 4242 4242 4242"
-      fill_in "Expiration", with: "01 / #{Time.now.year + 1}"
-      fill_in "Card Code", with: "12"
+      fill_in_card({ code: "12" })
       click_button "Save and Continue"
       expect(page).to have_content("Your card's security code is invalid.")
     end
 
     it "shows an error with invalid expiry fields", js: true do
-      fill_in "Card Number", with: "4242 4242 4242 4242"
-      fill_in "Expiration", with: "00 / #{Time.now.year + 1}"
-      fill_in "Card Code", with: "123"
+      fill_in_card({ exp_month: "00" })
       click_button "Save and Continue"
       expect(page).to have_content("Your card's expiration month is invalid.")
     end
@@ -165,53 +155,31 @@ RSpec.describe "Stripe checkout", type: :feature do
 
   shared_examples "Stripe Elements invalid payments" do
     it "shows an error with a missing credit card number" do
-      within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
-      within_frame(find '#card_expiry iframe') do
-        '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
-      end
+      fill_in_card({ number: "" })
       click_button "Save and Continue"
       expect(page).to have_content("Your card number is incomplete.")
     end
 
     it "shows an error with a missing expiration date" do
-      within_frame find('#card_number iframe') do
-        '4242 4242 4242 4242'.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
-      end
-      within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
+      fill_in_card({ exp_month: "", exp_year: "" })
       click_button "Save and Continue"
       expect(page).to have_content("Your card's expiration date is incomplete.")
     end
 
     it "shows an error with an invalid credit card number" do
-      within_frame find('#card_number iframe') do
-        '1111 1111 1111 1111'.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
-      end
-      within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
-      within_frame(find '#card_expiry iframe') do
-        '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
-      end
+      fill_in_card({ number: "1111 1111 1111 1111" })
       click_button "Save and Continue"
       expect(page).to have_content("Your card number is invalid.")
     end
 
     it "shows an error with invalid security fields" do
-      within_frame find('#card_number iframe') do
-        '4242 4242 4242 4242'.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
-      end
-      within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '12' }
-      within_frame(find '#card_expiry iframe') do
-        '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
-      end
+      fill_in_card({ code: "12" })
       click_button "Save and Continue"
       expect(page).to have_content("Your card's security code is incomplete.")
     end
 
     it "shows an error with invalid expiry fields" do
-      within_frame find('#card_number iframe') do
-        '4242 4242 4242 4242'.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
-      end
-      within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
-      within_frame(find '#card_expiry iframe') { fill_in 'exp-date', with: "013" }
+      fill_in_card({ exp_month: "01", exp_year: "3" })
       click_button "Save and Continue"
       expect(page).to have_content("Your card's expiration date is incomplete.")
     end
@@ -221,19 +189,8 @@ RSpec.describe "Stripe checkout", type: :feature do
     let(:preferred_v3_elements) { true }
     let(:preferred_v3_intents) { false }
 
-    before do
-      click_on "Save and Continue"
-      expect(page).to have_current_path("/checkout/payment")
-    end
-
     it "can process a valid payment" do
-      within_frame find('#card_number iframe') do
-        '4242 4242 4242 4242'.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
-      end
-      within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
-      within_frame(find '#card_expiry iframe') do
-        '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
-      end
+      fill_in_card
       click_button "Save and Continue"
       expect(page).to have_current_path("/checkout/confirm")
       click_button "Place Order"
@@ -244,13 +201,7 @@ RSpec.describe "Stripe checkout", type: :feature do
       stub_authorization!
 
       it "completes the order, captures the payment and cancels the order" do
-        within_frame find('#card_number iframe') do
-          '4242 4242 4242 4242'.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
-        end
-        within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
-        within_frame(find '#card_expiry iframe') do
-          '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
-        end
+        fill_in_card
         click_button "Save and Continue"
         expect(page).to have_current_path("/checkout/confirm")
         click_button "Place Order"
@@ -314,7 +265,9 @@ RSpec.describe "Stripe checkout", type: :feature do
             expect(page).to have_content "Completed"
           end
 
-          find('input[value="Cancel"]').click
+          page.accept_alert do
+            find('input[value="Cancel"]').click
+          end
 
           expect(page).to have_content "Order canceled"
 
@@ -332,11 +285,6 @@ RSpec.describe "Stripe checkout", type: :feature do
     let(:preferred_v3_elements) { false }
     let(:preferred_v3_intents) { true }
 
-    before do
-      click_on "Save and Continue"
-      expect(page).to have_current_path("/checkout/payment")
-    end
-
     context "when using a valid 3D Secure card" do
       it "successfully completes the checkout" do
         authenticate_3d_secure_card(card_3d_secure)
@@ -350,17 +298,8 @@ RSpec.describe "Stripe checkout", type: :feature do
     end
 
     context "when using a card without enough money" do
-      let(:card_number) { "4000 0000 0000 9995" }
-
       it "fails the payment" do
-        within_frame find('#card_number iframe') do
-          card_number.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
-        end
-        within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
-        within_frame(find '#card_expiry iframe') do
-          '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
-        end
-
+        fill_in_card({ number: "4000 0000 0000 9995" })
         click_button "Save and Continue"
 
         expect(page).to have_content "Your card has insufficient funds."
@@ -368,17 +307,8 @@ RSpec.describe "Stripe checkout", type: :feature do
     end
 
     context "when entering the wrong 3D verification code" do
-      let(:card_number) { "4000 0084 0000 1629" }
-
       it "fails the payment" do
-        within_frame find('#card_number iframe') do
-          card_number.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
-        end
-        within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
-        within_frame(find '#card_expiry iframe') do
-          '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
-        end
-
+        fill_in_card({ number: "4000 0084 0000 1629" })
         click_button "Save and Continue"
 
         within_3d_secure_modal do
@@ -457,7 +387,9 @@ RSpec.describe "Stripe checkout", type: :feature do
             expect(page).to have_content "Completed"
           end
 
-          find('input[value="Cancel"]').click
+          page.accept_alert do
+            find('input[value="Cancel"]').click
+          end
 
           expect(page).to have_content "Order canceled"
 
@@ -472,19 +404,13 @@ RSpec.describe "Stripe checkout", type: :feature do
       stub_authorization!
 
       context "when paying first with regular card, then with 3D-Secure card" do
-        let(:regular_card) { "4242 4242 4242 4242"}
+        let(:regular_card) { "4242 4242 4242 4242" }
 
         it "voids the first stripe payment and successfully pays with 3DS card" do
-          within_frame find('#card_number iframe') do
-            regular_card.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
-          end
-          within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
-          within_frame(find '#card_expiry iframe') do
-            '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
-          end
+          fill_in_card({ number: regular_card })
           click_button "Save and Continue"
 
-          expect(page).to have_content "Ending in 4242"
+          expect(page).to have_content "Ending in #{regular_card.last(4)}"
 
           click_link "Payment"
 
@@ -538,7 +464,7 @@ RSpec.describe "Stripe checkout", type: :feature do
   end
 
   def within_3d_secure_modal
-    within_frame "__privateStripeFrame11" do
+    within_frame find("iframe[src*='authorize-with-url-inner']") do
       within_frame "__stripeJSChallengeFrame" do
         within_frame "acsFrame" do
           yield
@@ -548,13 +474,7 @@ RSpec.describe "Stripe checkout", type: :feature do
   end
 
   def authenticate_3d_secure_card(card_number)
-    within_frame find('#card_number iframe') do
-      card_number.split('').each { |n| find_field('cardnumber').native.send_keys(n) }
-    end
-    within_frame(find '#card_cvc iframe') { fill_in 'cvc', with: '123' }
-    within_frame(find '#card_expiry iframe') do
-      '0132'.split('').each { |n| find_field('exp-date').native.send_keys(n) }
-    end
+    fill_in_card({ number: card_number })
     click_button "Save and Continue"
 
     within_3d_secure_modal do

data/spec/models/solidus_stripe/address_from_params_service_spec.rb

@@ -34,15 +34,26 @@ RSpec.describe SolidusStripe::AddressFromParamsService do
 
       context "when the user has an address compatible with the params" do
         before do
-          user.addresses << create(
-            :address, city: params[:city],
+          name_attributes = if SolidusSupport.combined_first_and_last_name_in_address?
+            {
+              name: 'Clark Kent'
+            }
+          else
+            {
+              firstname: 'Clark',
+              lastname: 'Kent',
+            }
+          end
+
+          address_attributes = {
+            city: params[:city],
             zipcode: params[:postalCode],
-            firstname: 'Clark',
-            lastname: 'Kent',
             address1: params[:addressLine].first,
             address2: nil,
-            phone: '555-555-0199'
-          )
+            phone: '555-555-0199',
+          }.merge!(name_attributes)
+
+          user.addresses << create(:address, address_attributes)
         end
 
         it "returns an existing user's address" do

data/spec/models/solidus_stripe/create_intents_payment_service_spec.rb

@@ -96,7 +96,7 @@ RSpec.describe SolidusStripe::CreateIntentsPaymentService do
 
     context "when there are previous pending payments" do
       let!(:payment) do
-        create(:payment, order: order).tap do |payment|
+        create(:payment, order: order, amount: order.total).tap do |payment|
           payment.update!(state: :pending)
         end
       end

data/spec/models/spree/payment_method/stripe_credit_card_spec.rb

@@ -284,4 +284,33 @@ describe Spree::PaymentMethod::StripeCreditCard do
       end
     end
   end
+
+  describe '#options_for_purchase_or_auth' do
+    let(:card) do
+      FactoryBot.create(
+        :credit_card,
+        gateway_customer_profile_id: 'cus_abcde',
+        imported: false
+      )
+    end
+
+    before do
+      allow(subject).to receive(:options_for_purchase_or_auth).and_call_original
+    end
+
+    context 'transaction_options' do
+      it 'includes basic values and keys' do
+        options = subject.send(:options_for_purchase_or_auth, 19.99, card, {})
+        expect(options[0]).to eq(19.99)
+        expect(options[1]).to eq(card)
+        expect(options[2].keys).to eq([:description, :currency, :customer])
+      end
+
+      it 'includes statement_descriptor_suffix within options' do
+        transaction_options = { statement_descriptor_suffix: 'FFFFFFF' }
+        options = subject.send(:options_for_purchase_or_auth, 19.99, card, transaction_options)
+        expect(options.last[:statement_descriptor_suffix]).to eq('FFFFFFF')
+      end
+    end
+  end
 end