From f44d8028d302a73e1b060b5889575af1c81ab79d Mon Sep 17 00:00:00 2001
From: Paul Keen <125715+pftg@users.noreply.github.com>
Date: Tue, 31 Oct 2023 18:08:03 +0100
Subject: [PATCH] Adds rails 7.1 to CI/CD

---
 .github/workflows/lint.yml |  4 ++--
 .github/workflows/test.yml | 18 +++++++++++-------
 Rakefile                   |  2 +-
 gemfiles/rails71_gems.rb   |  7 +++++++
 4 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 gemfiles/rails71_gems.rb

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index bdff0062..3b0f1fae 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -5,8 +5,8 @@ on:
   pull_request:
     branches: [ master ]
     paths:
-      - '*.rb'
-      - '*.yml'
+      - '**.rb'
+      - '**.yml'
       - '.github/workflows/lint.yml'
       - '!bin/**'
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cb9beeee..e1f30d9a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
 
 env:
-  BUNDLE_GEMFILE: gemfiles/rails70_gems.rb
+  BUNDLE_GEMFILE: gemfiles/rails71_gems.rb
   DEBIAN_FRONTEND: noninteractive
   FERRUM_PROCESS_TIMEOUT: 40
   RUBY_YJIT_ENABLE: 1
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: 3.2
           bundler-cache: true
       - name: Cache Webdrivers
         uses: actions/cache@v3
@@ -137,29 +137,33 @@ jobs:
       matrix:
         ruby-version: [ 3.2, 3.1, 3.0, jruby ]
         gemfile:
+          - rails71_gems.rb
           - rails70_gems.rb
           - rails61_gems.rb
         experimental: [ false ]
         exclude:
           # We already tested last version
           - ruby-version: 3.2
-            gemfile: gemfiles/rails70_gems.rb
+            gemfile: rails71_gems.rb
             experimental: false
         include:
           - ruby-version: 3.2
             gemfile: edge_gems.rb
             experimental: true
           - ruby-version: ruby-head
-            gemfile: rails70_gems.rb
+            gemfile: rails71_gems.rb
+            experimental: true
+          - ruby-version: 3.3.0-preview2
+            gemfile: rails71_gems.rb
             experimental: true
           - ruby-version: jruby-head
-            gemfile: rails70_gems.rb
+            gemfile: rails71_gems.rb
             experimental: true
           - ruby-version: truffleruby
-            gemfile: rails70_gems.rb
+            gemfile: rails71_gems.rb
             experimental: true
           - ruby-version: truffleruby+graalvm
-            gemfile: rails70_gems.rb
+            gemfile: rails71_gems.rb
             experimental: true
 
     env:
diff --git a/Rakefile b/Rakefile
index 374080c8..fa696d71 100644
--- a/Rakefile
+++ b/Rakefile
@@ -33,7 +33,7 @@ task "clobber" do
 end
 
 task "test:benchmark" do
-  require_relative "./scripts/benchmark/find_region_benchmark"
+  require_relative "scripts/benchmark/find_region_benchmark"
   benchmark = Capybara::Screenshot::Diff::Drivers::FindRegionBenchmark.new
 
   puts "For Medium Screen Size: 800x600"
diff --git a/gemfiles/rails71_gems.rb b/gemfiles/rails71_gems.rb
new file mode 100644
index 00000000..32be55d6
--- /dev/null
+++ b/gemfiles/rails71_gems.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+gems = "#{File.dirname __dir__}/gems.rb"
+eval File.read(gems), binding, gems
+
+gem "actionpack", "~> 7.1", "< 7.2"
+gem "capybara", ">= 3.26"