Merge remote-tracking branch 'parent/main' into upstream-20241113

This commit is contained in:
KMY 2024-11-13 08:17:38 +09:00
commit 910eafda63
177 changed files with 1625 additions and 659 deletions

View file

@ -124,9 +124,10 @@ RSpec.describe SoftwareUpdateCheckService do
context 'when update checking is disabled' do
around do |example|
ClimateControl.modify UPDATE_CHECK_URL: '' do
example.run
end
original = Rails.configuration.x.mastodon.software_update_url
Rails.configuration.x.mastodon.software_update_url = ''
example.run
Rails.configuration.x.mastodon.software_update_url = original
end
before do
@ -148,9 +149,10 @@ RSpec.describe SoftwareUpdateCheckService do
let(:update_check_url) { 'https://api.example.com/update_check' }
around do |example|
ClimateControl.modify UPDATE_CHECK_URL: 'https://api.example.com/update_check' do
example.run
end
original = Rails.configuration.x.mastodon.software_update_url
Rails.configuration.x.mastodon.software_update_url = 'https://api.example.com/update_check'
example.run
Rails.configuration.x.mastodon.software_update_url = original
end
it_behaves_like 'when the feature is enabled'