solidus_stripe 3.0.0 → 4.1.0

data/bin/r

@@ -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/rake

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/sandbox

@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+set -e
+
+case "$DB" in
+postgres|postgresql)
+  RAILSDB="postgresql"
+  ;;
+mysql)
+  RAILSDB="mysql"
+  ;;
+sqlite|'')
+  RAILSDB="sqlite3"
+  ;;
+*)
+  echo "Invalid DB specified: $DB"
+  exit 1
+  ;;
+esac
+
+if [ ! -z $SOLIDUS_BRANCH ]
+then
+  BRANCH=$SOLIDUS_BRANCH
+else
+  BRANCH="master"
+fi
+
+extension_name="solidus_stripe"
+
+# Stay away from the bundler env of the containing extension.
+function unbundled {
+  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- $@
+}
+
+rm -rf ./sandbox
+unbundled bundle exec rails new sandbox --database="$RAILSDB" \
+  --skip-bundle \
+  --skip-git \
+  --skip-keeps \
+  --skip-rc \
+  --skip-spring \
+  --skip-test \
+  --skip-javascript
+
+if [ ! -d "sandbox" ]; then
+  echo 'sandbox rails application failed'
+  exit 1
+fi
+
+cd ./sandbox
+cat <<RUBY >> Gemfile
+gem 'solidus', github: 'solidusio/solidus', branch: '$BRANCH'
+gem 'solidus_auth_devise', '>= 2.1.0'
+gem 'rails-i18n'
+gem 'solidus_i18n'
+
+gem '$extension_name', path: '..'
+
+group :test, :development do
+  platforms :mri do
+    gem 'pry-byebug'
+  end
+end
+RUBY
+
+unbundled bundle install --gemfile Gemfile
+
+unbundled bundle exec rake db:drop db:create
+
+unbundled bundle exec rails generate spree:install \
+  --auto-accept \
+  --user_class=Spree::User \
+  --enforce_available_locales=true \
+  --with-authentication=false \
+  $@
+
+unbundled bundle exec rails generate solidus:auth:install
+
+echo
+echo "🚀 Sandbox app successfully created for $extension_name!"
+echo "🚀 Using $RAILSDB and Solidus $BRANCH"
+echo "🚀 Use 'export DB=[postgres|mysql|sqlite]' to control the DB adapter"
+echo "🚀 Use 'export SOLIDUS_BRANCH=<BRANCH-NAME>' to control the Solidus version"
+echo "🚀 This app is intended for test purposes."

data/bin/sandbox_rails

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

data/bin/setup

@@ -5,4 +5,4 @@ set -vx
 
 gem install bundler --conservative
 bundle update
-bundle exec rake extension:test_app
+bin/rake clobber

data/config/routes.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 Spree::Core::Engine.routes.draw do
   # route to a deprecated controller, will be removed in the future:
   post '/stripe/confirm_payment', to: 'stripe#confirm_payment'
 
   # payment intents routes:
-  post '/stripe/confirm_intents', to: '/solidus_stripe/intents#confirm'
+  post '/stripe/create_intent', to: '/solidus_stripe/intents#create_intent'
+  post '/stripe/create_payment', to: '/solidus_stripe/intents#create_payment'
 
   # payment request routes:
   post '/stripe/shipping_rates', to: '/solidus_stripe/payment_request#shipping_rates'

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

@@ -13,12 +13,16 @@ module SolidusStripe
         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]'))
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]')) # rubocop:disable Metrics/LineLength
         if run_migrations
-          run 'bundle exec rake db:migrate'
+          run 'bin/rails db:migrate'
         else
-          puts 'Skipping rake db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
+          puts 'Skipping bin/rails db:migrate, don\'t forget to run it!' # rubocop:disable Rails/Output
         end
       end
 

data/lib/solidus_stripe/engine.rb

@@ -4,9 +4,9 @@ require 'spree/core'
 
 module SolidusStripe
   class Engine < Rails::Engine
-    include SolidusSupport::EngineExtensions::Decorators
+    include SolidusSupport::EngineExtensions
 
-    isolate_namespace Spree
+    isolate_namespace ::Spree
 
     engine_name 'solidus_stripe'
 

data/lib/solidus_stripe/factories.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+end

data/lib/solidus_stripe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusStripe
-  VERSION = "3.0.0"
+  VERSION = "4.1.0"
 end

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

@@ -1,6 +1,5 @@
 <div id="payment-request-button" data-stripe-config="<%= payment_method.stripe_config(current_order).to_json %>" data-v3-api="<%= stripe_v3_api %>"></div>
 
-<%= image_tag 'credit_cards/credit_card.gif', id: 'credit-card-image' %>
 <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
 <div class="field field-required">

data/solidus_stripe.gemspec

@@ -1,40 +1,37 @@
 # frozen_string_literal: true
 
