Use PostgreSQL inheritance for blocks and mutes (#2520)
This commit is contained in:
parent
f48cb3eb17
commit
5135d609b7
7 changed files with 43 additions and 12 deletions
|
@ -226,7 +226,7 @@ RSpec.describe Status, type: :model do
|
|||
|
||||
it 'excludes statuses from accounts blocked by the account' do
|
||||
blocked = Fabricate(:account)
|
||||
Fabricate(:block, account: @account, target_account: blocked)
|
||||
Fabricate(:block, account: @account, target_account: blocked, block: true)
|
||||
blocked_status = Fabricate(:status, account: blocked)
|
||||
|
||||
results = Status.as_public_timeline(@account)
|
||||
|
@ -235,7 +235,7 @@ RSpec.describe Status, type: :model do
|
|||
|
||||
it 'excludes statuses from accounts who have blocked the account' do
|
||||
blocked = Fabricate(:account)
|
||||
Fabricate(:block, account: blocked, target_account: @account)
|
||||
Fabricate(:block, account: blocked, target_account: @account, block: true)
|
||||
blocked_status = Fabricate(:status, account: blocked)
|
||||
|
||||
results = Status.as_public_timeline(@account)
|
||||
|
@ -244,7 +244,7 @@ RSpec.describe Status, type: :model do
|
|||
|
||||
it 'excludes statuses from accounts muted by the account' do
|
||||
muted = Fabricate(:account)
|
||||
Fabricate(:mute, account: @account, target_account: muted)
|
||||
Fabricate(:mute, account: @account, target_account: muted, block: false)
|
||||
muted_status = Fabricate(:status, account: muted)
|
||||
|
||||
results = Status.as_public_timeline(@account)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue