Remove unneeded settings cleanup from specs (#28425)

This commit is contained in:
Claire 2023-12-19 16:17:22 +01:00 committed by GitHub
parent c7c727994a
commit 6fed0fcbaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 8 additions and 189 deletions

View File

@ -19,14 +19,6 @@ RSpec.describe Admin::Settings::BrandingController do
end end
describe 'PUT #update' do describe 'PUT #update' do
around do |example|
before = Setting.site_short_description
Setting.site_short_description = nil
example.run
Setting.site_short_description = before
Setting.new_setting_key = nil
end
it 'cannot create a setting value for a non-admin key' do it 'cannot create a setting value for a non-admin key' do
expect(Setting.new_setting_key).to be_blank expect(Setting.new_setting_key).to be_blank

View File

@ -6,12 +6,6 @@ RSpec.describe Api::V1::Trends::LinksController do
render_views render_views
describe 'GET #index' do describe 'GET #index' do
around do |example|
previous = Setting.trends
example.run
Setting.trends = previous
end
context 'when trends are disabled' do context 'when trends are disabled' do
before { Setting.trends = false } before { Setting.trends = false }

View File

@ -6,12 +6,6 @@ RSpec.describe Api::V1::Trends::StatusesController do
render_views render_views
describe 'GET #index' do describe 'GET #index' do
around do |example|
previous = Setting.trends
example.run
Setting.trends = previous
end
context 'when trends are disabled' do context 'when trends are disabled' do
before { Setting.trends = false } before { Setting.trends = false }

View File

@ -6,12 +6,6 @@ RSpec.describe Api::V1::Trends::TagsController do
render_views render_views
describe 'GET #index' do describe 'GET #index' do
around do |example|
previous = Setting.trends
example.run
Setting.trends = previous
end
context 'when trends are disabled' do context 'when trends are disabled' do
before { Setting.trends = false } before { Setting.trends = false }

View File

@ -6,12 +6,6 @@ RSpec.describe Auth::RegistrationsController do
render_views render_views
shared_examples 'checks for enabled registrations' do |path| shared_examples 'checks for enabled registrations' do |path|
around do |example|
registrations_mode = Setting.registrations_mode
example.run
Setting.registrations_mode = registrations_mode
end
it 'redirects if it is in single user mode while it is open for registration' do it 'redirects if it is in single user mode while it is open for registration' do
Fabricate(:account) Fabricate(:account)
Setting.registrations_mode = 'open' Setting.registrations_mode = 'open'
@ -82,12 +76,6 @@ RSpec.describe Auth::RegistrationsController do
end end
context 'with open registrations' do context 'with open registrations' do
around do |example|
registrations_mode = Setting.registrations_mode
example.run
Setting.registrations_mode = registrations_mode
end
it 'returns http success' do it 'returns http success' do
Setting.registrations_mode = 'open' Setting.registrations_mode = 'open'
get :new get :new
@ -120,12 +108,6 @@ RSpec.describe Auth::RegistrationsController do
post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } } post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } }
end end
around do |example|
registrations_mode = Setting.registrations_mode
example.run
Setting.registrations_mode = registrations_mode
end
it 'redirects to setup' do it 'redirects to setup' do
subject subject
expect(response).to redirect_to auth_setup_path expect(response).to redirect_to auth_setup_path
@ -146,12 +128,6 @@ RSpec.describe Auth::RegistrationsController do
post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'false' } } post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'false' } }
end end
around do |example|
registrations_mode = Setting.registrations_mode
example.run
Setting.registrations_mode = registrations_mode
end
it 'does not create user' do it 'does not create user' do
subject subject
user = User.find_by(email: 'test@example.com') user = User.find_by(email: 'test@example.com')
@ -166,12 +142,6 @@ RSpec.describe Auth::RegistrationsController do
post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } } post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' } }
end end
around do |example|
registrations_mode = Setting.registrations_mode
example.run
Setting.registrations_mode = registrations_mode
end
it 'redirects to setup' do it 'redirects to setup' do
subject subject
expect(response).to redirect_to auth_setup_path expect(response).to redirect_to auth_setup_path
@ -194,12 +164,6 @@ RSpec.describe Auth::RegistrationsController do
post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', invite_code: invite.code, agreement: 'true' } } post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', invite_code: invite.code, agreement: 'true' } }
end end
around do |example|
registrations_mode = Setting.registrations_mode
example.run
Setting.registrations_mode = registrations_mode
end
it 'redirects to setup' do it 'redirects to setup' do
subject subject
expect(response).to redirect_to auth_setup_path expect(response).to redirect_to auth_setup_path
@ -224,14 +188,6 @@ RSpec.describe Auth::RegistrationsController do
post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', invite_code: invite.code, agreement: 'true' } } post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', invite_code: invite.code, agreement: 'true' } }
end end
around do |example|
registrations_mode = Setting.registrations_mode
require_invite_text = Setting.require_invite_text
example.run
Setting.require_invite_text = require_invite_text
Setting.registrations_mode = registrations_mode
end
it 'redirects to setup' do it 'redirects to setup' do
subject subject
expect(response).to redirect_to auth_setup_path expect(response).to redirect_to auth_setup_path

