solidus_stripe 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38e979d7eecd9e20f5d763ad5e2bec33312f0877b2cec287604801b483dcb006
-  data.tar.gz: 19a4708081571dbba8c34c7d0173c1a1704ff12df54902e488add9572c4a9080
+  metadata.gz: c27f15c92bf2fcee8f467f66e8c1c261baf7d0909f86e7df87e8ce9547cc2951
+  data.tar.gz: b6ae23186cd51fc4b7938081d26df066a1b45903a3fcbb29db39d83106e520e4
 SHA512:
-  metadata.gz: 6cf3fd35258a8e0c300d0b2ca18d131d9ee3e2b74cc8522e911c8fe7a94fa7e987b66c445d52dace4df580ecf3c54eeec14be421f4f06d1e823d7705eb6c5ae3
-  data.tar.gz: d868652e26e2c4c3813e1f2438c4e2cbedc3f2e4de51a21e7eaafdb1e8fe37d35c4152e1e1ce215ba550be5a1b3d4caa15f4d4dc23f51446708f49c0d21c3f4d
+  metadata.gz: 799216217f0bf2353e94c598dc9e49187c44004f9c25dc254d13a3e5805751e8fddabaf45f83c3cc422ed561b12d0e7260cf4367d71dd614086c4d9f2d2521c6
+  data.tar.gz: 322e5c0299a3afc1555057cd10685a1f5c6ad3f446dd592326084be7959e93c009cb092f8d9fe688682527653d7078ec58c49506ba593f4b4b688d8fa81a549e

data/.gitignore

@@ -16,3 +16,4 @@ pkg
 *.swp
 spec/dummy
 spec/examples.txt
+/sandbox

data/.rubocop.yml

@@ -1,2 +1,7 @@
 require:
   - solidus_dev_support/rubocop
+
+AllCops:
+  Exclude:
+    - sandbox/**/*
+    - spec/dummy/**/*

data/CHANGELOG.md

@@ -1,23 +1,27 @@
 # Changelog
 
-## [Unreleased](https://github.com/solidusio/solidus_stripe/tree/HEAD)
+## [v4.0.0](https://github.com/solidusio/solidus_stripe/tree/v4.0.0) (2020-04-29)
 
