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

This commit is contained in:
KMY 2024-11-19 08:49:55 +09:00
commit 055045981f
221 changed files with 2006 additions and 1127 deletions

View file

@ -261,11 +261,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