solidus_stripe 3.2.1 → 4.3.0

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
 
@@ -33,14 +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
-          )
+            address2: nil,
+            phone: '555-555-0199',
+          }.merge!(name_attributes)
+
+          user.addresses << create(:address, address_attributes)
         end
 
         it "returns an existing user's address" do
@@ -50,11 +63,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

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe SolidusStripe::CreateIntentsPaymentService do
+  let(:service) { described_class.new(intent_id, stripe, controller) }
+
+  let(:stripe) {
+    Spree::PaymentMethod::StripeCreditCard.create!(
+      name: "Stripe",
+      preferred_secret_key: "sk_test_VCZnDv3GLU15TRvn8i2EsaAN",
+      preferred_publishable_key: "pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg",
+      preferred_v3_elements: false,
+      preferred_v3_intents: true
+    )
+  }
+
+  let(:order) { create :order, state: :payment, total: 19.99 }
+
+  let(:intent_id) { "pi_123123ABC" }
+  let(:controller) { double(current_order: order.reload, params: params, request: spy) }
+
+  let(:params) do
+    {
+      spree_payment_method_id: stripe.id,
+      stripe_payment_intent_id: intent_id,
+      form_data: {
+        addressLine: ["31 Cotton Rd"],
+        city: "San Diego",
+        country: "US",
+        phone: "+188836412312",
+        postalCode: "12345",
+        recipient: "James Edwards",
+        region: "CA"
+      }
+    }
+  end
+
+  let(:intent) do
+    double(params: {
+      "id" => intent_id,
+      "charges" => {
+        "data" => [{
+          "billing_details" => {
+            "name" => "John Doe"
+          },
+          "payment_method_details" => {
+            "card" => {
+              "brand" => "visa",
+              "exp_month" => 1,
+              "exp_year" => 2022,
+              "last4" => "4242"
+            },
+          }
+        }]
+      }
+    })
+  end
+
+  describe '#call' do
+    subject { service.call }
+
+    before do
+      allow(stripe).to receive(:show_intent) { intent }
+      allow_any_instance_of(Spree::CreditCard).to receive(:require_card_numbers?) { false }
+      allow_any_instance_of(Spree::PaymentMethod::StripeCreditCard).to receive(:create_profile) { true }
+    end
+
+    it { expect(subject).to be true }
+
+    it "creates a new pending payment" do
+      expect { subject }.to change { order.payments.count }
+      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) }
+
+      it "returns false" do
+        expect(subject).to be false
+      end
+    end
+
+    context "when there are previous pending payments" do
+      let!(:payment) do
+        create(:payment, order: order, amount: order.total).tap do |payment|
+          payment.update!(state: :pending)
+        end
+      end
+
+      before do
+        response = double(success?: true, authorization: payment.response_code)
+        allow_any_instance_of(Spree::PaymentMethod::StripeCreditCard).to receive(:void) { response }
+      end
+
+      context "when one of them is a Payment Intent" do
+        before do
+          payment.update!(payment_method: stripe)
+          payment.source.update!(payment_method: stripe)
+        end
+
+        it "invalidates it" do
+          expect { subject }.to change { payment.reload.state }.to 'void'
+        end
+      end
+
+      context "when none is a Payment Intent" do
+        it "does not invalidate them" do
+          expect { subject }.not_to change { payment.reload.state }
+        end
+      end
+    end
+  end
+end

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,75 @@ 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(gateway).to receive(:void)
+
+        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
+
+  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

data/spec/requests/payment_requests_spec.rb