-[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v3.0.0...HEAD)
+[Full Changelog](https://github.com/solidusio/solidus_stripe/compare/v3.0.0...v4.0.0)
 
 **Fixed bugs:**
 
 - Duplicates charges with Payment Intents [\#44](https://github.com/solidusio/solidus_stripe/issues/44)
+- Fix for 3D-Secure payments on cart page checkout [\#49](https://github.com/solidusio/solidus_stripe/pull/49) ([spaghetticode](https://github.com/spaghetticode))
 - Send form data also when paying with payment request button [\#47](https://github.com/solidusio/solidus_stripe/pull/47) ([spaghetticode](https://github.com/spaghetticode))
 - Create a single charge when using Stripe Payment Intents [\#45](https://github.com/solidusio/solidus_stripe/pull/45) ([spaghetticode](https://github.com/spaghetticode))
 
 **Closed issues:**
 
+- Custom stripe element field options \(e.g for showing a credit card icon\) [\#41](https://github.com/solidusio/solidus_stripe/issues/41)
 - Stripe Elements submit button stuck in disabled state. [\#39](https://github.com/solidusio/solidus_stripe/issues/39)
 - Visa credit card type is blank [\#36](https://github.com/solidusio/solidus_stripe/issues/36)
 - Pay with Apple Pay from cart page [\#23](https://github.com/solidusio/solidus_stripe/issues/23)
+- Clearer documentation on how to implement [\#15](https://github.com/solidusio/solidus_stripe/issues/15)
 
 **Merged pull requests:**
 
+- Relax solidus\_support dependency [\#48](https://github.com/solidusio/solidus_stripe/pull/48) ([kennyadsl](https://github.com/kennyadsl))
 - Replace deprecated route `/stripe/confirm\_payment` [\#46](https://github.com/solidusio/solidus_stripe/pull/46) ([spaghetticode](https://github.com/spaghetticode))
 - Custom Stripe Elements field options [\#42](https://github.com/solidusio/solidus_stripe/pull/42) ([stuffmatic](https://github.com/stuffmatic))
 - Improve the way Stripe Elements validation errors are displayed [\#40](https://github.com/solidusio/solidus_stripe/pull/40) ([stuffmatic](https://github.com/stuffmatic))

data/Gemfile

@@ -30,3 +30,10 @@ group :development, :test do
 end
 
 gemspec
+
+# Use a local Gemfile to include development dependencies that might not be
+# relevant for the project or for other contributors, e.g. pry-byebug.
+#
+# We use `send` instead of calling `eval_gemfile` to work around an issue with
+# how Dependabot parses projects: https://github.com/dependabot/dependabot-core/issues/1658.
+send(:eval_gemfile, 'Gemfile-local') if File.exist? 'Gemfile-local'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2020 Solidus Team
+Copyright (c) 2014 Spree Commerce Inc. and other contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -9,7 +9,7 @@ are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright notice,
       this list of conditions and the following disclaimer in the documentation
       and/or other materials provided with the distribution.
-    * Neither the name Solidus nor the names of its contributors may be used to
+    * Neither the name Spree nor the names of its contributors may be used to
       endorse or promote products derived from this software without specific
       prior written permission.
 

data/README.md

@@ -138,14 +138,11 @@ Stripe account to receive payments via Apple Pay.
 It's possible to pay with Apple Pay and Google Pay directly from the cart
 page. The functionality is self-contained in the view partial
 `_stripe_payment_request_button.html.erb`. In order to use it, you need
-to load that partial in the `orders#edit` frontend page, and pass it the
+to render that partial in the `orders#edit` frontend page, and pass it the
 payment method configured for Stripe via the local variable
-`cart_checkout_payment_method`, for example using `deface`:
+`cart_checkout_payment_method`:
 
 ```ruby
-# app/overrides/spree/orders/edit/add_payment_request_button.html.erb.deface
-
-<!-- insert_after '[data-hook="cart_container"]' -->
 <%= render 'stripe_payment_request_button', cart_checkout_payment_method: Spree::PaymentMethod::StripeCreditCard.first %>
 ```
 
@@ -313,3 +310,5 @@ gem bump --version minor --remote upstream
 gem tag --remote upstream
 gem release
 ```
+
+Copyright (c) 2020 Spree Commerce Inc., released under the New BSD License

data/Rakefile

@@ -3,4 +3,4 @@
 require 'solidus_dev_support/rake_tasks'
 SolidusDevSupport::RakeTasks.install
 
-task default: %w[extension:test_app extension:specs]
+task default: 'extension:specs'

data/app/controllers/solidus_stripe/intents_controller.rb

@@ -5,13 +5,7 @@ module SolidusStripe
     include Spree::Core::ControllerHelpers::Order
 
     def create_intent
-      begin
-        @intent = create_payment_intent
-      rescue Stripe::CardError => e
-        render json: { error: e.message }, status: 500
-        return
-      end
-
+      @intent = create_payment_intent
       generate_payment_response
     end
 

data/app/decorators/models/spree/refund_decorator.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Spree
+  module RefundDecorator
+    attr_reader :response
+
+    Spree::Refund.prepend(self)
+  end
+end

data/app/models/solidus_stripe/address_from_params_service.rb

@@ -43,7 +43,10 @@ module SolidusStripe
     end
 
     def state
-      @state ||= country.states.find_by_abbr(address_params[:region])
+      @state ||= begin
+        region = address_params[:region]
+        country.states.find_by(abbr: region) || country.states.find_by(name: region)
+      end
     end
 
     def default_attributes

data/app/models/solidus_stripe/create_intents_payment_service.rb

@@ -61,7 +61,7 @@ module SolidusStripe
             cc_type: intent_card['brand'],
             last_digits: intent_card['last4'],
             gateway_payment_profile_id: intent_customer_profile,
-            name: address_full_name,
+            name: card_holder_name || address_full_name,
             address_attributes: address_attributes
           }
         }]
@@ -69,26 +69,38 @@ module SolidusStripe
     end
 
     def intent_card
-      intent.params['charges']['data'][0]['payment_method_details']['card']
+      intent_data['payment_method_details']['card']
     end
 
     def intent_customer_profile
       intent.params['payment_method']
     end
 
+    def card_holder_name
+      (html_payment_source_data['name'] || intent_data['billing_details']['name']).presence
+    end
+
+    def intent_data
+      intent.params['charges']['data'][0]
+    end
+
     def form_data
       params[:form_data]
     end
 
-    def address_attributes
+    def html_payment_source_data
       if form_data.is_a?(String)
         data = Rack::Utils.parse_nested_query(form_data)
-        data['payment_source'][stripe.id.to_s]['address_attributes']
+        data['payment_source'][stripe.id.to_s]
       else
-        SolidusStripe::AddressFromParamsService.new(form_data).call.attributes
+        {}
       end
     end
 
+    def address_attributes
+      html_payment_source_data['address_attributes'] || SolidusStripe::AddressFromParamsService.new(form_data).call.attributes
+    end
+
     def address_full_name
       current_order.bill_address&.full_name || form_data[:recipient]
     end

data/app/models/spree/payment_method/stripe_credit_card.rb

@@ -81,6 +81,21 @@ module Spree
         gateway.void(response_code, {})
       end
 
+      def payment_intents_refund_reason
+        Spree::RefundReason.where(name: Spree::Payment::Cancellation::DEFAULT_REASON).first_or_create
+      end
+
+      def try_void(payment)
+        if v3_intents? && payment.completed?
+          payment.refunds.create!(
+            amount: payment.credit_allowed,
+            reason: payment_intents_refund_reason
+          ).response
+        else
+          payment.void_transaction!
+        end
+      end
+
       def cancel(response_code)
         gateway.void(response_code, {})
       end

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,3 +1,5 @@
+# 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'

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

@@ -6,7 +6,7 @@ module SolidusStripe
   class Engine < Rails::Engine
     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 = "4.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.5'
-  # 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

@@ -217,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 }
 
@@ -293,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 }
 
@@ -400,8 +400,9 @@ RSpec.describe "Stripe checkout", type: :feature do
         click_button "Place Order"
         expect(page).to have_content("Your order has been processed successfully")
 
-        # Capture in backend
         Spree::Order.complete.each do |order|
+          # Capture in backend
+
           visit spree.admin_path
 
           expect(page).to have_selector("#listing_orders tbody tr", count: 2)
@@ -413,6 +414,21 @@ RSpec.describe "Stripe checkout", type: :feature do
 
           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
@@ -489,7 +505,9 @@ RSpec.describe "Stripe checkout", type: :feature do
   def within_3d_secure_modal
     within_frame "__privateStripeFrame11" do
       within_frame "__stripeJSChallengeFrame" do
-        yield
+        within_frame "acsFrame" do
+          yield
+        end
       end
     end
   end

data/spec/models/solidus_stripe/address_from_params_service_spec.rb

@@ -14,7 +14,8 @@ RSpec.describe SolidusStripe::AddressFromParamsService do
         recipient: 'Clark Kent',
         city: 'Metropolis',
         postalCode: '12345',
-        addressLine: [ '12, Lincoln Rd']
+        addressLine: [ '12, Lincoln Rd'],
+        phone: '555-555-0199'
       }
     end
 
@@ -39,7 +40,8 @@ RSpec.describe SolidusStripe::AddressFromParamsService do
             firstname: 'Clark',
             lastname: 'Kent',
             address1: params[:addressLine].first,
-            address2: nil
+            address2: nil,
+            phone: '555-555-0199'
           )
         end
 
@@ -50,11 +52,23 @@ RSpec.describe SolidusStripe::AddressFromParamsService do
 
       context "when no user's address is compatible with the params" do
         before do
-          user.addresses << create(:address)
+          user.addresses << create(:address, state: state)
         end
 
-        it "returns a non-persisted address model" do
-          expect(subject).to be_new_record
+        it "returns a non-persisted valid address" do
+          aggregate_failures do
+            expect(subject).to be_new_record
+            expect(subject).to be_valid
+            expect(subject.state).to eq state
+          end
+        end
+
+        context "when the region is the state name" do
+          before { params[:region] = state.name }
+
+          it "still can set the address state attribute" do
+            expect(subject.state).to eq state
+          end
         end
       end
     end

data/spec/models/solidus_stripe/create_intents_payment_service_spec.rb

@@ -41,6 +41,9 @@ RSpec.describe SolidusStripe::CreateIntentsPaymentService do
       "id" => intent_id,
       "charges" => {
         "data" => [{
+          "billing_details" => {
+            "name" => "John Doe"
+          },
           "payment_method_details" => {
             "card" => {
               "brand" => "visa",
@@ -70,6 +73,19 @@ RSpec.describe SolidusStripe::CreateIntentsPaymentService do
       expect(order.payments.last.reload).to be_pending
     end
 
+    it "creates a credit card with the correct information" do
+      expect { subject }.to change { Spree::CreditCard.count }
+      card = Spree::CreditCard.last
+
+      aggregate_failures do
+        expect(card.name).to eq "John Doe"
+        expect(card.cc_type).to eq "visa"
+        expect(card.month).to eq "1"
+        expect(card.year).to eq "2022"
+        expect(card.last_digits).to eq "4242"
+      end
+    end
+
     context "when for any reason the payment could not be created" do
       before { params[:form_data].delete(:city) }
 

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

@@ -22,7 +22,8 @@ describe Spree::PaymentMethod::StripeCreditCard do
   let(:payment) {
     double('Spree::Payment',
       source: source,
-      order: order
+      order: order,
+      amount: order.total
     )
   }
 
@@ -241,4 +242,46 @@ describe Spree::PaymentMethod::StripeCreditCard do
       expect(gateway).to receive(:capture).with(9855, '12345', anything).and_return(success_response)
     end
   end
+
+  describe '#try_void' do
+    let(:payment) { create :payment, amount: order.total }
+
+    shared_examples 'voids the payment transaction' do
+      it 'voids the payment transaction' do
+        expect(payment).to receive(:void_transaction!)
+
+        subject.try_void(payment)
+      end
+    end
+
+    context 'when using Payment Intents' do
+      before { subject.preferred_v3_intents = true }
+
+      context 'when the payment is completed' do
+        before do
+          allow(payment).to receive(:completed?) { true }
+        end
+
+        it 'creates a refund' do
+          expect { subject.try_void(payment) }.to change { Spree::Refund.count }.by(1)
+        end
+      end
+
+      context 'when the payment is not completed' do
+        it_behaves_like 'voids the payment transaction'
+      end
+    end
+
+    context 'when not using Payment Intents' do
+      before { subject.preferred_v3_intents = false }
+
+      context 'when the payment is completed' do
+        it_behaves_like 'voids the payment transaction'
+      end
+
+      context 'when the payment is not completed' do
+        it_behaves_like 'voids the payment transaction'
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -13,7 +13,10 @@ require 'solidus_dev_support/rspec/feature_helper'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
+
+# Requires factories defined in lib/solidus_stripe/factories.rb
+require 'solidus_stripe/factories'
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_stripe
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -88,7 +88,6 @@ files:
 - CHANGELOG.md
 - Gemfile
 - LICENSE
-- LICENSE.md
 - README.md
 - Rakefile
 - app/assets/javascripts/spree/frontend/solidus_stripe.js
@@ -103,13 +102,18 @@ files:
 - app/controllers/spree/stripe_controller.rb
 - app/decorators/models/spree/order_update_attributes_decorator.rb
 - app/decorators/models/spree/payment_decorator.rb
+- app/decorators/models/spree/refund_decorator.rb
 - app/models/solidus_stripe/address_from_params_service.rb
 - app/models/solidus_stripe/create_intents_payment_service.rb
 - app/models/solidus_stripe/prepare_order_for_payment_service.rb
 - app/models/solidus_stripe/shipping_rates_service.rb
 - app/models/spree/payment_method/stripe_credit_card.rb
 - bin/console
+- bin/r
 - bin/rails
+- bin/rake
+- bin/sandbox
+- bin/sandbox_rails
 - bin/setup
 - config/routes.rb
 - db/migrate/20181010123508_update_stripe_payment_method_type_to_credit_card.rb
@@ -118,6 +122,7 @@ files:
 - lib/generators/solidus_stripe/install/install_generator.rb
 - lib/solidus_stripe.rb
 - lib/solidus_stripe/engine.rb
+- lib/solidus_stripe/factories.rb
 - lib/solidus_stripe/version.rb
 - lib/tasks/solidus_stripe/db/seed.rake
 - lib/views/api/spree/api/payments/source_views/_stripe.json.jbuilder
@@ -141,30 +146,29 @@ files:
 - spec/models/spree/payment_method/stripe_credit_card_spec.rb
 - spec/spec_helper.rb
 - spec/support/solidus_address_helper.rb
-homepage: https://solidus.io
+homepage: https://github.com/solidusio/solidus_stripe#readme
 licenses:
 - BSD-3
 metadata:
-  homepage_uri: https://solidus.io
-  source_code_uri: https://solidus.io
+  homepage_uri: https://github.com/solidusio/solidus_stripe#readme
+  source_code_uri: https://github.com/solidusio/solidus_stripe
+  changelog_uri: https://github.com/solidusio/solidus_stripe/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- none
-rubyforge_project: 
-rubygems_version: 2.7.10
+requirements: []
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Stripe Payment Method for Solidus

data/LICENSE.md

@@ -1,26 +0,0 @@
-Copyright (c) 2014 Spree Commerce Inc. and other contributors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name Spree nor the names of its contributors may be used to
-      endorse or promote products derived from this software without specific
-      prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.