diff options
| author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2017-04-30 21:49:24 +0900 |
|---|---|---|
| committer | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-04-30 08:49:24 -0400 |
| commit | a6788662b09164cfbaf1cebe6c8abc5123452285 (patch) | |
| tree | 695c32806c43416f16aea7dd73c507ed42799ca2 /spec | |
| parent | 4a5f73c8aef7500a0efe7d800447e288674bf54a (diff) | |
Revert "Use PostgreSQL inheritance for blocks and mutes (#2520)" (#2634)
This reverts commit 5135d609b774b177d3d3894b176a822d86b73d3c.
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/atom_serializer_spec.rb | 4 | ||||
| -rw-r--r-- | spec/models/account_spec.rb | 6 | ||||
| -rw-r--r-- | spec/models/status_spec.rb | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/spec/lib/atom_serializer_spec.rb b/spec/lib/atom_serializer_spec.rb index 345285a7a..cfca82a28 100644 --- a/spec/lib/atom_serializer_spec.rb +++ b/spec/lib/atom_serializer_spec.rb @@ -152,7 +152,7 @@ RSpec.describe AtomSerializer do describe '#block_salmon' do let(:xml) do - block = Fabricate(:block, account: author, target_account: receiver, block: true) + block = Fabricate(:block, account: author, target_account: receiver) xml = AtomSerializer.render(AtomSerializer.new.block_salmon(block)) block.destroy xml @@ -171,7 +171,7 @@ RSpec.describe AtomSerializer do describe '#unblock_salmon' do let(:xml) do - block = Fabricate(:block, account: author, target_account: receiver, block: true) + block = Fabricate(:block, account: author, target_account: receiver) block.destroy xml = AtomSerializer.render(AtomSerializer.new.unblock_salmon(block)) author.block!(receiver) diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index b4481aaed..157db633a 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, block: true) - mute = Fabricate(:mute, account: account, block: false) - block_by = Fabricate(:block, target_account: account, block: true) + block = Fabricate(:block, account: account) + mute = Fabricate(:mute, account: account) + block_by = Fabricate(:block, target_account: account) 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 956b9b882..c553b052e 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, block: true) + Fabricate(:block, account: @account, target_account: blocked) 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, block: true) + Fabricate(:block, account: blocked, target_account: @account) 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, block: false) + Fabricate(:mute, account: @account, target_account: muted) muted_status = Fabricate(:status, account: muted) results = Status.as_public_timeline(@account) |