From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 28 Mar 2022 14:22:28 +0000 (+0200)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f313bf3e97ddd83e7847ae00f5bdb488942c943c;p=mastodon.git

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

f313bf3e97ddd83e7847ae00f5bdb488942c943c
diff --cc spec/services/notify_service_spec.rb
index 83e62ff36,294c31b04..67dd0483b
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@@ -46,9 -44,9 +44,9 @@@ RSpec.describe NotifyService, type: :se
  
    it 'does not notify when recipient is suspended' do
      recipient.suspend!
-     is_expected.to_not change(Notification, :count)
+     expect { subject }.to_not change(Notification, :count)
    end
 -
 +  
    context 'for direct messages' do
      let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct)) }
      let(:type)     { :mention }