@@ -0,0 +1,152 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe "Payment Request", type: :request do
+  describe "POST /stripe/update_order" do
+    it "responds with { success: true } when the order is correctly updated" do
+      order = create(:order_ready_to_complete)
+      allow_any_instance_of(SolidusStripe::PaymentRequestController).to receive(:current_order).and_return(order)
+
+      with_disabled_forgery_protection do
+        post "/stripe/update_order", params: stripe_update_request_params(order: order)
+      end
+
+      json = JSON.parse(response.body)
+      expect(json["success"]).to be_truthy
+    end
+
+    context "when phone number is provided as param and already set on the address" do
+      it "overrides the address field" do
+        order = create(:order_ready_to_complete)
+        allow_any_instance_of(SolidusStripe::PaymentRequestController).to receive(:current_order).and_return(order)
+
+        expect {
+          with_disabled_forgery_protection do
+            post "/stripe/update_order", params: stripe_update_request_params(order: order, shipping_address: default_shipping_address(phone: nil), phone: '911')
+          end
+        }.to change { order.shipping_address.phone }.to('911')
+      end
+    end
+
+    context "when phone number is provided both as shipping address param and main param, and already set on the address" do
+      it "overrides the address field giving precedence to the shipping address param" do
+        order = create(:order_ready_to_complete)
+        allow_any_instance_of(SolidusStripe::PaymentRequestController).to receive(:current_order).and_return(order)
+
+        expect {
+          with_disabled_forgery_protection do
+            post "/stripe/update_order", params: stripe_update_request_params(order: order, shipping_address: default_shipping_address(phone: '555'), phone: '911')
+          end
+        }.to change { order.shipping_address.phone }.to('555')
+      end
+    end
+
+    context "when phone number is not required, not provided as param and not set on the shipping address" do
+      it "does not populate the address field" do
+        with_address_phone_not_required
+        order = create(:order_ready_to_complete, shipping_address: create(:address, phone: nil))
+        allow_any_instance_of(SolidusStripe::PaymentRequestController).to receive(:current_order).and_return(order)
+
+        expect {
+          with_disabled_forgery_protection do
+            post "/stripe/update_order", params: stripe_update_request_params(order: order, shipping_address: default_shipping_address(phone: nil), phone: nil)
+          end
+        }.not_to change { order.shipping_address.phone }
+      end
+    end
+
+    context "when phone number is not required, provided as param and not set on the shipping address" do
+      it "populates the address field with the phone passed as param" do
+        with_address_phone_not_required
+        order = create(:order_ready_to_complete, shipping_address: create(:address, phone: nil))
+        allow_any_instance_of(SolidusStripe::PaymentRequestController).to receive(:current_order).and_return(order)
+
+        expect {
+          with_disabled_forgery_protection do
+            post "/stripe/update_order", params: stripe_update_request_params(order: order, shipping_address: default_shipping_address(phone: nil), phone: '911')
+          end
+        }.to change { order.shipping_address.phone }.from(nil).to('911')
+      end
+    end
+
+    context "when phone number is not required, provided as param but already set on the shipping address" do
+      it "populates the address field with the phone passed in the shipping field" do
+        with_address_phone_not_required
+        order = create(:order_ready_to_complete, shipping_address: create(:address, phone: nil))
+        allow_any_instance_of(SolidusStripe::PaymentRequestController).to receive(:current_order).and_return(order)
+
+        expect {
+          with_disabled_forgery_protection do
+            post "/stripe/update_order", params: stripe_update_request_params(order: order, shipping_address: default_shipping_address(phone: '555'), phone: '911')
+          end
+        }.to change { order.shipping_address.phone }.from(nil).to('555')
+      end
+    end
+  end
+
+  private
+
+  def with_address_phone_not_required
+    if Spree::Config.respond_to?(:address_requires_phone)
+      stub_spree_preferences(address_requires_phone: false)
+    else
+      allow_any_instance_of(Spree::Address).to receive(:require_phone?).and_return(false)
+    end
+  end
+
+  def with_disabled_forgery_protection
+    original_allow_forgery_protection_value = ActionController::Base.allow_forgery_protection
+    ActionController::Base.allow_forgery_protection = false
+
+    yield
+
+    ActionController::Base.allow_forgery_protection = original_allow_forgery_protection_value
+  end
+
+  def stripe_update_request_params(
+    order:,
+    shipping_address: nil,
+    name: 'Clark Kent',
+    phone: '555-555-0199'
+    )
+
+    {
+      shipping_address: shipping_address || default_shipping_address,
+      shipping_option: {
+        id: order.shipments.first.shipping_rates.first.shipping_method.id
+      },
+      name: name,
+      phone: phone,
+      email: order.email
+    }
+  end
+
+  def default_shipping_address(
+    country: nil,
+    region: nil,
+    recipient: 'Clark Kent',
+    city: 'Metropolis',
+    postal_code: '12345',
+    address_line: ['12, Lincoln Rd'],
+    phone: '555-555-0199'
+    )
+
+    if country.blank? || region.blank?
+      state = create(:state)
+
+      country ||= state.country.iso
+      region ||= state.abbr
+    end
+
+    {
+      country: country,
+      region: region,
+      recipient: recipient,
+      city: city,
+      postalCode: postal_code,
+      addressLine: address_line,
+      phone: phone
+    }
+  end
+end

data/spec/spec_helper.rb

@@ -6,18 +6,32 @@ ENV['RAILS_ENV'] = 'test'
 # Run Coverage report
 require 'solidus_dev_support/rspec/coverage'
 
