Update required Ruby version to 3.2.0

activemerchant · Dec 4, 2024 · 3af8068 · 3af8068
1 parent 320b2ec
commit 3af8068
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/ruby-ci.yml b/.github/workflows/ruby-ci.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         version:
-          - 3.1
+          - 3.2
         gemfile:
           - gemfiles/Gemfile.rails50
           - gemfiles/Gemfile.rails51

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -15,7 +15,7 @@ AllCops:
     - "lib/active_merchant/billing/gateways/paypal_express.rb"
     - "vendor/**/*"
   ExtraDetails: false
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2
 
 # Active Merchant gateways are not amenable to length restrictions
 Metrics/ClassLength:

diff --git a/CHANGELOG b/CHANGELOG
@@ -103,6 +103,7 @@
 * Braintree: Account for BraintreeError [almalee24] #5346
 * Worldpay: Fix stored credentials unscheduled reason type [Buitragox] #5352
 * StripePI: Update version to 2022-11-15 [almalee24] #5314
+* Update required Ruby version to 3.2.0 [almalee24] #5341
 
 == Version 1.137.0 (August 2, 2024)
 * Unlock dependency on `rexml` to allow fixing a CVE (#5181).

diff --git a/activemerchant.gemspec b/activemerchant.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email = '[email protected]'
   s.homepage = 'http://activemerchant.org/'
 
-  s.required_ruby_version = '>= 3.1'
+  s.required_ruby_version = '>= 3.2'
 
   s.files = Dir['CHANGELOG', 'README.md', 'MIT-LICENSE', 'CONTRIBUTORS', 'lib/**/*', 'vendor/**/*']
   s.require_path = 'lib'

diff --git a/circle.yml b/circle.yml
@@ -1,6 +1,6 @@
 machine:
   ruby:
-    version: '3.1.0'
+    version: '3.2.0'
 
 dependencies:
   cache_directories:

diff --git a/gemfiles/Gemfile.rails_master b/gemfiles/Gemfile.rails_master
@@ -1,3 +1,3 @@
 eval_gemfile '../Gemfile'
 
-gem 'activesupport', '~>7.2.1'
+gem 'activesupport', github: 'rails/rails'
diff --git a/test/unit/gateways/braintree_token_nonce_test.rb b/test/unit/gateways/braintree_token_nonce_test.rb
@@ -85,7 +85,7 @@ def test_build_nonce_request_for_credit_card_without_address
   end
 
   def test_token_from
-    credit_card = credit_card(number: 4111111111111111)
+    credit_card = credit_card('4111111111111111')
     c_token = @generator.send(:token_from, credit_card, token_credit_response)
     assert_match(/tokencc_/, c_token)
 
@@ -95,7 +95,7 @@ def test_token_from
   end
 
   def test_nil_token_from
-    credit_card = credit_card(number: 4111111111111111)
+    credit_card = credit_card('4111111111111111')
     c_token = @generator.send(:token_from, credit_card, token_bank_response)
     assert_nil c_token
 

diff --git a/test/unit/gateways/versa_pay_test.rb b/test/unit/gateways/versa_pay_test.rb
@@ -117,7 +117,7 @@ def test_parse_invalid_json
 
     assert_equal({ 'errors' => '{"key1": "value1", "key2": "value2"',
                   'status' => 'Unable to parse JSON response',
-                  'message' => "859: unexpected token at '{\"key1\": \"value1\", \"key2\": \"value2\"'" },
+                  'message' => "unexpected token at '{\"key1\": \"value1\", \"key2\": \"value2\"'" },
                  @gateway.send(:parse, body))
   end