From effb08edbbaaf61bac4b4fc5c5b9493417b348ec Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 28 Apr 2017 09:10:41 -0400 Subject: More status specs (#2564) * Add rough outline of coverage needed for public timeline * Specs for visibility, replies, boosts * Specs for silenced account * Specs for local_only option * Specs for blocks and mutes * Add tentative spec around including other silenced account statuses * Add with_public_visibility scope * Add simple coverage for tag_timeline * Tag timeline includes replies * Replace tag.statuses with a tagged_with scope in tag timeline method * Use with_public_visibility in tag timeline * Extract common scope between public and tag timelines to method * Extract local domain check to local_only scope * Extract local_only check to starting scope method * Move list of excluded from timeline account ids to account model * Simplify excluded accounts list on account model * Only join accounts when needed * Rename method for account specific filtering * Extract method for account exclusions * Fix bug where silenced accounts were not including statuses from other silenced accounts * DRY up filter application from account or no account * timeline_scope can be private * Add spec showing that account can find its excluded accounts ids * Add spec which fails if local_only does not have a left outer join * rubocop --- spec/models/account_spec.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'spec/models/account_spec.rb') diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index 3edbc3253..157db633a 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -190,6 +190,21 @@ RSpec.describe Account, type: :model do end end + 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) + + results = account.excluded_from_timeline_account_ids + expect(results.size).to eq 3 + expect(results).to include(block.target_account.id) + expect(results).to include(mute.target_account.id) + expect(results).to include(block_by.account.id) + end + end + describe '.search_for' do before do @match = Fabricate( -- cgit