Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 16:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-12-28 16:57:10 +01:00
parent 19e14654cc a2624ff739
commit c5b0e6d5a0
200 changed files with 3688 additions and 1130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spec/helpers/application_helper_spec.rb
View File

@@ -294,12 +294,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)
@@ -320,12 +314,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'