From 4c9ea35ae708802191432ee713a84ebe89c6c235 Mon Sep 17 00:00:00 2001
From: Santiago Bartesaghi <santib@hey.com>
Date: Fri, 5 Jul 2024 18:04:36 -0300
Subject: [PATCH] Update Ruby and Rails versions (#86)

---
 .github/workflows/ci.yml                     | 24 ++++++++++++++++++--
 spec/gemfiles/rails_5_2.gemfile              |  1 +
 spec/gemfiles/rails_7_2.gemfile              |  5 ++++
 spec/support/database_cleaner_monkeypatch.rb |  4 +++-
 yaaf.gemspec                                 |  4 ++--
 5 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 spec/gemfiles/rails_7_2.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 69501f7..7a3bd63 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,8 +8,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        gemfile: [rails_5_2.gemfile, rails_6_0.gemfile, rails_6_1.gemfile, rails_7_0.gemfile, rails_7_1.gemfile, rails_main.gemfile]
-        ruby_version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
+        gemfile: [rails_5_2.gemfile, rails_6_0.gemfile, rails_6_1.gemfile, rails_7_0.gemfile, rails_7_1.gemfile, rails_7_2.gemfile, rails_main.gemfile]
+        ruby_version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
         exclude:
           - gemfile: rails_main.gemfile
             ruby_version: '2.3'
@@ -21,6 +21,20 @@ jobs:
             ruby_version: '2.6'
           - gemfile: rails_main.gemfile
             ruby_version: '2.7'
+          - gemfile: rails_main.gemfile
+            ruby_version: '3.0'
+          - gemfile: rails_7_2.gemfile
+            ruby_version: '2.3'
+          - gemfile: rails_7_2.gemfile
+            ruby_version: '2.4'
+          - gemfile: rails_7_2.gemfile
+            ruby_version: '2.5'
+          - gemfile: rails_7_2.gemfile
+            ruby_version: '2.6'
+          - gemfile: rails_7_2.gemfile
+            ruby_version: '2.7'
+          - gemfile: rails_7_2.gemfile
+            ruby_version: '3.0'
           - gemfile: rails_7_1.gemfile
             ruby_version: '2.3'
           - gemfile: rails_7_1.gemfile
@@ -45,6 +59,8 @@ jobs:
             ruby_version: '3.1'
           - gemfile: rails_6_1.gemfile
             ruby_version: '3.2'
+          - gemfile: rails_6_1.gemfile
+            ruby_version: '3.3'
           - gemfile: rails_6_0.gemfile
             ruby_version: '2.3'
           - gemfile: rails_6_0.gemfile
@@ -55,12 +71,16 @@ jobs:
             ruby_version: '3.1'
           - gemfile: rails_6_0.gemfile
             ruby_version: '3.2'
+          - gemfile: rails_6_0.gemfile
+            ruby_version: '3.3'
           - gemfile: rails_5_2.gemfile
             ruby_version: '3.0'
           - gemfile: rails_5_2.gemfile
             ruby_version: '3.1'
           - gemfile: rails_5_2.gemfile
             ruby_version: '3.2'
+          - gemfile: rails_5_2.gemfile
+            ruby_version: '3.3'
     env:
       BUNDLE_GEMFILE: spec/gemfiles/${{ matrix.gemfile }}
     steps:
diff --git a/spec/gemfiles/rails_5_2.gemfile b/spec/gemfiles/rails_5_2.gemfile
index 0610b6d..c13ab29 100644
--- a/spec/gemfiles/rails_5_2.gemfile
+++ b/spec/gemfiles/rails_5_2.gemfile
@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec path: '../..'
 
 gem 'rails', '~> 5.2.0'
+gem 'sqlite3', '~> 1.4.4'
diff --git a/spec/gemfiles/rails_7_2.gemfile b/spec/gemfiles/rails_7_2.gemfile
new file mode 100644
index 0000000..0c33e13
--- /dev/null
+++ b/spec/gemfiles/rails_7_2.gemfile
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../..'
+
+gem 'rails', '~> 7.2.0.beta2'
diff --git a/spec/support/database_cleaner_monkeypatch.rb b/spec/support/database_cleaner_monkeypatch.rb
index d9020c0..7a5fa33 100644
--- a/spec/support/database_cleaner_monkeypatch.rb
+++ b/spec/support/database_cleaner_monkeypatch.rb
@@ -2,7 +2,9 @@ module DatabaseCleaner
   module ActiveRecord
     class Base < DatabaseCleaner::Strategy
       def self.migration_table_name
-        if Gem::Version.new('6.0.0') <= ::ActiveRecord.version
+        if ::ActiveRecord.version >= Gem::Version.new('7.2.0.beta2')
+          ::ActiveRecord::Base.connection_pool.schema_migration.table_name
+        elsif ::ActiveRecord.version >= Gem::Version.new('6.0.0')
           ::ActiveRecord::Base.connection.schema_migration.table_name
         else
           ::ActiveRecord::SchemaMigration.table_name
diff --git a/yaaf.gemspec b/yaaf.gemspec
index 6553050..2499b50 100644
--- a/yaaf.gemspec
+++ b/yaaf.gemspec
@@ -24,11 +24,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activemodel', '>= 5.2'
   spec.add_dependency 'activerecord', '>= 5.2'
 
-  spec.add_development_dependency 'database_cleaner-active_record', '~> 2.0.1'
+  spec.add_development_dependency 'database_cleaner-active_record', '~> 2.1.0'
   spec.add_development_dependency 'rake', '~> 13.0.1'
   spec.add_development_dependency 'reek', '~> 5.6.0'
   spec.add_development_dependency 'rspec', '~> 3.9.0'
   spec.add_development_dependency 'rubocop', '~> 0.80.0'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'sqlite3', '~> 1.4.2'
+  spec.add_development_dependency 'sqlite3', '~> 1.5.0'
 end