From 273be55de8029625231d642c9f1c3dfed7c3e094 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 20 Sep 2021 18:20:27 -0500
Subject: [PATCH] Upgrade to Ruby 3.0.2.

---
 .ruby-version                               | 2 +-
 config/docker/build-base-image.sh           | 2 +-
 test/functional/comments_controller_test.rb | 2 +-
 test/test_helpers/controller_helper.rb      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 860487ca1..b50214693 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.1
+3.0.2
diff --git a/config/docker/build-base-image.sh b/config/docker/build-base-image.sh
index 8f618fbcf..0280aadad 100755
--- a/config/docker/build-base-image.sh
+++ b/config/docker/build-base-image.sh
@@ -2,7 +2,7 @@
 
 set -xeuo pipefail
 
-RUBY_VERSION="${RUBY_VERSION:-2.7.4}"
+RUBY_VERSION="${RUBY_VERSION:-3.0.2}"
 VIPS_VERSION="${VIPS_VERSION:-8.10.6}"
 FFMPEG_VERSION="${FFMPEG_VERSION:-4.4}"
 EXIFTOOL_VERSION="${EXIFTOOL_VERSION:-12.30}"
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index ca1c7ca28..13608c82f 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -65,7 +65,7 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
           assert_response :success
         end
 
-        should respond_to_search({}, other_params: {group_by: "comment"}).with { [@deleted_comment, @mod_comment, @user_comment] }
+        should respond_to_search(other_params: {group_by: "comment"}).with { [@deleted_comment, @mod_comment, @user_comment] }
         should respond_to_search(body_matches: "blah").with { @mod_comment }
         should respond_to_search(score: 10).with { @user_comment }
         should respond_to_search(is_sticky: "true").with { @mod_comment }
diff --git a/test/test_helpers/controller_helper.rb b/test/test_helpers/controller_helper.rb
index 35796d6de..5453c125b 100644
--- a/test/test_helpers/controller_helper.rb
+++ b/test/test_helpers/controller_helper.rb
@@ -9,7 +9,7 @@ module ControllerHelper
   #   setup { @touhou = create(:tag, name: "touhou") }
   #   should respond_to_search(name: "touhou").with { @touhou }
   #
-  def respond_to_search(search_params, other_params: {})
+  ruby2_keywords def respond_to_search(search_params, other_params: {})
     RespondToSearchMatcher.new(search_params, other_params)
   end