From f8cf9d9b5f2914817b68f51ae01900e1d659e812 Mon Sep 17 00:00:00 2001 From: Damian Legawiec <damian@sparksolutions.co> Date: Thu, 14 Jan 2021 19:24:07 +0100 Subject: [PATCH 1/3] Fixed Stripe ACH gateway for Ruby 3.0 --- app/models/spree/gateway/stripe_ach_gateway.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/spree/gateway/stripe_ach_gateway.rb b/app/models/spree/gateway/stripe_ach_gateway.rb index 6eeef2fa..3f19bf41 100644 --- 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 From 0f789560a94b7c21d35872c5436547904f137fc4 Mon Sep 17 00:00:00 2001 From: Damian Legawiec <damian@sparksolutions.co> Date: Thu, 14 Jan 2021 19:24:56 +0100 Subject: [PATCH 2/3] Test against Ruby 3.0 --- .travis.yml | 12 ++++++++---- Appraisals | 10 ---------- gemfiles/spree_4_0.gemfile | 8 -------- gemfiles/spree_4_2.gemfile | 8 -------- 4 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 gemfiles/spree_4_0.gemfile delete mode 100644 gemfiles/spree_4_2.gemfile diff --git a/.travis.yml b/.travis.yml index 3860b0d0..023b2786 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,8 @@ services: language: ruby rvm: - - 2.6 + - 2.7 + - 3.0 env: - DB=mysql @@ -23,14 +24,17 @@ env: 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 index 79e7a3a0..33a9049f 100644 --- 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/gemfiles/spree_4_0.gemfile b/gemfiles/spree_4_0.gemfile deleted file mode 100644 index 4dd8eb8f..00000000 --- a/gemfiles/spree_4_0.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails-controller-testing" -gem "spree", "~> 4.0.0" - -gemspec path: "../" diff --git a/gemfiles/spree_4_2.gemfile b/gemfiles/spree_4_2.gemfile deleted file mode 100644 index c5cbce70..00000000 --- a/gemfiles/spree_4_2.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails-controller-testing" -gem "spree", "~> 4.2.0.beta" - -gemspec path: "../" From 6ad87f5c686c6807edd6f5db637f8ae88f4d8ce3 Mon Sep 17 00:00:00 2001 From: Damian Legawiec <damian@sparksolutions.co> Date: Thu, 14 Jan 2021 20:07:16 +0100 Subject: [PATCH 3/3] Bump version to 3.9.3 --- lib/spree_gateway/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/spree_gateway/version.rb b/lib/spree_gateway/version.rb index 2095a78f..c0aa7786 100644 --- 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