Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/workers/new_note_worker_spec.rb b/spec/workers/new_note_worker_spec.rb
index 7a8c1ff57f3..7ba3fe94254 100644
--- a/spec/workers/new_note_worker_spec.rb
+++ b/spec/workers/new_note_worker_spec.rb
@@ -66,6 +66,16 @@ RSpec.describe NewNoteWorker do
     end
   end
 
+  context 'when Note author has been blocked' do
+    let_it_be(:note) { create(:note, author: create(:user, :blocked)) }
+
+    it "does not call NotificationService" do
+      expect(NotificationService).not_to receive(:new)
+
+      described_class.new.perform(note.id)
+    end
+  end
+
   context 'when Note author has been deleted' do
     let_it_be(:note) { create(:note, author: User.ghost) }