From 1d08b63e5be6779792c3639c0faeec879352512e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafael@rubyonrails.org>
Date: Wed, 8 Dec 2021 21:44:11 +0000
Subject: [PATCH] Upgrade capybara to work with Ruby 3.1 and earlier

---
 Gemfile      | 4 ----
 Gemfile.lock | 8 +++++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9c12fe56200..b91c5b40fec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -184,8 +184,4 @@ if RUBY_VERSION >= "3.1"
 
   # digest gem, which is one of the default gems has bumped to 3.1.0.pre for ruby 3.1.0dev.
   gem "digest", "~> 3.1.0.pre", require: false
-
-  # matrix was removed from default gems in Ruby 3.1, but is used by the `capybara` gem.
-  # So we need to add it as a dependency until `capybara` is fixed: https://github.com/teamcapybara/capybara/pull/2468
-  gem "matrix", require: false
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 868561f8620..94766670248 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -108,7 +108,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     amq-protocol (2.3.2)
     ast (2.4.2)
@@ -165,8 +165,9 @@ GEM
     bunny (2.18.0)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
-    capybara (3.35.3)
+    capybara (3.36.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
@@ -314,6 +315,7 @@ GEM
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (1.0.2)
+    matrix (0.4.2)
     memoist (0.16.2)
     method_source (1.0.0)
     mini_magick (4.11.0)
@@ -384,7 +386,7 @@ GEM
     redis (4.3.1)
     redis-namespace (1.8.1)
       redis (>= 3.0.4)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     reline (0.2.7)
       io-console (~> 0.5)
     representable (3.1.1)