Merge branch 'master' into 20240906-attribute-aliases

rpush · Sep 9, 2024 · fa7dcee · fa7dcee
2 parents b1f8c79 + a6cfc89
commit fa7dcee
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gemfile: ['rails_5.2', 'rails_6.0', 'rails_6.1', 'rails_7.0', 'rails_7.1']
+        gemfile: ['rails_5.2', 'rails_6.0', 'rails_6.1', 'rails_7.0', 'rails_7.1', 'rails_7.2']
 
         ruby: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
 
@@ -61,6 +61,16 @@ jobs:
             gemfile: 'rails_7.1'
           - ruby: '2.6'
             gemfile: 'rails_7.1'
+          - ruby: '2.4'
+            gemfile: 'rails_7.2'
+          - ruby: '2.5'
+            gemfile: 'rails_7.2'
+          - ruby: '2.6'
+            gemfile: 'rails_7.2'
+          - ruby: '2.7'
+            gemfile: 'rails_7.2'
+          - ruby: '3.0'
+            gemfile: 'rails_7.2'
 
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile

diff --git a/.github_changelog_generator b/.github_changelog_generator
@@ -1,3 +1,3 @@
 user=rpush
 project=modis
-future-release=v4.3.1
+future-release=v4.3.2
diff --git a/Appraisals b/Appraisals
@@ -24,3 +24,8 @@ appraise 'rails-7.1' do
   gem 'activemodel', '~> 7.1.0', '!= 7.1.4' # https://github.com/rails/rails/issues/52820
   gem 'activesupport', '~> 7.1.0', '!= 7.1.4' # https://github.com/rails/rails/issues/52820
 end
+
+appraise 'rails-7.2' do
+  gem 'activemodel', '~> 7.2.0'
+  gem 'activesupport', '~> 7.2.0'
+end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [v4.3.2](https://github.com/rpush/modis/tree/v4.3.2) (2024-09-06)
+
+[Full Changelog](https://github.com/rpush/modis/compare/v4.3.1...v4.3.2)
+
+**Merged pull requests:**
+
+- Test on Rails 7.2 [\#54](https://github.com/rpush/modis/pull/54) ([benlangfeld](https://github.com/benlangfeld))
+- Test on new Ruby/Rails versions [\#52](https://github.com/rpush/modis/pull/52) ([benlangfeld](https://github.com/benlangfeld))
+
 ## [v4.3.1](https://github.com/rpush/modis/tree/v4.3.1) (2024-08-01)
 
 [Full Changelog](https://github.com/rpush/modis/compare/v4.3.0...v4.3.1)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    modis (4.3.1)
+    modis (4.3.2)
       activemodel (>= 5.2)
       activesupport (>= 5.2)
       connection_pool (>= 2)
@@ -94,7 +94,7 @@ GEM
     public_suffix (5.0.1)
     rainbow (3.0.0)
     rake (13.0.1)
-    redis (5.2.0)
+    redis (5.3.0)
       redis-client (>= 0.22.0)
     redis-client (0.22.2)
       connection_pool

diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile
@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activemodel", "~> 7.2.0"
+gem "activesupport", "~> 7.2.0"
+
+gemspec path: "../"
diff --git a/lib/modis/version.rb b/lib/modis/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modis
-  VERSION = '4.3.1'
+  VERSION = '4.3.2'
 end
diff --git a/spec/persistence_spec.rb b/spec/persistence_spec.rb
@@ -277,7 +277,7 @@ class MockModelNoAllIndex < MockModel
   end
 
   describe 'update_attributes!' do
-    around(:each) { |example| ActiveSupport::Deprecation.silence { example.run } }
+    around(:each) { |example| ActiveSupport::Deprecation.new.silence { example.run } }
 
     it 'updates the given attributes' do
       model.update_attributes!(name: 'Derp', age: 29)
@@ -331,7 +331,7 @@ class MockModelNoAllIndex < MockModel
   end
 
   describe 'update_attributes' do
-    around(:each) { |example| ActiveSupport::Deprecation.silence { example.run } }
+    around(:each) { |example| ActiveSupport::Deprecation.new.silence { example.run } }
 
     it 'updates the given attributes' do
       model.update_attributes(name: 'Derp', age: 29)