techhub/mastodon
2
0
Fork 0
Code Activity

Move "limited federation mode" config to x.mastodon area (#35041)

Browse Source
This commit is contained in:
Matt Jankowski
2025-06-16 02:13:03 -04:00
committed by GitHub
parent ed4788a342
commit 6f2aba989f
15 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/requests/cache_spec.rb
View File

@@ -472,12 +472,12 @@ RSpec.describe 'Caching behavior' do
context 'when enabling LIMITED_FEDERATION_MODE mode' do
around do |example|
ClimateControl.modify LIMITED_FEDERATION_MODE: 'true' do
old_limited_federation_mode = Rails.configuration.x.limited_federation_mode
Rails.configuration.x.limited_federation_mode = true
old_limited_federation_mode = Rails.configuration.x.mastodon.limited_federation_mode
Rails.configuration.x.mastodon.limited_federation_mode = true
example.run
Rails.configuration.x.limited_federation_mode = old_limited_federation_mode
Rails.configuration.x.mastodon.limited_federation_mode = old_limited_federation_mode
end
end

10
spec/requests/instance_actor_spec.rb
View File

@@ -4,7 +4,7 @@ require 'rails_helper'
RSpec.describe 'Instance actor endpoint' do
describe 'GET /actor' do
let!(:original_federation_mode) { Rails.configuration.x.limited_federation_mode }
let!(:original_federation_mode) { Rails.configuration.x.mastodon.limited_federation_mode }
shared_examples 'instance actor endpoint' do
before { get instance_actor_path(format: :json) }
@@ -31,8 +31,8 @@ RSpec.describe 'Instance actor endpoint' do
end
context 'with limited federation mode disabled' do
before { Rails.configuration.x.limited_federation_mode = false }
after { Rails.configuration.x.limited_federation_mode = original_federation_mode }
before { Rails.configuration.x.mastodon.limited_federation_mode = false }
after { Rails.configuration.x.mastodon.limited_federation_mode = original_federation_mode }
it_behaves_like 'instance actor endpoint'
@@ -44,8 +44,8 @@ RSpec.describe 'Instance actor endpoint' do
end
context 'with limited federation mode enabled' do
before { Rails.configuration.x.limited_federation_mode = true }
after { Rails.configuration.x.limited_federation_mode = original_federation_mode }
before { Rails.configuration.x.mastodon.limited_federation_mode = true }
after { Rails.configuration.x.mastodon.limited_federation_mode = original_federation_mode }
it_behaves_like 'instance actor endpoint'

2
spec/requests/well_known/webfinger_spec.rb
View File

@@ -176,7 +176,7 @@ RSpec.describe 'The /.well-known/webfinger endpoint' do
context 'with limited federation mode' do
before do
allow(Rails.configuration.x).to receive(:limited_federation_mode).and_return(true)
allow(Rails.configuration.x.mastodon).to receive(:limited_federation_mode).and_return(true)
end
it 'does not return avatar in response' do

4
spec/services/unallow_domain_service_spec.rb
View File

@@ -15,7 +15,7 @@ RSpec.describe UnallowDomainService do
context 'with limited federation mode', :inline_jobs do
before do
allow(Rails.configuration.x).to receive(:limited_federation_mode).and_return(true)
allow(Rails.configuration.x.mastodon).to receive(:limited_federation_mode).and_return(true)
end
describe '#call' do
@@ -34,7 +34,7 @@ RSpec.describe UnallowDomainService do
context 'without limited federation mode' do
before do
allow(Rails.configuration.x).to receive(:limited_federation_mode).and_return(false)
allow(Rails.configuration.x.mastodon).to receive(:limited_federation_mode).and_return(false)
end
describe '#call' do

6
spec/system/admin/domain_allows_spec.rb
View File

@@ -13,12 +13,12 @@ RSpec.describe 'Admin::DomainAllows' do
end
around do |example|
original = Rails.configuration.x.limited_federation_mode
Rails.configuration.x.limited_federation_mode = true
original = Rails.configuration.x.mastodon.limited_federation_mode
Rails.configuration.x.mastodon.limited_federation_mode = true
example.run
Rails.configuration.x.limited_federation_mode = original
Rails.configuration.x.mastodon.limited_federation_mode = original
end
describe 'Managing domain allows' do