gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'parent/releases/v4.2.1' into kb_lts

Browse source
This commit is contained in:
KMY 2023-10-03 20:43:57 +09:00
commit 846b8c5e06
114 changed files with 1458 additions and 991 deletions
Download patch file Download diff file Expand all files Collapse all files

16
spec/models/account_statuses_filter_spec.rb → spec/lib/account_statuses_filter_spec.rb
View file

@ -231,7 +231,7 @@ RSpec.describe AccountStatusesFilter do
context 'when blocking a reblogged domain' do
let(:other_account) { Fabricate(:account, domain: 'example.com') }
let(:reblogging_status) { Fabricate(:status, account: other_account) }
let(:reblog) { Fabricate(:status, account: account, visibility: 'public', reblog: reblogging_status) }
let!(:reblog) { Fabricate(:status, account: account, visibility: 'public', reblog: reblogging_status) }
before do
current_account.block_domain!(other_account.domain)
@ -242,6 +242,20 @@ RSpec.describe AccountStatusesFilter do
end
end
context 'when blocking an unrelated domain' do
let(:other_account) { Fabricate(:account, domain: nil) }
let(:reblogging_status) { Fabricate(:status, account: other_account, visibility: 'public') }
let!(:reblog) { Fabricate(:status, account: account, visibility: 'public', reblog: reblogging_status) }
before do
current_account.block_domain!('example.com')
end
it 'returns the reblog from the non-blocked domain' do
expect(subject.results.pluck(:id)).to include(reblog.id)
end
end
context 'when muting a reblogged account' do
let(:reblog) { status_with_reblog!('public') }