-require File.expand_path('dummy/config/environment.rb', __dir__)
+# Create the dummy app if it's still missing.
+dummy_env = "#{__dir__}/dummy/config/environment.rb"
+system 'bin/rake extension:test_app' unless File.exist? dummy_env
+require dummy_env
 
 # Requires factories and other useful helpers defined in spree_core.
 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["#{__dir__}/support/**/*.rb"].sort.each { |f| require f }
+
+# Requires factories defined in lib/solidus_stripe/testing_support/factories.rb
+SolidusDevSupport::TestingSupport::Factories.load_for(SolidusStripe::Engine)
+
+# Requires card input helper defined in lib/solidus_stripe/testing_support/card_input_helper.rb
+require 'solidus_stripe/testing_support/card_input_helper'
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
-  FactoryBot.find_definitions
   config.use_transactional_fixtures = false
+
   config.include SolidusAddressNameHelper, type: :feature
+  config.include SolidusCardInputHelper, type: :feature
+
+  if Spree.solidus_gem_version < Gem::Version.new('2.11')
+    config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :system
+  end
 end

data/spec/support/solidus_address_helper.rb

@@ -2,10 +2,10 @@
 
 # Since https://github.com/solidusio/solidus/pull/3524 was merged,
 # we need to verify if we're using the single "Name" field or the
-# previous first/last name combination.
+# previous first/last name combination.
 module SolidusAddressNameHelper
   def fill_in_name
-    if Spree::Config.preferences[:use_combined_first_and_last_name_in_address]
+    if SolidusSupport.combined_first_and_last_name_in_address?
       fill_in "Name", with: "Han Solo"
     else
       fill_in "First Name", with: "Han"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_stripe
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Solidus Team
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -19,7 +19,7 @@ dependencies:
         version: '2.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,49 +29,49 @@ dependencies:
         version: '2.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.100'
+        version: '1.105'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.100'
+        version: '1.105'
 - !ruby/object:Gem::Dependency
   name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 description: Stripe Payment Method for Solidus
 email: contact@solidus.io
 executables: []
@@ -81,6 +81,7 @@ files:
 - ".circleci/config.yml"
 - ".gem_release.yml"
 - ".github/stale.yml"
+- ".github_changelog_generator"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -88,7 +89,6 @@ files:
 - CHANGELOG.md
 - Gemfile
 - LICENSE
-- LICENSE.md
 - README.md
 - Rakefile
 - app/assets/javascripts/spree/frontend/solidus_stripe.js
@@ -103,21 +103,32 @@ 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_order_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/rails-engine
+- bin/rails-sandbox
+- bin/rake
+- bin/sandbox
+- bin/sandbox_rails
 - bin/setup
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20181010123508_update_stripe_payment_method_type_to_credit_card.rb
 - db/seeds.rb
 - lib/assets/stylesheets/spree/frontend/solidus_stripe.scss
 - lib/generators/solidus_stripe/install/install_generator.rb
 - lib/solidus_stripe.rb
+- lib/solidus_stripe/configuration.rb
 - lib/solidus_stripe/engine.rb
+- lib/solidus_stripe/testing_support/card_input_helper.rb
+- lib/solidus_stripe/testing_support/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
@@ -135,18 +146,21 @@ files:
 - solidus_stripe.gemspec
 - spec/features/stripe_checkout_spec.rb
 - spec/models/solidus_stripe/address_from_params_service_spec.rb
+- spec/models/solidus_stripe/create_intents_payment_service_spec.rb
 - spec/models/solidus_stripe/prepare_order_for_payment_service_spec.rb
 - spec/models/solidus_stripe/shipping_rates_service_spec.rb
 - spec/models/spree/payment_method/stripe_credit_card_spec.rb
+- spec/requests/payment_requests_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
-post_install_message: 
+  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
@@ -154,23 +168,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- none
-rubygems_version: 3.0.3
-signing_key: 
+requirements: []
+rubygems_version: 3.2.20
+signing_key:
 specification_version: 4
 summary: Stripe Payment Method for Solidus
 test_files:
 - spec/features/stripe_checkout_spec.rb
 - spec/models/solidus_stripe/address_from_params_service_spec.rb
+- spec/models/solidus_stripe/create_intents_payment_service_spec.rb
 - spec/models/solidus_stripe/prepare_order_for_payment_service_spec.rb
 - spec/models/solidus_stripe/shipping_rates_service_spec.rb
 - spec/models/spree/payment_method/stripe_credit_card_spec.rb
+- spec/requests/payment_requests_spec.rb
 - spec/spec_helper.rb
 - spec/support/solidus_address_helper.rb