View File

@ -11,12 +11,6 @@ describe AccountControllerConcern do
end end
end end
around do |example|
registrations_mode = Setting.registrations_mode
example.run
Setting.registrations_mode = registrations_mode
end
before do before do
routes.draw { get 'success' => 'anonymous#success' } routes.draw { get 'success' => 'anonymous#success' }
end end

View File

@ -292,12 +292,6 @@ describe ApplicationHelper do
end end
describe 'title' do describe 'title' do
around do |example|
site_title = Setting.site_title
example.run
Setting.site_title = site_title
end
it 'returns site title on production environment' do it 'returns site title on production environment' do
Setting.site_title = 'site title' Setting.site_title = 'site title'
allow(Rails.env).to receive(:production?).and_return(true) allow(Rails.env).to receive(:production?).and_return(true)
@ -318,12 +312,6 @@ describe ApplicationHelper do
allow(Rails.env).to receive(:production?).and_return(true) allow(Rails.env).to receive(:production?).and_return(true)
end end
around do |example|
site_title = Setting.site_title
example.run
Setting.site_title = site_title
end
context 'with a page_title content_for value' do context 'with a page_title content_for value' do
it 'uses the value in the html title' do it 'uses the value in the html title' do
Setting.site_title = 'Site Title' Setting.site_title = 'Site Title'

View File

@ -4,12 +4,6 @@ require 'rails_helper'
describe InstanceHelper do describe InstanceHelper do
describe 'site_title' do describe 'site_title' do
around do |example|
site_title = Setting.site_title
example.run
Setting.site_title = site_title
end
it 'Uses the Setting.site_title value when it exists' do it 'Uses the Setting.site_title value when it exists' do
Setting.site_title = 'New site title' Setting.site_title = 'New site title'

View File

@ -175,16 +175,8 @@ RSpec.describe User do
let(:user) { Fabricate(:user, confirmed_at: nil, unconfirmed_email: new_email) } let(:user) { Fabricate(:user, confirmed_at: nil, unconfirmed_email: new_email) }
context 'when the user is already approved' do context 'when the user is already approved' do
around do |example|
registrations_mode = Setting.registrations_mode
Setting.registrations_mode = 'approved'
example.run
Setting.registrations_mode = registrations_mode
end
before do before do
Setting.registrations_mode = 'approved'
user.approve! user.approve!
end end
@ -199,13 +191,8 @@ RSpec.describe User do
end end
context 'when the user does not require explicit approval' do context 'when the user does not require explicit approval' do
around do |example| before do
registrations_mode = Setting.registrations_mode
Setting.registrations_mode = 'open' Setting.registrations_mode = 'open'
example.run
Setting.registrations_mode = registrations_mode
end end
it 'sets email to unconfirmed_email' do it 'sets email to unconfirmed_email' do
@ -219,13 +206,8 @@ RSpec.describe User do
end end
context 'when the user requires explicit approval but is not approved' do context 'when the user requires explicit approval but is not approved' do
around do |example| before do
registrations_mode = Setting.registrations_mode
Setting.registrations_mode = 'approved' Setting.registrations_mode = 'approved'
example.run
Setting.registrations_mode = registrations_mode
end end
it 'sets email to unconfirmed_email' do it 'sets email to unconfirmed_email' do
@ -243,16 +225,8 @@ RSpec.describe User do
describe '#approve!' do describe '#approve!' do
subject { user.approve! } subject { user.approve! }
around do |example|
registrations_mode = Setting.registrations_mode
Setting.registrations_mode = 'approved'
example.run
Setting.registrations_mode = registrations_mode
end
before do before do
Setting.registrations_mode = 'approved'
allow(TriggerWebhookWorker).to receive(:perform_async) allow(TriggerWebhookWorker).to receive(:perform_async)
end end

View File