-$:.push File.expand_path('lib', __dir__)
-require 'solidus_stripe/version'
-
-Gem::Specification.new do |s|
-  s.name = 'solidus_stripe'
-  s.version = SolidusStripe::VERSION
-  s.summary     = "Stripe Payment Method for Solidus"
-  s.description = s.summary
-  s.required_ruby_version = ">= 2.2"
-
-  s.author       = "Solidus Team"
-  s.email        = "contact@solidus.io"
-  s.homepage     = "https://solidus.io"
-  s.license      = 'BSD-3'
-
-  if s.respond_to?(:metadata)
-    s.metadata["homepage_uri"] = s.homepage if s.homepage
-    s.metadata["source_code_uri"] = s.homepage if s.homepage
-  end
-
-  s.files        = `git ls-files`.split("\n")
-  s.test_files   = `git ls-files -- spec/*`.split("\n")
-  s.require_path = "lib"
-  s.requirements << "none"
-
-  s.bindir = "exe"
-  s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
-
-  s.add_dependency 'solidus_core', ['>= 2.3', '< 3']
-  s.add_dependency 'solidus_support', '~> 0.4.0'
-  # ActiveMerchant v1.58 through v1.59 introduced a breaking change
-  # to the stripe gateway.
-  #
-  # This was resolved in v1.60, but we still need to skip 1.58 & 1.59.
-  s.add_dependency "activemerchant", ">= 1.100" # includes "Stripe Payment Intents: Fix fallback for Store"
-
-  s.add_development_dependency 'solidus_dev_support'
+require_relative 'lib/solidus_stripe/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'solidus_stripe'
+  spec.version = SolidusStripe::VERSION
+  spec.authors = ['Solidus Team']
+  spec.email = 'contact@solidus.io'
+
+  spec.summary = 'Stripe Payment Method for Solidus'
+  spec.description = 'Stripe Payment Method for Solidus'
+  spec.homepage = 'https://github.com/solidusio/solidus_stripe#readme'
+  spec.license = 'BSD-3'
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  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')
+
+  # 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.
+  files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
+
+  spec.files = files.grep_v(%r{^(test|spec|features)/})
+  spec.test_files = files.grep(%r{^(test|spec|features)/})
+  spec.bindir = "exe"
+  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_development_dependency 'solidus_dev_support'
 end

data/spec/features/stripe_checkout_spec.rb

@@ -6,6 +6,8 @@ RSpec.describe "Stripe checkout", type: :feature do
   let(:zone) { FactoryBot.create(:zone) }
   let(:country) { FactoryBot.create(:country) }
 
+  let(:card_3d_secure) { "4000 0025 0000 3155" }
+
   before do
     FactoryBot.create(:store)
     zone.members << Spree::ZoneMember.create!(zoneable: country)
@@ -215,7 +217,7 @@ RSpec.describe "Stripe checkout", type: :feature do
     end
   end
 
-  context 'when using Stripe V3 API libarary with Elements', :js do
+  context 'when using Stripe V3 API library with Elements', :js do
     let(:preferred_v3_elements) { true }
     let(:preferred_v3_intents) { false }
 
@@ -291,7 +293,7 @@ RSpec.describe "Stripe checkout", type: :feature do
     it_behaves_like "Stripe Elements invalid payments"
   end
 
-  context "when using Stripe V3 API libarary with Intents", :js do
+  context "when using Stripe V3 API library with Intents", :js do
     let(:preferred_v3_elements) { false }
     let(:preferred_v3_intents) { true }
 
@@ -301,24 +303,8 @@ RSpec.describe "Stripe checkout", type: :feature do
     end
 
     context "when using a valid 3D Secure card" do
-      let(:card_number) { "4000 0027 6000 3184" }
-
       it "successfully completes the checkout" 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
-
-        click_button "Save and Continue"
-
-        within_3d_secure_modal do
-          expect(page).to have_content '$19.99 using 3D Secure'
-
-          click_button 'Complete authentication'
-        end
+        authenticate_3d_secure_card(card_3d_secure)
 
         expect(page).to have_current_path("/checkout/confirm")
 
@@ -368,69 +354,178 @@ RSpec.describe "Stripe checkout", type: :feature do
       end
     end
 
-    it "can re-use saved cards" do
-      within_frame find('#card_number iframe') do
-        "4000 0027 6000 3184".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
-      click_button "Save and Continue"
+    context "when reusing a card" do
+      stub_authorization!
+
+      it "succesfully creates a second payment that can be captured in the backend" do
+        authenticate_3d_secure_card(card_3d_secure)
+
+        expect(page).to have_current_path("/checkout/confirm")
+        click_button "Place Order"
+        expect(page).to have_content("Your order has been processed successfully")
+
+        visit spree.root_path
+        click_link "DL-44"
+        click_button "Add To Cart"
+
+        expect(page).to have_current_path("/cart")
+        click_button "Checkout"
+
+        # Address
+        expect(page).to have_current_path("/checkout/address")
+
+        within("#billing") do
+          fill_in_name
+          fill_in "Street Address", with: "YT-1300"
+          fill_in "City", with: "Mos Eisley"
+          select "United States of America", from: "Country"
+          select country.states.first.name, from: "order_bill_address_attributes_state_id"
+          fill_in "Zip", with: "12010"
+          fill_in "Phone", with: "(555) 555-5555"
+        end
+        click_on "Save and Continue"
+
+        # 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")
+        choose "Use an existing card on file"
+        click_button "Save and Continue"
+
+        # Confirm
+        expect(page).to have_current_path("/checkout/confirm")
+        click_button "Place Order"
+        expect(page).to have_content("Your order has been processed successfully")
+
+        Spree::Order.complete.each do |order|
+          # Capture in backend
+
+          visit spree.admin_path
+
+          expect(page).to have_selector("#listing_orders tbody tr", count: 2)
+
+          click_link order.number
+
+          click_link "Payments"
+          find(".fa-capture").click
 
