Keep matching mainline as much as possible

This commit is contained in:
Mike Barnes 2024-10-09 14:00:25 +11:00
commit 4bc60b2b79
17 changed files with 3 additions and 128 deletions

View file

@ -18,17 +18,6 @@ RSpec.describe NotifyService do
expect { subject }.to_not change(Notification, :count)
end
context 'when the sender is a local moderator' do
let(:sender) { Fabricate(:user, role: UserRole.find_by(name: 'Admin')).account }
let(:type) { :mention }
let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender)) }
it 'does notify when the sender is blocked' do
recipient.block!(sender)
expect { subject }.to change(Notification, :count).by(1)
end
end
it 'does not notify when sender is muted with hide_notifications' do
recipient.mute!(sender, notifications: true)
expect { subject }.to_not change(Notification, :count)