Merge pull request #372 from spree/fix/ruby-3-0-0

Ruby 3.0 support
spree · Jan 14, 2021 · 97e27b8 · 97e27b8
2 parents be94871 + 6ad87f5
commit 97e27b8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,22 +15,26 @@ services:
 language: ruby
 
 rvm:
-  - 2.6
+  - 2.7
+  - 3.0
 
 env:
   - DB=mysql
   - DB=postgres
 
 gemfile:
   - gemfiles/spree_3_7.gemfile
-  - gemfiles/spree_4_0.gemfile
   - gemfiles/spree_4_1.gemfile
-  - gemfiles/spree_4_2.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'@'%';"

diff --git a/Appraisals b/Appraisals
@@ -4,16 +4,6 @@ appraise 'spree-3-7' do
   gem 'sass-rails'
 end
 
-appraise 'spree-4-0' do
-  gem 'spree', '~> 4.0.0'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-4-2' do
-  gem 'spree', '~> 4.2.0.beta'
-  gem 'rails-controller-testing'
-end
-
 appraise 'spree-4-1' do
   gem 'spree', '~> 4.1.0'
   gem 'rails-controller-testing'

diff --git a/app/models/spree/gateway/stripe_ach_gateway.rb b/app/models/spree/gateway/stripe_ach_gateway.rb
@@ -9,7 +9,7 @@ def payment_source_class
       Check
     end
 
-    def verify(source, **gateway_options)
+    def verify(source, gateway_options)
       provider.verify(source, gateway_options)
     end
 

diff --git a/gemfiles/spree_4_0.gemfile b/gemfiles/spree_4_0.gemfile
diff --git a/gemfiles/spree_4_2.gemfile b/gemfiles/spree_4_2.gemfile
diff --git a/lib/spree_gateway/version.rb b/lib/spree_gateway/version.rb
@@ -1,5 +1,5 @@
 module SpreeGateway
   def self.version
-    '3.9.2'
+    '3.9.3'
   end
 end