RubyGems - spree_gateway - Versions diffs - 3.9.2 → 3.9.3 - Mend

spree_gateway 3.9.2 → 3.9.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

checksums.yaml +4 -4
data/.travis.yml +10 -4
data/Appraisals +5 -4
data/app/models/spree/credit_card_decorator.rb +10 -0
data/app/models/spree/gateway/stripe_ach_gateway.rb +1 -1
data/app/models/spree/payment_decorator.rb +3 -1
data/app/views/spree/checkout/_payment_confirm.html.erb +7 -2
data/gemfiles/{spree_4_2.gemfile → spree_3_7.gemfile} +2 -1
data/lib/spree_gateway.rb +0 -1
data/lib/spree_gateway/version.rb +1 -1
data/spec/features/admin/stripe_elements_payment_spec.rb +19 -29
data/spec/features/stripe_checkout_spec.rb +28 -20
data/spec/features/stripe_elements_3ds_checkout_spec.rb +152 -34
data/spec/support/order_walktrough.rb +73 -0
data/spree_gateway.gemspec +0 -1
metadata +9 -20

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b54b6ec2e6137ae258ac3d108c715f3a8bf2e534c8f3ee13946529831fdf6c8e
-  data.tar.gz: 95e413abf6077ee0ed9cf92d260be0ad44de0888334d94b6d60b8b68002e85fd
+  metadata.gz: 82e672befb08ae277659eec1f7686002af0b6f66b1f8ecb467649ab29667aee2
+  data.tar.gz: 47d5a54c20d7987569af842d50f471e6f3eea69647f6807865191c55e97f61cc
 SHA512:
-  metadata.gz: b94ebcae1a0004d780547e34f73764093a84ab49a36a6c31bbc5177b7094c6c609a545da6684d262eb65155550c8c6eb1eb528118a1258ef2b090512c862afa7
-  data.tar.gz: 2facdc1ebd849fe10fffb1b2ab0daebef9e90d7178bcad1a29fd3cd896935fc12c2f828dd48e01644557f3abf21320b76402c150ba8399b309fbbc5d9a83a668
+  metadata.gz: 5efb8b8ce887c92a222bf0b4c4b53b0ea16ee45f6efff3ad2908acdc5e3383139b778362be57ed858d15a0497df4d6aa37fa2c8f56ddee81f334945bcb67fe9f
+  data.tar.gz: fb61b3afbfc998e819bd11cf5d1f53c782e0e486c5b0fea6c43710fba74664398384badff68298a593b715185da3eaa68727e18b3d575dc5f14511d232d7f437

data/.travis.yml CHANGED

@@ -15,20 +15,26 @@ services:
 language: ruby
 rvm:
-  - 2.6
+  - 2.7
+  - 3.0
 env:
   - DB=mysql
   - DB=postgres
 gemfile:
-  # - gemfiles/spree_4_1.gemfile
-  - gemfiles/spree_4_2.gemfile
+  - gemfiles/spree_3_7.gemfile
+  - gemfiles/spree_4_1.gemfile
   - gemfiles/spree_master.gemfile
 jobs:
   allow_failures:
-    - gemfile: gemfiles/spree_master.gemfile
+  - gemfile: gemfiles/spree_master.gemfile
+  exclude:
+  - rvm: 3.0
+    gemfile: gemfiles/spree_4_1.gemfile
+  - rvm: 3.0
+    gemfile: gemfiles/spree_3_7.gemfile
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"

data/Appraisals CHANGED

@@ -1,10 +1,11 @@
-appraise 'spree-4-1' do
-  gem 'spree', '~> 4.1.0'
+appraise 'spree-3-7' do
+  gem 'spree', '~> 3.7.0'
   gem 'rails-controller-testing'
+  gem 'sass-rails'
 end
-appraise 'spree-4-2' do
-  gem 'spree', '~> 4.2.0.beta'
+appraise 'spree-4-1' do
+  gem 'spree', '~> 4.1.0'
   gem 'rails-controller-testing'
 end

data/app/models/spree/credit_card_decorator.rb ADDED

@@ -0,0 +1,10 @@
+module Spree
+  module CreditCardDecorator
+    def set_last_digits
+      self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
+    end
+  end
+end
+::Spree::CreditCard.prepend(::Spree::CreditCardDecorator)

