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

This commit is contained in:
KMY 2024-08-13 07:01:38 +09:00
commit e7ccc0539f
358 changed files with 4653 additions and 4261 deletions

View file

@ -227,7 +227,7 @@ describe ApplicationHelper do
it 'returns an unlock icon for a unlisted visible status' do
result = helper.visibility_icon Status.new(visibility: 'unlisted')
expect(result).to match(/unlock/)
expect(result).to match(/lock_open/)
end
it 'returns a lock icon for a private visible status' do
@ -237,7 +237,7 @@ describe ApplicationHelper do
it 'returns an at icon for a direct visible status' do
result = helper.visibility_icon Status.new(visibility: 'direct')
expect(result).to match(/at/)
expect(result).to match(/alternate_email/)
end
end