@ -6,12 +6,6 @@ describe InstancePresenter do
let(:instance_presenter) { described_class.new } let(:instance_presenter) { described_class.new }
describe '#description' do describe '#description' do
around do |example|
site_description = Setting.site_short_description
example.run
Setting.site_short_description = site_description
end
it 'delegates site_description to Setting' do it 'delegates site_description to Setting' do
Setting.site_short_description = 'Site desc' Setting.site_short_description = 'Site desc'
expect(instance_presenter.description).to eq 'Site desc' expect(instance_presenter.description).to eq 'Site desc'
@ -19,12 +13,6 @@ describe InstancePresenter do
end end
describe '#extended_description' do describe '#extended_description' do
around do |example|
site_extended_description = Setting.site_extended_description
example.run
Setting.site_extended_description = site_extended_description
end
it 'delegates site_extended_description to Setting' do it 'delegates site_extended_description to Setting' do
Setting.site_extended_description = 'Extended desc' Setting.site_extended_description = 'Extended desc'
expect(instance_presenter.extended_description).to eq 'Extended desc' expect(instance_presenter.extended_description).to eq 'Extended desc'
@ -32,12 +20,6 @@ describe InstancePresenter do
end end
describe '#email' do describe '#email' do
around do |example|
site_contact_email = Setting.site_contact_email
example.run
Setting.site_contact_email = site_contact_email
end
it 'delegates contact_email to Setting' do it 'delegates contact_email to Setting' do
Setting.site_contact_email = 'admin@example.com' Setting.site_contact_email = 'admin@example.com'
expect(instance_presenter.contact.email).to eq 'admin@example.com' expect(instance_presenter.contact.email).to eq 'admin@example.com'
@ -45,12 +27,6 @@ describe InstancePresenter do
end end
describe '#account' do describe '#account' do
around do |example|
site_contact_username = Setting.site_contact_username
example.run
Setting.site_contact_username = site_contact_username
end
it 'returns the account for the site contact username' do it 'returns the account for the site contact username' do
Setting.site_contact_username = 'aaa' Setting.site_contact_username = 'aaa'
account = Fabricate(:account, username: 'aaa') account = Fabricate(:account, username: 'aaa')

View File

@ -4,12 +4,6 @@ require 'rails_helper'
RSpec.describe 'Activity' do RSpec.describe 'Activity' do
describe 'GET /api/v1/instance/activity' do describe 'GET /api/v1/instance/activity' do
around do |example|
original = Setting.activity_api_enabled
example.run
Setting.activity_api_enabled = original
end
context 'with activity api enabled' do context 'with activity api enabled' do
before { Setting.activity_api_enabled = true } before { Setting.activity_api_enabled = true }

View File

@ -4,12 +4,6 @@ require 'rails_helper'
RSpec.describe 'Domain Blocks' do RSpec.describe 'Domain Blocks' do
describe 'GET /api/v1/instance/domain_blocks' do describe 'GET /api/v1/instance/domain_blocks' do
around do |example|
original = Setting.show_domain_blocks
example.run
Setting.show_domain_blocks = original
end
before do before do
Fabricate(:domain_block) Fabricate(:domain_block)
end end

View File

@ -4,12 +4,6 @@ require 'rails_helper'
RSpec.describe 'Peers' do RSpec.describe 'Peers' do
describe 'GET /api/v1/instance/peers' do describe 'GET /api/v1/instance/peers' do
around do |example|
original = Setting.peers_api_enabled
example.run
Setting.peers_api_enabled = original
end
context 'with peers api enabled' do context 'with peers api enabled' do
before { Setting.peers_api_enabled = true } before { Setting.peers_api_enabled = true }

View File

@ -242,17 +242,11 @@ describe 'Caching behavior' do
end end
describe '/api/v1/instance/domain_blocks' do describe '/api/v1/instance/domain_blocks' do
around do |example| before do
old_setting = Setting.show_domain_blocks
Setting.show_domain_blocks = show_domain_blocks Setting.show_domain_blocks = show_domain_blocks
get '/api/v1/instance/domain_blocks'
example.run
Setting.show_domain_blocks = old_setting
end end
before { get '/api/v1/instance/domain_blocks' }
context 'when set to be publicly-available' do context 'when set to be publicly-available' do
let(:show_domain_blocks) { 'all' } let(:show_domain_blocks) { 'all' }
@ -365,16 +359,8 @@ describe 'Caching behavior' do
end end
describe '/api/v1/instance/domain_blocks' do describe '/api/v1/instance/domain_blocks' do
around do |example|
old_setting = Setting.show_domain_blocks
Setting.show_domain_blocks = show_domain_blocks
example.run
Setting.show_domain_blocks = old_setting
end
before do before do
Setting.show_domain_blocks = show_domain_blocks
get '/api/v1/instance/domain_blocks', headers: { 'Authorization' => "Bearer #{token.token}" } get '/api/v1/instance/domain_blocks', headers: { 'Authorization' => "Bearer #{token.token}" }
end end

View File

@ -28,13 +28,8 @@ RSpec.describe AppSignUpService, type: :service do
end end
context 'when registrations are closed' do context 'when registrations are closed' do
around do |example| before do
tmp = Setting.registrations_mode
Setting.registrations_mode = 'none' Setting.registrations_mode = 'none'
example.run
Setting.registrations_mode = tmp
end end
it 'raises an error', :aggregate_failures do it 'raises an error', :aggregate_failures do