data/app/models/spree/gateway/stripe_ach_gateway.rb CHANGED

@@ -9,7 +9,7 @@ module Spree
       Check
     end
-    def verify(source, **gateway_options)
+    def verify(source, gateway_options)
       provider.verify(source, gateway_options)
     end

data/app/models/spree/payment_decorator.rb CHANGED

@@ -1,7 +1,9 @@
 module Spree
   module PaymentDecorator
     def handle_response(response, success_state, failure_state)
-      self.intent_client_key = response.params['client_secret'] if response.params['client_secret'] && response.success?
+      if response.success? && response.respond_to?(:params)
+        self.intent_client_key = response.params['client_secret'] if response.params['client_secret']
+      end
       super
     end

data/app/views/spree/checkout/_payment_confirm.html.erb CHANGED

@@ -9,12 +9,17 @@
     function confirmCardPaymentResponseHandler(response) {
       $.post("/api/v2/storefront/intents/handle_response", { response: response, order_token: "<%= @order.token %>" }).done(function (result) {
-        form.elements["commit"].disabled = false;
+          // conditional needs for spree 3.7
+          if(form.elements["commit"]) {
+              form.elements["commit"].disabled = false;
+          }
         $('#successBox').html(result.message);
         $('#successBox').show();
         form.submit();
       }).fail(function(result) {
-        form.elements["commit"].disabled = false;
+          if(form.elements["commit"]) {
+              form.elements["commit"].disabled = false;
+          }
         $('#errorBox').html(result.responseJSON.error);
         $('#errorBox').show();
       });

data/gemfiles/{spree_4_2.gemfile → spree_3_7.gemfile} RENAMED

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 gem "rails-controller-testing"
-gem "spree", "~> 4.2.0.beta"
+gem "spree", "~> 3.7.0"
+gem "sass-rails"
 gemspec path: "../"

data/lib/spree_gateway.rb CHANGED

@@ -2,4 +2,3 @@ require 'spree_core'
 require 'spree_gateway/engine'
 require 'spree_gateway/version'
 require 'spree_extension'
-require 'deface'

data/lib/spree_gateway/version.rb CHANGED

@@ -1,5 +1,5 @@
 module SpreeGateway
   def self.version
-    '3.9.2'
+    '3.9.3'
   end
 end

data/spec/features/admin/stripe_elements_payment_spec.rb CHANGED

@@ -1,53 +1,43 @@
 require 'spec_helper'
-describe 'Admin Panel Stripe elements payment', type: :feature, :js => true do
+describe 'Admin Panel Stripe elements payment', type: :feature do
   stub_authorization!
-  let!(:country)         { create(:country, :states_required => true) }
-  let!(:state)           { create(:state, :country => country) }
+  let!(:country) { create(:country, states_required: true) }
+  let!(:state) { create(:state, country: country) }
   let!(:shipping_method) { create(:shipping_method) }
-  let!(:stock_location)  { create(:stock_location) }
-  let!(:mug)             { create(:product, :name => 'RoR Mug') }
-  let!(:zone)            { create(:zone) }
+  let!(:stock_location) { create(:stock_location) }
+  let!(:mug) { create(:product, name: 'RoR Mug') }
+  let!(:zone) { create(:zone) }
   let!(:stripe_elements_payment_method) do
     Spree::Gateway::StripeElementsGateway.create!(
-      :name => 'Stripe Element',
-      :preferred_secret_key => 'sk_test_VCZnDv3GLU15TRvn8i2EsaAN',
-      :preferred_publishable_key => 'pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg'
+        name: 'Stripe Element',
+        preferred_secret_key: 'sk_test_VCZnDv3GLU15TRvn8i2EsaAN',
+        preferred_publishable_key: 'pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg'
     )
   end
   let!(:order) { OrderWalkthrough.up_to(:payment) }
   before { visit spree.new_admin_order_payment_path(order.number) }
   it 'can process a valid payment' do
     fill_in_stripe_payment
     wait_for { !page.has_current_path?(spree.admin_order_payments_path(order.number)) }
     expect(page.body).to have_content('Payment has been successfully created!')
     expect(page).to have_current_path spree.admin_order_payments_path(order.number)
   end
-  if Spree.version.to_f >= 4.1
-    it 'shows an error with an invalid card name' do
-      fill_in_stripe_payment(true)
-      expect(page).to have_content("Credit card Name can't be blank")
-      expect(page).to have_current_path spree.admin_order_payments_path(order.number)
-    end
-  else
-    it 'can proces valid payment with invalid card name' do
-      fill_in_stripe_payment(true)
-      wait_for { !page.has_current_path?(spree.admin_order_payments_path(order.number)) }
+  it 'shows an error with an invalid card name' do
+    fill_in_stripe_payment(true)
-      expect(page.body).to have_content('Payment has been successfully created!')
-      expect(page).to have_current_path spree.admin_order_payments_path(order.number)
-    end
+    expect(page).to have_content("Credit card Name can't be blank")
+    expect(page).to have_current_path spree.admin_order_payments_path(order.number)
   end
   it 'shows an error with an invalid card number' do
     fill_in_stripe_payment(false, true)
     expect(page).to have_content('The card number is not a valid credit card number.')
     expect(page).to have_current_path spree.new_admin_order_payment_path(order.number)
   end
@@ -62,7 +52,7 @@ describe 'Admin Panel Stripe elements payment', type: :feature, :js => true do
   it 'shows an error with an invalid card expiration' do
     fill_in_stripe_payment(false, false, false, true)
-    if Spree.version.to_f >= 4.1
+    if Spree.version.to_f >= 4.1 || Spree.version.to_f >= 3.7
       expect(page).to have_content('Credit card Month is not a number')
       expect(page).to have_content('Credit card Year is not a number')
       expect(page).to have_current_path spree.admin_order_payments_path(order.number)
@@ -83,7 +73,7 @@ describe 'Admin Panel Stripe elements payment', type: :feature, :js => true do
   def fill_in_card_number(invalid_number)
     number = invalid_number ? '123' : '4242 4242 4242 4242'
-    fill_in_field('Card Number *', '#card_number1', number)
+    fill_in_field('Card Number *', "#card_number#{stripe_elements_payment_method.id}", number)
   end
   def fill_in_card_expiration(invalid_expiration)
@@ -91,7 +81,7 @@ describe 'Admin Panel Stripe elements payment', type: :feature, :js => true do
     invalid_expiry = Spree.version.to_f >= 4.2 ? '01/' : '01 / '
     card_expiry = invalid_expiration ? invalid_expiry : valid_expiry
-    fill_in_field('Expiration *', '#card_expiry1', card_expiry)
+    fill_in_field('Expiration *', "#card_expiry#{stripe_elements_payment_method.id}", card_expiry)
   end
   def fill_in_cvc(invalid_code)

data/spec/features/stripe_checkout_spec.rb CHANGED

@@ -1,6 +1,6 @@
 require 'spec_helper'
-describe "Stripe checkout", type: :feature do
+describe "Stripe checkout", type: :feature, js: true do
   let!(:country) { create(:country, :states_required => true) }
   let!(:state) { create(:state, :country => country) }
   let!(:shipping_method) { create(:shipping_method) }
@@ -42,7 +42,7 @@ describe "Stripe checkout", type: :feature do
   end
   # This will pass the CC data to the server and the StripeGateway class handles it
-  it "can process a valid payment (without JS)" do
+  it "can process a valid payment (without JS)", js: false do
     fill_in 'card_number', with: '4242 4242 4242 4242'
     fill_in 'card_code', with: '123'
     fill_in 'card_expiry', with: "01 / #{Time.current.year + 1}"
@@ -56,12 +56,10 @@ describe "Stripe checkout", type: :feature do
   # This will fetch a token from Stripe.com and then pass that to the webserver.
   # The server then processes the payment using that token.
-  it "can process a valid payment (with JS)", :js => true do
-    fill_in 'card_number', with: '4242 4242 4242 4242'
-    # Otherwise ccType field does not get updated correctly
-    page.execute_script("$('.cardNumber').trigger('change')")
+  it "can process a valid payment (with JS)" do
+    fill_in_with_force('card_number', with: "4242424242424242")
+    fill_in_with_force('card_expiry', with: "01 / #{Time.current.year + 1}")
     fill_in 'card_code', with: '123'
-    fill_in 'card_expiry', with: "01 / #{Time.current.year + 1}"
     click_button "Save and Continue"
     wait_for_stripe # Wait for Stripe API to return + form to submit
     expect(page).to have_css('#checkout_form_confirm')
@@ -72,18 +70,23 @@ describe "Stripe checkout", type: :feature do
     expect(page).to have_content(order.number)
   end
-  it "shows an error with an invalid credit card number", :js => true do
+  it "shows an error with an invalid credit card number" do
     # Card number is NOT valid. Fails Luhn checksum
     fill_in 'card_number', with: '4242 4242 4242 4249'
     click_button "Save and Continue"
     wait_for_stripe
-    expect(page).to have_content("Your card number is incorrect")
-    expect(page).to have_css('.has-error #card_number.error')
+    if Spree.version.to_f >= 3.7 and Spree.version.to_f <= 4.1
+      expect(page).to have_content("The card number is not a valid credit card number")
+    end
+    if Spree.version.to_f >= 4.2
+      expect(page).to have_content("Your card number is incorrect")
+      expect(page).to have_css('.has-error #card_number.error')
+    end
   end
-  it "shows an error with invalid security fields", :js => true do
-    fill_in 'card_number', with: '4242 4242 4242 4242'
-    fill_in 'card_expiry', with: "01 / #{Time.current.year + 1}"
+  it "shows an error with invalid security fields" do
+    fill_in_with_force('card_number', with: "4242424242424242")
+    fill_in_with_force('card_expiry', with: "01 / #{Time.current.year + 1}")
     fill_in 'card_code', with: '99'
     click_button "Save and Continue"
     wait_for_stripe
@@ -93,10 +96,10 @@ describe "Stripe checkout", type: :feature do
   # this scenario will not occur on Spree 4.2 due to swapping jquery.payment to cleave
   # see https://github.com/spree/spree/pull/10363
-  it "shows an error with invalid expiry month field", :js => true do
-    skip if Spree.version.to_f >= 4.2
-    fill_in 'card_number', with: '4242 4242 4242 4242'
-    fill_in 'card_expiry', :with => "00 / #{Time.now.year + 1}"
+  it "shows an error with invalid expiry month field" do
+    skip if Spree.version.to_f >= 4.2
+    fill_in_with_force('card_number', with: "4242424242424242")
+    fill_in_with_force('card_expiry', with: "00 / #{Time.current.year + 1}")
     fill_in 'card_code', with: '123'
     click_button "Save and Continue"
     wait_for_stripe
@@ -104,9 +107,9 @@ describe "Stripe checkout", type: :feature do
     expect(page).to have_css('.has-error #card_expiry.error')
   end
-  it "shows an error with invalid expiry year field", :js => true do
-    fill_in 'card_number', with: '4242 4242 4242 4242'
-    fill_in 'card_expiry', with: '12 / '
+  it "shows an error with invalid expiry year field" do
+    fill_in_with_force('card_number', with: "4242424242424242")
+    fill_in_with_force('card_expiry', with: "12 / ")
     fill_in 'card_code', with: '123'
     click_button "Save and Continue"
     wait_for_stripe
@@ -114,3 +117,8 @@ describe "Stripe checkout", type: :feature do
     expect(page).to have_css('.has-error #card_expiry.error')
   end
 end
+def fill_in_with_force(locator, with:)
+  field_id = find_field(locator)[:id]
+  page.execute_script("document.getElementById('#{field_id}').value = '#{with}';")
+end

data/spec/features/stripe_elements_3ds_checkout_spec.rb CHANGED

@@ -6,10 +6,10 @@ describe 'Stripe Elements 3ds checkout', type: :feature, js: true do
   let!(:product) { create(:product, name: 'RoR Mug') }
   let!(:stripe_payment_method) do
     Spree::Gateway::StripeElementsGateway.create!(
-      name: 'Stripe',
-      preferred_secret_key: 'sk_test_VCZnDv3GLU15TRvn8i2EsaAN',
-      preferred_publishable_key: 'pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg',
-      preferred_intents: preferred_intents
+        name: 'Stripe',
+        preferred_secret_key: 'sk_test_VCZnDv3GLU15TRvn8i2EsaAN',
+        preferred_publishable_key: 'pk_test_Cuf0PNtiAkkMpTVC2gwYDMIg',
+        preferred_intents: preferred_intents
     )
   end
@@ -30,8 +30,13 @@ describe 'Stripe Elements 3ds checkout', type: :feature, js: true do
     allow_any_instance_of(Spree::OrdersController).to receive_messages(try_spree_current_user: user)
     add_to_cart(product)
-    click_link 'checkout'
-    click_button 'Place Order'
+    if Spree.version.to_f >= 3.7 and Spree.version.to_f < 4.1
+      find("#checkout-link").click
+    else
+      click_link 'checkout'
+      click_button 'Place Order'
+    end
   end
   describe 'when intents are disabled' do
@@ -40,20 +45,61 @@ describe 'Stripe Elements 3ds checkout', type: :feature, js: true do
     context 'and credit card does not require 3ds authentication' do
       let(:card_number) { '4242424242424242' }
-      it 'should place order without 3ds authentication' do
-        expect(page).to have_content('Order placed successfully')
-        order = Spree::Order.complete.last
-        expect(page.current_url).to include("/orders/#{order.number}")
-        expect(page).to have_content(order.number)
+      if Spree.version.to_f >= 3.7 and Spree.version.to_f < 4.1
+        it 'should place order without 3ds authentication', driver: :selenium_chrome_headless do
+          click_button 'Save and Continue'
+          click_button 'Save and Continue'
+          within_frame 0 do
+            fill_in 'cardnumber', with: card_number
+            fill_in 'exp-date', with: "01 / #{Time.current.strftime('%y').to_i + 3}"
+            fill_in 'cvc', with: "222"
+          end
+          click_button 'Save and Continue'
+          click_button 'Place Order'
+          expect(page).to have_content('Your order has been processed successfully')
+          order = Spree::Order.complete.last
+          expect(page.current_url).to include("/orders/#{order.number}")
+          expect(page).to have_content(order.number)
+        end
+      else
+        it 'should place order without 3ds authentication' do
+          expect(page).to have_content('Order placed successfully')
+          order = Spree::Order.complete.last
+          expect(page.current_url).to include("/orders/#{order.number}")
+          expect(page).to have_content(order.number)
+        end
       end
     end
     context 'and credit card does require 3ds authentication' do
       let(:card_number) { '4000000000003220' }
-      it 'should not place the order' do
-        expect(page).to have_content('Your card was declined. This transaction requires authentication.')
-        expect(Spree::Order.complete.last).to be_nil
+      if Spree.version.to_f >= 3.7 and Spree.version.to_f < 4.1
+        it 'should not place the order', driver: :selenium_chrome_headless do
+          click_button 'Save and Continue'
+          click_button 'Save and Continue'
+          within_frame 0 do
+            fill_in 'cardnumber', with: card_number
+            fill_in 'exp-date', with: "01 / #{Time.current.strftime('%y').to_i + 3}"
+            fill_in 'cvc', with: "222"
+          end
+          click_button 'Save and Continue'
+          click_button 'Place Order'
+          expect(page).to have_content('Your card was declined. This transaction requires authentication.')
+          expect(Spree::Order.complete.last).to be_nil
+        end
+      else
+        it 'should not place the order' do
+          expect(page).to have_content('Your card was declined. This transaction requires authentication.')
+          expect(Spree::Order.complete.last).to be_nil
+        end
       end
     end
   end
@@ -64,12 +110,32 @@ describe 'Stripe Elements 3ds checkout', type: :feature, js: true do
     context 'and credit card does not require 3ds authentication' do
       let(:card_number) { '4242424242424242' }
-      it 'should successfully place order without 3ds authentication' do
+      if Spree.version.to_f >= 3.7 and Spree.version.to_f < 4.1
+        it 'should successfully place order without 3ds authentication', driver: :selenium_chrome_headless do
+          click_button 'Save and Continue'
+          click_button 'Save and Continue'
+          within_frame 0 do
+            fill_in 'cardnumber', with: card_number
+            fill_in 'exp-date', with: "01 / #{Time.current.strftime('%y').to_i + 3}"
+            fill_in 'cvc', with: "222"
+          end
+          click_button 'Save and Continue'
+          click_button 'Place Order'
-        expect(page).to have_content('Order placed successfully')
-        order = Spree::Order.complete.last
-        expect(page.current_url).to include("/orders/#{order.number}")
-        expect(page).to have_content(order.number)
+          expect(page).to have_content('Your order has been processed successfully')
+          order = Spree::Order.complete.last
+          expect(page.current_url).to include("/orders/#{order.number}")
+          expect(page).to have_content(order.number)
+        end
+      else
+        it 'should successfully place order without 3ds authentication' do
+          expect(page).to have_content('Order placed successfully')
+          order = Spree::Order.complete.last
+          expect(page.current_url).to include("/orders/#{order.number}")
+          expect(page).to have_content(order.number)
+        end
       end
     end
@@ -77,28 +143,80 @@ describe 'Stripe Elements 3ds checkout', type: :feature, js: true do
       let(:card_number) { '4000000000003220' }
       context 'and authentication is successful' do
-        it 'should place order after 3ds authentication' do
-          within_stripe_3ds_popup do
-            click_button('Complete')
+        if Spree.version.to_f >= 3.7 and Spree.version.to_f < 4.1
+          it 'should place order after 3ds authentication', driver: :selenium_chrome_headless do
+            click_button 'Save and Continue'
+            click_button 'Save and Continue'
+            within_frame 0 do
+              fill_in 'cardnumber', with: card_number
+              fill_in 'exp-date', with: "01 / #{Time.current.strftime('%y').to_i + 3}"
+              fill_in 'cvc', with: "222"
+            end
+            click_button 'Save and Continue'
+            click_button 'Place Order'
+            within_stripe_3ds_popup do
+              click_button('Complete')
+            end
+            expect(page).to have_content('Your order has been processed successfully')
+            order = Spree::Order.complete.last
+            expect(page.current_url).to include("/orders/#{order.number}")
+            expect(page).to have_content(order.number)
           end
-          expect(page).to have_content('Order placed successfully')
-          order = Spree::Order.complete.last
-          expect(page.current_url).to include("/orders/#{order.number}")
-          expect(page).to have_content(order.number)
+        else
+          it 'should place order after 3ds authentication' do
+            within_stripe_3ds_popup do
+              click_button('Complete')
+            end
+            expect(page).to have_content('Order placed successfully')
+            order = Spree::Order.complete.last
+            expect(page.current_url).to include("/orders/#{order.number}")
+            expect(page).to have_content(order.number)
+          end
         end
       end
       context 'and authentication is unsuccessful' do
-        it 'should not place order after 3ds authentication' do
-          within_stripe_3ds_popup do
-            click_button('Fail')
-          end
-          expect(page).to_not have_content('Order placed successfully')
-          expect(page).to have_content('We are unable to authenticate your payment method.')
-          expect(page).to have_content('Please choose a different payment method and try again.')
-          expect(Spree::Order.complete.last).to be_nil
+        if Spree.version.to_f >= 3.7 and Spree.version.to_f < 4.1
+          it 'should not place order after 3ds authentication', driver: :selenium_chrome_headless do
+            click_button 'Save and Continue'
+            click_button 'Save and Continue'
+            within_frame 0 do
+              fill_in 'cardnumber', with: card_number
+              fill_in 'exp-date', with: "01 / #{Time.current.strftime('%y').to_i + 3}"
+              fill_in 'cvc', with: "222"
+            end
+            click_button 'Save and Continue'
+            click_button 'Place Order'
+            within_stripe_3ds_popup do
+              click_button('Fail')
+            end
+            expect(page).to_not have_content('Order placed successfully')
+            expect(page).to have_content('We are unable to authenticate your payment method.')
+            expect(page).to have_content('Please choose a different payment method and try again.')
+            expect(Spree::Order.complete.last).to be_nil
+          end
+        else
+          it 'should not place order after 3ds authentication' do
+            within_stripe_3ds_popup do
+              click_button('Fail')
+            end
+            expect(page).to_not have_content('Order placed successfully')
+            expect(page).to have_content('We are unable to authenticate your payment method.')
+            expect(page).to have_content('Please choose a different payment method and try again.')
+            expect(Spree::Order.complete.last).to be_nil
+          end
         end
       end
     end

data/spec/support/order_walktrough.rb ADDED

@@ -0,0 +1,73 @@
+class OrderWalkthrough
+  def self.up_to(state)
+    # A default store must exist to provide store settings
+    store = Spree::Store.default || FactoryBot.create(:store, default: true)
+    # A payment method must exist for an order to proceed through the Address state
+    unless Spree::PaymentMethod.exists?
+      FactoryBot.create(:check_payment_method)
+    end
+    # Need to create a valid zone too...
+    zone = FactoryBot.create(:zone)
+    country = FactoryBot.create(:country)
+    zone.members << Spree::ZoneMember.create(zoneable: country)
+    country.states << FactoryBot.create(:state, country: country)
+    # A shipping method must exist for rates to be displayed on checkout page
+    unless Spree::ShippingMethod.exists?
+      FactoryBot.create(:shipping_method).tap do |sm|
+        sm.calculator.preferred_amount = 10
+        sm.calculator.preferred_currency = store.default_currency
+        sm.calculator.save
+      end
+    end
+    order = Spree::Order.create!(email: '[email protected]')
+    add_line_item!(order)
+    order.next!
+    end_state_position = states.index(state.to_sym)
+    states[0...end_state_position].each do |state|
+      send(state, order)
+    end
+    order
+  end
+  private
+  def self.add_line_item!(order)
+    FactoryBot.create(:line_item, order: order)
+    order.reload
+  end
+  def self.address(order)
+    order.bill_address = FactoryBot.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
+    order.ship_address = FactoryBot.create(:address, country_id: Spree::Zone.global.members.first.zoneable.id)
+    order.next!
+  end
+  def self.delivery(order)
+    order.next!
+  end
+  def self.payment(order)
+    FactoryBot.create :payment,
+                      order: order,
+                      payment_method: Spree::PaymentMethod.first,
+                      amount: order.total
+    # TODO: maybe look at some way of making this payment_state change automatic
+    order.payment_state = 'paid'
+    order.next!
+  end
+  def self.complete(_order)
+    # noop?
+  end
+  def self.states
+    [:address, :delivery, :payment, :complete]
+  end
+end

data/spree_gateway.gemspec CHANGED

@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
   spree_version = '>= 3.7.0', '< 5.0'
   s.add_dependency 'spree_core', spree_version
   s.add_dependency 'spree_extension'
-  s.add_dependency 'deface'
   s.add_development_dependency 'braintree', '~>2.78'
   s.add_development_dependency 'rspec-activemodel-mocks'

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_gateway
 version: !ruby/object:Gem::Version
-  version: 3.9.2
+  version: 3.9.3
 platform: ruby
 authors:
 - Spree Commerce
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -44,20 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: braintree
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +105,7 @@ files:
 - app/models/spree/apple_pay_payment_decorator.rb
 - app/models/spree/billing_integration.rb
 - app/models/spree/check.rb
+- app/models/spree/credit_card_decorator.rb
 - app/models/spree/gateway/authorize_net.rb
 - app/models/spree/gateway/authorize_net_cim.rb
 - app/models/spree/gateway/balanced_gateway.rb
@@ -166,8 +153,8 @@ files:
 - db/migrate/20131112133401_migrate_stripe_preferences.rb
 - db/migrate/20200317135551_add_spree_check_payment_source.rb
 - db/migrate/20200422114908_add_intent_key_to_payment.rb
+- gemfiles/spree_3_7.gemfile
 - gemfiles/spree_4_1.gemfile
-- gemfiles/spree_4_2.gemfile
 - gemfiles/spree_master.gemfile
 - lib/active_merchant/billing/stripe_gateway_decorator.rb
 - lib/controllers/spree/api/v2/storefront/intents_controller.rb
@@ -228,6 +215,7 @@ files:
 - spec/models/spree/order_spec.rb
 - spec/requests/apple_pay_domain_verification.rb
 - spec/spec_helper.rb
+- spec/support/order_walktrough.rb
 - spec/support/wait_for_stripe.rb
 - spec/support/within_stripe_3ds_popup.rb
 - spree_gateway.gemspec
@@ -236,9 +224,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree_gateway/issues
-  changelog_uri: https://github.com/spree/spree_gateway/releases/tag/v3.9.2
+  changelog_uri: https://github.com/spree/spree_gateway/releases/tag/v3.9.3
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_gateway/tree/v3.9.2
+  source_code_uri: https://github.com/spree/spree_gateway/tree/v3.9.3
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -255,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Additional Payment Gateways for Spree Commerce
@@ -293,5 +281,6 @@ test_files:
 - spec/models/spree/order_spec.rb
 - spec/requests/apple_pay_domain_verification.rb
 - spec/spec_helper.rb
+- spec/support/order_walktrough.rb
 - spec/support/wait_for_stripe.rb
 - spec/support/within_stripe_3ds_popup.rb