about summary refs log tree commit diff
path: root/spec
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-18 09:17:58 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-18 09:17:58 -0600
commit1964a0f9415de1082c9948cd7dd02ededa36af7b (patch)
tree5ca29c2d67f008d67adc404597b18702e997aaca /spec
parente27eedbd08c7d6191531783f662d576ea940a337 (diff)
parente56404be414ff2fc7ff11171fdd2b31a0658aa11 (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
Diffstat (limited to 'spec')
-rw-r--r--spec/services/notify_service_spec.rb11
1 files changed, 10 insertions, 1 deletions
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index bb7601e76..1435ec917 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -82,10 +82,19 @@ RSpec.describe NotifyService do
         is_expected.to_not change(Notification, :count)
       end
 
-      context 'if the message chain initiated by recipient' do
+      context 'if the message chain initiated by recipient, but is not direct message' do
         let(:reply_to) { Fabricate(:status, account: recipient) }
         let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
 
+        it 'does not notify' do
+          is_expected.to_not change(Notification, :count)
+        end
+      end
+
+      context 'if the message chain initiated by recipient and is direct message' do
+        let(:reply_to) { Fabricate(:status, account: recipient, visibility: :direct) }
+        let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: reply_to)) }
+
         it 'does notify' do
           is_expected.to change(Notification, :count)
         end