Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2024-11-15 18:44:32 +01:00
249 changed files with 1848 additions and 751 deletions

View File

@@ -260,11 +260,11 @@ RSpec.describe ApplicationHelper do
expect(helper.html_title).to be_html_safe
end
it 'removes extra new lines' do
it 'does not escape twice' do
Setting.site_title = 'Site Title'
helper.content_for(:page_title, "Test Value\n")
helper.content_for(:page_title, '"Test Value"'.html_safe)
expect(helper.html_title).to eq 'Test Value - Site Title'
expect(helper.html_title).to eq '"Test Value" - Site Title'
expect(helper.html_title).to be_html_safe
end
end