From 4f6a7e44d101169be71e244cef04799a1b10ffd5 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 19 Nov 2025 05:14:51 -0500
Subject: [PATCH] Update rubocop-rspec to version 3.8.0 (#36853)

---
 Gemfile.lock                                  | 12 ++++++------
 spec/lib/mastodon/redis_configuration_spec.rb |  6 ++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 73c54fc633b..a64430872c1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -349,7 +349,7 @@ GEM
       azure-blob (~> 0.5.2)
       hashie (~> 5.0)
     jmespath (1.6.2)
-    json (2.15.2)
+    json (2.16.0)
     json-canonicalization (1.0.0)
     json-jwt (1.17.0)
       activesupport (>= 4.2)
@@ -446,7 +446,7 @@ GEM
     mime-types-data (3.2025.0924)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.26.0)
+    minitest (5.26.1)
     msgpack (1.8.0)
     multi_json (1.17.0)
     mutex_m (0.3.0)
@@ -759,7 +759,7 @@ GEM
       rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.47.1)
+    rubocop-ast (1.48.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
@@ -778,10 +778,10 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.44.0, < 2.0)
-    rubocop-rspec (3.7.0)
+    rubocop-rspec (3.8.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rspec_rails (2.31.0)
+      rubocop (~> 1.81)
+    rubocop-rspec_rails (2.32.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
       rubocop-rspec (~> 3.5)
diff --git a/spec/lib/mastodon/redis_configuration_spec.rb b/spec/lib/mastodon/redis_configuration_spec.rb
index d8a8dd86d29..560b16ed309 100644
--- a/spec/lib/mastodon/redis_configuration_spec.rb
+++ b/spec/lib/mastodon/redis_configuration_spec.rb
@@ -73,8 +73,6 @@ RSpec.describe Mastodon::RedisConfiguration do
   end
 
   shared_examples 'sentinel support' do |prefix = nil|
-    prefix = prefix ? "#{prefix}_" : ''
-
     context 'when configuring sentinel support' do
       around do |example|
         ClimateControl.modify "#{prefix}REDIS_PASSWORD": 'testpass1', "#{prefix}REDIS_HOST": 'redis2.example.com', "#{prefix}REDIS_SENTINELS": '192.168.0.1:3000,192.168.0.2:4000', "#{prefix}REDIS_SENTINEL_MASTER": 'mainsentinel' do
@@ -199,7 +197,7 @@ RSpec.describe Mastodon::RedisConfiguration do
 
     it_behaves_like 'secondary configuration', 'SIDEKIQ'
     it_behaves_like 'setting a different driver'
-    it_behaves_like 'sentinel support', 'SIDEKIQ'
+    it_behaves_like 'sentinel support', 'SIDEKIQ_'
   end
 
   describe '#cache' do
@@ -225,6 +223,6 @@ RSpec.describe Mastodon::RedisConfiguration do
 
     it_behaves_like 'secondary configuration', 'CACHE'
     it_behaves_like 'setting a different driver'
-    it_behaves_like 'sentinel support', 'CACHE'
+    it_behaves_like 'sentinel support', 'CACHE_'
   end
 end