-      within_3d_secure_modal do
-        click_button 'Complete authentication'
+          expect(page).to have_content "Payment Updated"
+          expect(find("table#payments")).to have_content "Completed"
+
+          # Order cancel, after capture
+          click_link "Cart"
+
+          within "#sidebar" do
+            expect(page).to have_content "Completed"
+          end
+
+          find('input[value="Cancel"]').click
+
+          expect(page).to have_content "Order canceled"
+
+          within "#sidebar" do
+            expect(page).to have_content "Canceled"
+          end
+        end
       end
+    end
 
-      expect(page).to have_current_path("/checkout/confirm")
-      click_button "Place Order"
-      expect(page).to have_content("Your order has been processed successfully")
+    context "when paying with multiple payment methods" do
+      stub_authorization!
 
-      visit spree.root_path
-      click_link "DL-44"
-      click_button "Add To Cart"
+      context "when paying first with regular card, then with 3D-Secure card" do
+        let(:regular_card) { "4242 4242 4242 4242"}
 
-      expect(page).to have_current_path("/cart")
-      click_button "Checkout"
+        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
+          click_button "Save and Continue"
 
-      # Address
-      expect(page).to have_current_path("/checkout/address")
+          expect(page).to have_content "Ending in 4242"
 
-      within("#billing") do
-        fill_in_name
-        fill_in "Street Address", with: "YT-1300"
-        fill_in "City", with: "Mos Eisley"
-        select "United States of America", from: "Country"
-        select country.states.first.name, from: "order_bill_address_attributes_state_id"
-        fill_in "Zip", with: "12010"
-        fill_in "Phone", with: "(555) 555-5555"
+          click_link "Payment"
+
+          authenticate_3d_secure_card(card_3d_secure)
+          click_button "Place Order"
+          expect(page).to have_content "Your order has been processed successfully"
+
+          visit spree.admin_path
+          click_link Spree::Order.complete.first.number
+          click_link "Payments"
+
+          payments = all('table#payments tbody tr')
+
+          expect(payments.first).to have_content "Stripe"
+          expect(payments.first).to have_content "Void"
+
+          expect(payments.last).to have_content "Stripe"
+          expect(payments.last).to have_content "Pending"
+        end
       end
-      click_on "Save and Continue"
 
-      # Delivery
-      expect(page).to have_current_path("/checkout/delivery")
-      expect(page).to have_content("UPS Ground")
-      click_on "Save and Continue"
+      context "when paying first with 3D-Secure card, then with check" do
+        before { create :check_payment_method }
 
-      # Payment
-      expect(page).to have_current_path("/checkout/payment")
-      choose "Use an existing card on file"
-      click_button "Save and Continue"
+        it "voids the stripe payment and successfully pays with check" do
+          authenticate_3d_secure_card(card_3d_secure)
+          expect(page).to have_current_path("/checkout/confirm")
 
-      # Confirm
-      expect(page).to have_current_path("/checkout/confirm")
-      click_button "Place Order"
-      expect(page).to have_content("Your order has been processed successfully")
+          click_link "Payment"
+          choose "Check"
+          click_button "Save and Continue"
+          expect(find(".payment-info")).to have_content "Check"
+          expect(page).to have_content "Your order has been processed successfully"
+
+          visit spree.admin_path
+          click_link Spree::Order.complete.first.number
+          click_link "Payments"
+          payments = all('table#payments tbody tr')
+
+          stripe_payment = payments.first
+          expect(stripe_payment).to have_content "Stripe"
+          expect(stripe_payment).to have_content "Void"
+
+          check_payment = payments.last
+          expect(check_payment).to have_content "Check"
+        end
+      end
     end
 
     it_behaves_like "Stripe Elements invalid payments"
   end
 
   def within_3d_secure_modal
-    within_frame "__privateStripeFrame10" do
-      within_frame "challengeFrame" do
-        yield
+    within_frame "__privateStripeFrame11" do
+      within_frame "__stripeJSChallengeFrame" do
+        within_frame "acsFrame" do
+          yield
+        end
       end
     end
   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
+    click_button "Save and Continue"
+
+    within_3d_secure_modal do
+      expect(page).to have_content '$19.99 using 3D Secure'
+
+      click_button 'Complete authentication'
+    end
+  end
 end