From 3e682411bfdfbc1f70f155831b1902fa5b9ef5e0 Mon Sep 17 00:00:00 2001
From: Nikita Vasilevsky <nikita.vasilevsky@shopify.com>
Date: Wed, 25 Jan 2023 10:14:26 -0500
Subject: [PATCH] Add Rails 7 and Ruby 3.2 to ci matrix (#756)

---
 .github/workflows/ci.yml   | 4 ++--
 gemfiles/rails_7_0.gemfile | 5 +++++
 test/test_helper.rb        | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 gemfiles/rails_7_0.gemfile

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b214b629..bbbcd4b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,8 +9,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gemfile: [Gemfile, gemfiles/rails_6_0.gemfile, gemfiles/rails_6_1.gemfile, gemfiles/rails_edge.gemfile]
-        ruby: ["2.7", "3.0", "3.1"]
+        gemfile: [Gemfile, gemfiles/rails_6_0.gemfile, gemfiles/rails_6_1.gemfile, gemfiles/rails_7_0.gemfile, gemfiles/rails_edge.gemfile]
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
         database: [sqlite]
         include:
           - gemfile: "gemfiles/postgresql.gemfile"
diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile
new file mode 100644
index 00000000..b800ebe5
--- /dev/null
+++ b/gemfiles/rails_7_0.gemfile
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+@rails_gem_requirement = "~> 7.0.4"
+
+eval_gemfile "../Gemfile"
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 253d7901..f4358ad7 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -40,6 +40,11 @@
 module Warning
   class << self
     def warn(message)
+      # gems/selenium-webdriver-4.7.1/lib/selenium/webdriver/remote/bridge.rb:633:
+      # warning: Expected selenium/webdriver/remote/commands
+      # to define Selenium::WebDriver::Remote::COMMANDS but it didn't
+      return if message.match?(/Selenium::WebDriver::Remote::COMMANDS/)
+
       raise message.to_s
     end
   end