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

spec/presenters/instance_presenter_spec.rb

@@ -6,12 +6,6 @@ describe InstancePresenter do
   let(:instance_presenter) { described_class.new }
 
   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
       Setting.site_short_description = 'Site desc'
       expect(instance_presenter.description).to eq 'Site desc'
@@ -19,12 +13,6 @@ describe InstancePresenter do
   end
 
   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
       Setting.site_extended_description = 'Extended desc'
       expect(instance_presenter.extended_description).to eq 'Extended desc'
@@ -32,12 +20,6 @@ describe InstancePresenter do
   end
 
   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
       Setting.site_contact_email = 'admin@example.com'
       expect(instance_presenter.contact.email).to eq 'admin@example.com'
@@ -45,12 +27,6 @@ describe InstancePresenter do
   end
 
   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
       Setting.site_contact_username = 'aaa'
       account = Fabricate(:account, username: 'aaa')