From 6a31b91138853b1ab97ddfe8b7ac11a288cbc20c Mon Sep 17 00:00:00 2001
From: Peter Goldstein <peter.m.goldstein@gmail.com>
Date: Thu, 10 Mar 2022 16:30:41 -0800
Subject: [PATCH 1/2] Add Ruby 3.1 and Rails 7 to the CI run

---
 .github/workflows/ci.yml  | 48 ++++++++++++++++++++++++++++++++-------
 Appraisals                |  3 ++-
 gemfiles/rails7.0.gemfile | 19 ++++++++++++++++
 3 files changed, 61 insertions(+), 9 deletions(-)
 create mode 100644 gemfiles/rails7.0.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d8d4846..4a76e47 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,8 @@ jobs:
           - 2.5
           - 2.6
           - 2.7
-          - 3.0
+          - '3.0'
+          - 3.1
         gemfile:
           - gemfiles/rails3.2.gemfile
           - gemfiles/rails4.0.gemfile
@@ -39,6 +40,7 @@ jobs:
           - gemfiles/rails5.2.gemfile
           - gemfiles/rails6.0.gemfile
           - gemfiles/rails6.1.gemfile
+          - gemfiles/rails7.0.gemfile
         exclude:
           - ruby: 2.1
             gemfile: gemfiles/rails5.0.gemfile
@@ -50,16 +52,24 @@ jobs:
             gemfile: gemfiles/rails6.0.gemfile
           - ruby: 2.1
             gemfile: gemfiles/rails6.1.gemfile
+          - ruby: 2.1
+            gemfile: gemfiles/rails7.0.gemfile
           - ruby: 2.2
             gemfile: gemfiles/rails5.2.gemfile
           - ruby: 2.2
             gemfile: gemfiles/rails6.0.gemfile
           - ruby: 2.2
             gemfile: gemfiles/rails6.1.gemfile
+          - ruby: 2.2
+            gemfile: gemfiles/rails7.0.gemfile
           - ruby: 2.3
             gemfile: gemfiles/rails6.0.gemfile
           - ruby: 2.3
             gemfile: gemfiles/rails6.1.gemfile
+          - ruby: 2.3
+            gemfile: gemfiles/rails6.1.gemfile
+          - ruby: 2.3
+            gemfile: gemfiles/rails7.0.gemfile
           - ruby: 2.4
             gemfile: gemfiles/rails3.2.gemfile
           - ruby: 2.4
@@ -70,18 +80,24 @@ jobs:
             gemfile: gemfiles/rails6.0.gemfile
           - ruby: 2.4
             gemfile: gemfiles/rails6.1.gemfile
+          - ruby: 2.4
+            gemfile: gemfiles/rails7.0.gemfile
           - ruby: 2.5
             gemfile: gemfiles/rails3.2.gemfile
           - ruby: 2.5
             gemfile: gemfiles/rails4.0.gemfile
           - ruby: 2.5
             gemfile: gemfiles/rails4.1.gemfile
+          - ruby: 2.5
+            gemfile: gemfiles/rails7.0.gemfile
           - ruby: 2.6
             gemfile: gemfiles/rails3.2.gemfile
           - ruby: 2.6
             gemfile: gemfiles/rails4.0.gemfile
           - ruby: 2.6
             gemfile: gemfiles/rails4.1.gemfile
+          - ruby: 2.6
+            gemfile: gemfiles/rails7.0.gemfile
           - ruby: 2.7
             gemfile: gemfiles/rails3.2.gemfile
           - ruby: 2.7
@@ -90,20 +106,36 @@ jobs:
             gemfile: gemfiles/rails4.1.gemfile
           - ruby: 2.7
             gemfile: gemfiles/rails4.2.gemfile
-          - ruby: 3.0
+          - ruby: '3.0'
             gemfile: gemfiles/rails3.2.gemfile
-          - ruby: 3.0
+          - ruby: '3.0'
             gemfile: gemfiles/rails4.0.gemfile
-          - ruby: 3.0
+          - ruby: '3.0'
             gemfile: gemfiles/rails4.1.gemfile
-          - ruby: 3.0
+          - ruby: '3.0'
             gemfile: gemfiles/rails4.2.gemfile
-          - ruby: 3.0
+          - ruby: '3.0'
             gemfile: gemfiles/rails5.0.gemfile
-          - ruby: 3.0
+          - ruby: '3.0'
             gemfile: gemfiles/rails5.1.gemfile
-          - ruby: 3.0
+          - ruby: '3.0'
             gemfile: gemfiles/rails5.2.gemfile
+          - ruby: 3.1
+            gemfile: gemfiles/rails3.2.gemfile
+          - ruby: 3.1
+            gemfile: gemfiles/rails4.0.gemfile
+          - ruby: 3.1
+            gemfile: gemfiles/rails4.1.gemfile
+          - ruby: 3.1
+            gemfile: gemfiles/rails4.2.gemfile
+          - ruby: 3.1
+            gemfile: gemfiles/rails5.0.gemfile
+          - ruby: 3.1
+            gemfile: gemfiles/rails5.1.gemfile
+          - ruby: 3.1
+            gemfile: gemfiles/rails5.2.gemfile
+          - ruby: 3.1
+            gemfile: gemfiles/rails6.0.gemfile
         include:
           - ruby: 2.7
             os: ubuntu-latest
diff --git a/Appraisals b/Appraisals
index bd50b3e..564cedf 100644
--- a/Appraisals
+++ b/Appraisals
@@ -7,7 +7,8 @@ rails_versions = [
   %w[5.1 5.1.7],
   %w[5.2 5.2.4],
   %w[6.0 6.0.3],
-  %w[6.1 6.1.0]
+  %w[6.1 6.1.0],
+  %w[7.0 7.0.1]
 ]
 
 rails_versions.each do |(version, rails)|
diff --git a/gemfiles/rails7.0.gemfile b/gemfiles/rails7.0.gemfile
new file mode 100644
index 0000000..8c2a616
--- /dev/null
+++ b/gemfiles/rails7.0.gemfile
@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "ammeter", "~> 1.1.4"
+gem "appraisal", "~> 2.4.1"
+gem "yard", "~> 0.9.24"
+gem "capybara", "~> 2.18.0"
+gem "rspec-rails", "~> 5.1.0"
+gem "public_suffix", "~> 4.0.6"
+gem "railties", "~> 7.0.0"
+
+group :metrics do
+  gem "coveralls", "0.8.23"
+  gem "simplecov", "~> 0.16.1"
+  gem "yardstick", "~> 0.9.9"
+end
+
+gemspec path: "../"

From 7cc1b1a7361a2fdb003affe01399341f78ad6aeb Mon Sep 17 00:00:00 2001
From: Peter Goldstein <peter.m.goldstein@gmail.com>
Date: Thu, 10 Mar 2022 16:43:07 -0800
Subject: [PATCH 2/2] Add changelog entry

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8859043..7606bdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change log
 
+### Changed
+* Support Rails 7.0 and Ruby 3.1 in tests
+
 ## [v0.10.0] - 2020-11-21
 
 ### Changed