gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-11-27 18:10:58 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Update rubocop-rspec to version 3.8.0 (#36853)

Browse Source
This commit is contained in:
Matt Jankowski 2025-11-19 05:14:51 -05:00 committed by GitHub
parent 81ffd1d3c7
commit 4f6a7e44d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Gemfile.lock
View File

@ -349,7 +349,7 @@ GEM
azure-blob (~> 0.5.2) azure-blob (~> 0.5.2)
hashie (~> 5.0) hashie (~> 5.0)
jmespath (1.6.2) jmespath (1.6.2)
json (2.15.2) json (2.16.0)
json-canonicalization (1.0.0) json-canonicalization (1.0.0)
json-jwt (1.17.0) json-jwt (1.17.0)
activesupport (>= 4.2) activesupport (>= 4.2)
@ -446,7 +446,7 @@ GEM
mime-types-data (3.2025.0924) mime-types-data (3.2025.0924)
mini_mime (1.1.5) mini_mime (1.1.5)
mini_portile2 (2.8.9) mini_portile2 (2.8.9)
minitest (5.26.0) minitest (5.26.1)
msgpack (1.8.0) msgpack (1.8.0)
multi_json (1.17.0) multi_json (1.17.0)
mutex_m (0.3.0) mutex_m (0.3.0)
@ -759,7 +759,7 @@ GEM
rubocop-ast (>= 1.47.1, < 2.0) rubocop-ast (>= 1.47.1, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0) unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.47.1) rubocop-ast (1.48.0)
parser (>= 3.3.7.2) parser (>= 3.3.7.2)
prism (~> 1.4) prism (~> 1.4)
rubocop-capybara (2.22.1) rubocop-capybara (2.22.1)
@ -778,10 +778,10 @@ GEM
rack (>= 1.1) rack (>= 1.1)
rubocop (>= 1.75.0, < 2.0) rubocop (>= 1.75.0, < 2.0)
rubocop-ast (>= 1.44.0, < 2.0) rubocop-ast (>= 1.44.0, < 2.0)
rubocop-rspec (3.7.0) rubocop-rspec (3.8.0)
lint_roller (~> 1.1) lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1) rubocop (~> 1.81)
rubocop-rspec_rails (2.31.0) rubocop-rspec_rails (2.32.0)
lint_roller (~> 1.1) lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1) rubocop (~> 1.72, >= 1.72.1)
rubocop-rspec (~> 3.5) rubocop-rspec (~> 3.5)

6
spec/lib/mastodon/redis_configuration_spec.rb
View File

@ -73,8 +73,6 @@ RSpec.describe Mastodon::RedisConfiguration do
end end
shared_examples 'sentinel support' do |prefix = nil| shared_examples 'sentinel support' do |prefix = nil|
prefix = prefix ? "#{prefix}_" : ''
context 'when configuring sentinel support' do context 'when configuring sentinel support' do
around do |example| 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 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 'secondary configuration', 'SIDEKIQ'
it_behaves_like 'setting a different driver' it_behaves_like 'setting a different driver'
it_behaves_like 'sentinel support', 'SIDEKIQ' it_behaves_like 'sentinel support', 'SIDEKIQ_'
end end
describe '#cache' do describe '#cache' do
@ -225,6 +223,6 @@ RSpec.describe Mastodon::RedisConfiguration do
it_behaves_like 'secondary configuration', 'CACHE' it_behaves_like 'secondary configuration', 'CACHE'
it_behaves_like 'setting a different driver' it_behaves_like 'setting a different driver'
it_behaves_like 'sentinel support', 'CACHE' it_behaves_like 'sentinel support', 'CACHE_'
end end
end end