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

This commit is contained in:
Thibaut Girka
2019-05-15 17:11:40 +02:00
39 changed files with 271 additions and 155 deletions

View File

@@ -39,12 +39,12 @@ RSpec.describe NotifyService, type: :service do
end
it 'does not notify when sender is silenced and not followed' do
sender.update(silenced: true)
sender.silence!
is_expected.to_not change(Notification, :count)
end
it 'does not notify when recipient is suspended' do
recipient.update(suspended: true)
recipient.suspend!
is_expected.to_not change(Notification, :count)
end