Merge pull request #331 from spark-solutions/fix/zeiwerk-fixes

Fix decorators to work with Rails 6.0 and Zeitwerk autoloader

.travis.yml

@@ -5,13 +5,14 @@ language: ruby
 
 addons:
   chrome: stable
+  postgresql: 9.4
 
 env:
   - DB=postgres
   - DB=mysql
 
 gemfile:
-  - gemfiles/spree_3_2.gemfile
+  # - gemfiles/spree_3_2.gemfile
   - gemfiles/spree_3_5.gemfile
   - gemfiles/spree_3_7.gemfile
   - gemfiles/spree_master.gemfile
@@ -27,12 +28,16 @@ rvm:
 
 matrix:
     allow_failures:
-          - gemfile: gemfiles/spree_master.gemfile
+      - gemfile: gemfiles/spree_master.gemfile
     exclude:
-    - rvm: 2.3.7
-      gemfile: gemfiles/spree_master.gemfile
-    - rvm: 2.4.4
-      gemfile: gemfiles/spree_master.gemfile
+      - rvm: 2.3.7
+        gemfile: gemfiles/spree_master.gemfile
+      - rvm: 2.4.4
+        gemfile: gemfiles/spree_master.gemfile
+      - rvm: 2.5.1
+        gemfile: gemfiles/spree_3_2.gemfile
+      - rvm: 2.4.4
+        gemfile: gemfiles/spree_3_2.gemfile
 
 before_install:
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"

Appraisals

@@ -10,6 +10,7 @@ end
 
 appraise 'spree-3-7' do
   gem 'spree', '~> 3.7.0'
+  gem 'sass-rails'
   gem 'rails-controller-testing'
 end
 

app/models/spree/apple_pay_order_decorator.rb

@@ -0,0 +1,20 @@
+module Spree
+  module ApplePayOrderDecorator
+    def confirmation_required?
+      return false if paid_with_apple_pay?
+
+      # Little hacky fix for #4117
+      # If this wasn't here, order would transition to address state on confirm failure
+      # because there would be no valid payments any more.
+      Spree::Config[:always_include_confirm_step] ||
+        payments.valid.map(&:payment_method).compact.any?(&:payment_profiles_supported?) ||
+        confirm?
+    end
+
+    def paid_with_apple_pay?
+      payments.valid.any?(&:apple_pay?)
+    end
+  end
+end
+
+Spree::Order.prepend Spree::ApplePayOrderDecorator

app/models/spree/payment_decorator.rb → app/models/spree/apple_pay_payment_decorator.rb

@@ -1,9 +1,9 @@
-module SpreeGateway
+module Spree
   module ApplePayPaymentDecorator
     def apple_pay?
       payment_method.is_a? Spree::Gateway::StripeApplePayGateway
     end
   end
 end
 
-Spree::Payment.prepend SpreeGateway::ApplePayPaymentDecorator
+Spree::Payment.prepend Spree::ApplePayPaymentDecorator

gemfiles/spree_3_7.gemfile

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