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

spec/helpers/application_helper_spec.rb

@@ -292,12 +292,6 @@ describe ApplicationHelper do
   end
 
   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
       Setting.site_title = 'site title'
       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)
     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
       it 'uses the value in the html title' do
         Setting.site_title = 'Site Title'

spec/helpers/instance_helper_spec.rb

@@ -4,12 +4,6 @@ require 'rails_helper'
 
 describe InstanceHelper 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
       Setting.site_title = 'New site title'
 

spec/helpers/json_ld_helper_spec.rb

@@ -147,7 +147,7 @@ describe JsonLdHelper do
         expect(compact(json).dig('object', 'tag', 'href')).to eq 'foo'
       end
 
-      it 'compacts the activistreams Public collection' do
+      it 'compacts the activitystreams Public collection' do
         expect(compact(json)['to']).to eq 'as:Public'
       end