chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 14 Wiki Activity

Some files out of sync with upstream

Browse source
This commit is contained in:
Mike Barnes 2022-06-01 13:31:30 +10:00
commit 7be42b0312
4 changed files with 2 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

14
spec/services/notify_service_spec.rb
View file

@ -83,20 +83,6 @@ RSpec.describe NotifyService, type: :service do
end
end
<<<<<<< HEAD
context 'if the message chain is initiated by recipient, but without a mention to the sender, even if the sender sends multiple messages in a row' do
let(:reply_to) { Fabricate(:status, account: recipient) }
let!(:mention) { Fabricate(:mention, account: sender, status: reply_to) }
let(:dummy_reply) { Fabricate(:status, account: sender, visibility: :direct, thread: reply_to) }
let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, visibility: :direct, thread: dummy_reply)) }
it 'does not notify' do
is_expected.to_not change(Notification, :count)
end
end
=======
>>>>>>> v3.5.2
context 'if the message chain is initiated by the recipient with a mention to the sender' do
let(:reply_to) { Fabricate(:status, account: recipient, visibility: :direct) }
let!(:mention) { Fabricate(:mention, account: sender, status: reply_to) }