From 15ffd8751ae2e5e2ff00b49024e3fd11fe33bedc Mon Sep 17 00:00:00 2001
From: Paul Keen <125715+pftg@users.noreply.github.com>
Date: Sat, 13 Sep 2025 16:19:54 +0200
Subject: [PATCH 1/6] test new ruby 3.5

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 24355993..dfdcdd8c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -110,6 +110,9 @@ jobs:
             gemfile: rails80_gems.rb
             experimental: false
         include:
+          - ruby-version: 3.5.0-preview1
+            gemfile: edge_gems
+            experimental: true
           - ruby-version: 3.4
             gemfile: edge_gems.rb
             experimental: true

From 5c1155e9f7a281b06224bfe17d452519643eb279 Mon Sep 17 00:00:00 2001
From: Paul Keen <125715+pftg@users.noreply.github.com>
Date: Sat, 13 Sep 2025 16:24:57 +0200
Subject: [PATCH 2/6] updates

---
 .github/workflows/test.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dfdcdd8c..5ba9f790 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -95,10 +95,10 @@ jobs:
       matrix:
         ruby-version: [ 3.4, 3.3, 3.2, jruby-9.4, jruby-10.0 ]
         gemfile:
-          - rails70_gems.rb
           - rails71_gems.rb
           - rails72_gems.rb
           - rails80_gems.rb
+          - rails81_gems.rb
         experimental: [ false ]
         exclude:
           # We already tested last version
@@ -111,7 +111,10 @@ jobs:
             experimental: false
         include:
           - ruby-version: 3.5.0-preview1
-            gemfile: edge_gems
+            gemfile: rails81_gems.rb
+            experimental: true
+          - ruby-version: 3.5.0-preview1
+            gemfile: edge_gems.rb
             experimental: true
           - ruby-version: 3.4
             gemfile: edge_gems.rb

From 0de45dd036774aef162e3a6aa30e85f4b88f87d1 Mon Sep 17 00:00:00 2001
From: Paul Keen <125715+pftg@users.noreply.github.com>
Date: Sat, 13 Sep 2025 16:32:30 +0200
Subject: [PATCH 3/6] cleanup lint

---
 test/support/test_helpers.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/support/test_helpers.rb b/test/support/test_helpers.rb
index 619ade06..030e718d 100644
--- a/test/support/test_helpers.rb
+++ b/test/support/test_helpers.rb
@@ -4,6 +4,7 @@
 
 module TestHelpers
   include Capybara::Screenshot::Diff::TestDoubles
+
   # Common assertions for image comparison tests
   module Assertions
     # Asserts that a dimension check was called a specific number of times

From ae3d9802258710797ee5cfe8dba51dcee9380d45 Mon Sep 17 00:00:00 2001
From: Paul Keen <125715+pftg@users.noreply.github.com>
Date: Sat, 13 Sep 2025 16:38:17 +0200
Subject: [PATCH 4/6] cleanup

---
 lib/capybara/screenshot/diff/area_calculator.rb      | 2 +-
 lib/capybara_screenshot_diff/screenshot_assertion.rb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/capybara/screenshot/diff/area_calculator.rb b/lib/capybara/screenshot/diff/area_calculator.rb
index a9e2d79e..521616f5 100644
--- a/lib/capybara/screenshot/diff/area_calculator.rb
+++ b/lib/capybara/screenshot/diff/area_calculator.rb
@@ -48,7 +48,7 @@ def calculate_skip_area
         def build_regions_for(coordinates)
           coordinates
             .map { |entry| Region.from_edge_coordinates(*entry) }
-            .tap { |it| it.compact! }
+            .tap { |region| region.compact! }
         end
       end
     end
diff --git a/lib/capybara_screenshot_diff/screenshot_assertion.rb b/lib/capybara_screenshot_diff/screenshot_assertion.rb
index ea3380cf..a0e70bc6 100644
--- a/lib/capybara_screenshot_diff/screenshot_assertion.rb
+++ b/lib/capybara_screenshot_diff/screenshot_assertion.rb
@@ -18,9 +18,9 @@ def self.from(screenshot_job)
       return screenshot_job if screenshot_job.is_a?(ScreenshotAssertion)
 
       caller, name, compare = screenshot_job
-      ScreenshotAssertion.new(name).tap do |it|
-        it.caller = caller
-        it.compare = compare
+      ScreenshotAssertion.new(name).tap do |assertion|
+        assertion.caller = caller
+        assertion.compare = compare
       end
     end
 

From 3861dfff369ec088669b05f5879b47ce25aae95d Mon Sep 17 00:00:00 2001
From: Paul Keen <125715+pftg@users.noreply.github.com>
Date: Sat, 13 Sep 2025 16:50:57 +0200
Subject: [PATCH 5/6] exclude jruby 9.4

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5ba9f790..2f6f9df0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -109,6 +109,9 @@ jobs:
           - ruby-version: jruby-9.4
             gemfile: rails80_gems.rb
             experimental: false
+          - ruby-version: jruby-9.4
+            gemfile: rails81_gems.rb
+            experimental: false
         include:
           - ruby-version: 3.5.0-preview1
             gemfile: rails81_gems.rb

From 7d1bcca2bd425752b8c1ec8b292300006a44ad9d Mon Sep 17 00:00:00 2001
From: Paul Keen <125715+pftg@users.noreply.github.com>
Date: Sat, 13 Sep 2025 17:10:19 +0200
Subject: [PATCH 6/6] adds rails81

---
 gemfiles/rails81_gems.rb | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 gemfiles/rails81_gems.rb

diff --git a/gemfiles/rails81_gems.rb b/gemfiles/rails81_gems.rb
new file mode 100644
index 00000000..acc0ba85
--- /dev/null
+++ b/gemfiles/rails81_gems.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+gems = "#{File.dirname __dir__}/gems.rb"
+eval File.read(gems), binding, gems
+
+gem "activesupport", "~> 8.1.0.beta1"
+gem "actionpack", "~> 8.1.0.beta1"