diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2017-04-30 07:27:31 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-30 00:27:31 +0200 |
| commit | 5135d609b774b177d3d3894b176a822d86b73d3c (patch) | |
| tree | d0c2d75383518ab63fa80df617dd62bec25bba89 /spec/models | |
| parent | f48cb3eb170314cba1938522c0da44af21d47e83 (diff) | |
Use PostgreSQL inheritance for blocks and mutes (#2520)
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/account_spec.rb | 6 | ||||
| -rw-r--r-- | spec/models/status_spec.rb | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index 157db633a..b4481aaed 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -193,9 +193,9 @@ RSpec.describe Account, type: :model do describe '#excluded_from_timeline_account_ids' do it 'includes account ids of blockings, blocked_bys and mutes' do account = Fabricate(:account) - block = Fabricate(:block, account: account) - mute = Fabricate(:mute, account: account) - block_by = Fabricate(:block, target_account: account) + block = Fabricate(:block, account: account, block: true) + mute = Fabricate(:mute, account: account, block: false) + block_by = Fabricate(:block, target_account: account, block: true) results = account.excluded_from_timeline_account_ids expect(results.size).to eq 3 diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb index c553b052e..956b9b882 100644 --- a/spec/models/status_spec.rb +++ b/spec/models/status_spec.rb @@ -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) |