From c4cb29122923de07db000257dc846e0baf04df6c Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@ankane.org>
Date: Fri, 9 Aug 2024 20:26:13 -0700
Subject: [PATCH] Test with Rails 7.2.0 on CI

---
 .github/workflows/build.yml                            |  4 ++--
 Gemfile                                                |  2 +-
 .../{activerecord72.gemfile => activerecord71.gemfile} |  2 +-
 test/controller_test.rb                                | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename gemfiles/{activerecord72.gemfile => activerecord71.gemfile} (77%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 39293dcd..8bc8df87 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,10 +8,10 @@ jobs:
       matrix:
         include:
           - ruby: 3.3
-            gemfile: gemfiles/activerecord72.gemfile
+            gemfile: Gemfile
             postgres: 16
           - ruby: 3.3
-            gemfile: Gemfile
+            gemfile: gemfiles/activerecord71.gemfile
             postgres: 14
           - ruby: 3.2
             gemfile: gemfiles/activerecord70.gemfile
diff --git a/Gemfile b/Gemfile
index f0a48c2c..67773886 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ gemspec
 gem "minitest", ">= 5"
 gem "rake"
 
-gem "activerecord", "~> 7.1.0"
+gem "activerecord", "~> 7.2.0"
 gem "combustion"
 gem "pg"
 gem "pg_query"
diff --git a/gemfiles/activerecord72.gemfile b/gemfiles/activerecord71.gemfile
similarity index 77%
rename from gemfiles/activerecord72.gemfile
rename to gemfiles/activerecord71.gemfile
index 4ccd48bc..8c42818c 100644
--- a/gemfiles/activerecord72.gemfile
+++ b/gemfiles/activerecord71.gemfile
@@ -5,7 +5,7 @@ gemspec path: ".."
 gem "minitest", ">= 5"
 gem "rake"
 
-gem "activerecord", "~> 7.2.0.beta2"
+gem "activerecord", "~> 7.1.0"
 gem "combustion"
 gem "pg"
 gem "pg_query"
diff --git a/test/controller_test.rb b/test/controller_test.rb
index 26c5cd4e..6cb3dd95 100644
--- a/test/controller_test.rb
+++ b/test/controller_test.rb
@@ -176,11 +176,11 @@ def test_maintenance
     assert_response :success
   end
 
-  def test_kill
-    # prevent warning for now
-    # post pg_hero.kill_path(pid: 1_000_000_000)
-    # assert_redirected_to "/"
-  end
+  # prevent warning for now
+  # def test_kill
+  #   post pg_hero.kill_path(pid: 1_000_000_000)
+  #   assert_redirected_to "/"
+  # end
 
   def test_reset_query_stats
     post pg_hero.reset_query_stats_path