1
0
Fork 0
forked from gitea/nas

Merge remote-tracking branch 'parent/main' into upstream-20240716

This commit is contained in:
KMY 2024-07-16 09:01:12 +09:00
commit adee1645a3
203 changed files with 1707 additions and 1067 deletions

View file

@ -73,19 +73,19 @@ describe FeedInsertWorker do
end
context 'with notification' do
it 'skips notification when unset', :sidekiq_inline do
it 'skips notification when unset', :inline_jobs do
subject.perform(status.id, follower.id)
expect(notify?(follower, 'status', status.id)).to be false
end
it 'pushes notification when read status is set', :sidekiq_inline do
it 'pushes notification when read status is set', :inline_jobs do
Fabricate(:follow, account: follower, target_account: status.account, notify: true)
subject.perform(status.id, follower.id)
expect(notify?(follower, 'status', status.id)).to be true
end
it 'skips notification when the account is registered list but not notify', :sidekiq_inline do
it 'skips notification when the account is registered list but not notify', :inline_jobs do
follower.follow!(status.account)
list = Fabricate(:list, account: follower)
Fabricate(:list_account, list: list, account: status.account)
@ -97,7 +97,7 @@ describe FeedInsertWorker do
expect(list_status).to be_nil
end
it 'pushes notification when the account is registered list', :sidekiq_inline do
it 'pushes notification when the account is registered list', :inline_jobs do
follower.follow!(status.account)
list = Fabricate(:list, account: follower, notify: true)
Fabricate(:list_account, list: list, account: status.account)