solidus_stripe 4.2.0 → 4.3.0

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,21 +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/factories.rb
-require 'solidus_stripe/factories'
+# 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: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-20 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.5'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        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"
@@ -111,18 +112,23 @@ files:
 - 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/factories.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
@@ -144,6 +150,7 @@ files:
 - 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://github.com/solidusio/solidus_stripe#readme
@@ -159,16 +166,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.20
 signing_key:
 specification_version: 4
 summary: Stripe Payment Method for Solidus
@@ -179,5 +186,6 @@ test_files:
 - 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