From 6201f96b8a49d58b5b2d73fac9fa1fa93f5890ed Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 5 Jun 2017 10:07:44 -0400 Subject: Introduce StatusThreadingConcern (#3490) * Add a StatusFilter class to identify visibility of statuses by accounts * Extract StatusThreadingConcern from Status * Clarify purpose of checking for nil account --- .../concerns/status_threading_concern_spec.rb | 100 +++++++++++++++++++++ spec/models/status_spec.rb | 95 -------------------- 2 files changed, 100 insertions(+), 95 deletions(-) create mode 100644 spec/models/concerns/status_threading_concern_spec.rb (limited to 'spec/models') diff --git a/spec/models/concerns/status_threading_concern_spec.rb b/spec/models/concerns/status_threading_concern_spec.rb new file mode 100644 index 000000000..62f5f6e31 --- /dev/null +++ b/spec/models/concerns/status_threading_concern_spec.rb @@ -0,0 +1,100 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe StatusThreadingConcern do + describe '#ancestors' do + let!(:alice) { Fabricate(:account, username: 'alice') } + let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') } + let!(:jeff) { Fabricate(:account, username: 'jeff') } + let!(:status) { Fabricate(:status, account: alice) } + let!(:reply1) { Fabricate(:status, thread: status, account: jeff) } + let!(:reply2) { Fabricate(:status, thread: reply1, account: bob) } + let!(:reply3) { Fabricate(:status, thread: reply2, account: alice) } + let!(:viewer) { Fabricate(:account, username: 'viewer') } + + it 'returns conversation history' do + expect(reply3.ancestors).to include(status, reply1, reply2) + end + + it 'does not return conversation history user is not allowed to see' do + reply1.update(visibility: :private) + status.update(visibility: :direct) + + expect(reply3.ancestors(viewer)).to_not include(reply1, status) + end + + it 'does not return conversation history from blocked users' do + viewer.block!(jeff) + expect(reply3.ancestors(viewer)).to_not include(reply1) + end + + it 'does not return conversation history from muted users' do + viewer.mute!(jeff) + expect(reply3.ancestors(viewer)).to_not include(reply1) + end + + it 'does not return conversation history from silenced and not followed users' do + jeff.update(silenced: true) + expect(reply3.ancestors(viewer)).to_not include(reply1) + end + + it 'does not return conversation history from blocked domains' do + viewer.block_domain!('example.com') + expect(reply3.ancestors(viewer)).to_not include(reply2) + end + + it 'ignores deleted records' do + first_status = Fabricate(:status, account: bob) + second_status = Fabricate(:status, thread: first_status, account: alice) + + # Create cache and delete cached record + second_status.ancestors + first_status.destroy + + expect(second_status.ancestors).to eq([]) + end + end + + describe '#descendants' do + let!(:alice) { Fabricate(:account, username: 'alice') } + let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') } + let!(:jeff) { Fabricate(:account, username: 'jeff') } + let!(:status) { Fabricate(:status, account: alice) } + let!(:reply1) { Fabricate(:status, thread: status, account: alice) } + let!(:reply2) { Fabricate(:status, thread: status, account: bob) } + let!(:reply3) { Fabricate(:status, thread: reply1, account: jeff) } + let!(:viewer) { Fabricate(:account, username: 'viewer') } + + it 'returns replies' do + expect(status.descendants).to include(reply1, reply2, reply3) + end + + it 'does not return replies user is not allowed to see' do + reply1.update(visibility: :private) + reply3.update(visibility: :direct) + + expect(status.descendants(viewer)).to_not include(reply1, reply3) + end + + it 'does not return replies from blocked users' do + viewer.block!(jeff) + expect(status.descendants(viewer)).to_not include(reply3) + end + + it 'does not return replies from muted users' do + viewer.mute!(jeff) + expect(status.descendants(viewer)).to_not include(reply3) + end + + it 'does not return replies from silenced and not followed users' do + jeff.update(silenced: true) + expect(status.descendants(viewer)).to_not include(reply3) + end + + it 'does not return replies from blocked domains' do + viewer.block_domain!('example.com') + expect(status.descendants(viewer)).to_not include(reply2) + end + end +end diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb index ec07e6156..dd52a5d43 100644 --- a/spec/models/status_spec.rb +++ b/spec/models/status_spec.rb @@ -119,101 +119,6 @@ RSpec.describe Status, type: :model do end end - describe '#ancestors' do - let!(:alice) { Fabricate(:account, username: 'alice') } - let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') } - let!(:jeff) { Fabricate(:account, username: 'jeff') } - let!(:status) { Fabricate(:status, account: alice) } - let!(:reply1) { Fabricate(:status, thread: status, account: jeff) } - let!(:reply2) { Fabricate(:status, thread: reply1, account: bob) } - let!(:reply3) { Fabricate(:status, thread: reply2, account: alice) } - let!(:viewer) { Fabricate(:account, username: 'viewer') } - - it 'returns conversation history' do - expect(reply3.ancestors).to include(status, reply1, reply2) - end - - it 'does not return conversation history user is not allowed to see' do - reply1.update(visibility: :private) - status.update(visibility: :direct) - - expect(reply3.ancestors(viewer)).to_not include(reply1, status) - end - - it 'does not return conversation history from blocked users' do - viewer.block!(jeff) - expect(reply3.ancestors(viewer)).to_not include(reply1) - end - - it 'does not return conversation history from muted users' do - viewer.mute!(jeff) - expect(reply3.ancestors(viewer)).to_not include(reply1) - end - - it 'does not return conversation history from silenced and not followed users' do - jeff.update(silenced: true) - expect(reply3.ancestors(viewer)).to_not include(reply1) - end - - it 'does not return conversation history from blocked domains' do - viewer.block_domain!('example.com') - expect(reply3.ancestors(viewer)).to_not include(reply2) - end - - it 'ignores deleted records' do - first_status = Fabricate(:status, account: bob) - second_status = Fabricate(:status, thread: first_status, account: alice) - - # Create cache and delete cached record - second_status.ancestors - first_status.destroy - - expect(second_status.ancestors).to eq([]) - end - end - - describe '#descendants' do - let!(:alice) { Fabricate(:account, username: 'alice') } - let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') } - let!(:jeff) { Fabricate(:account, username: 'jeff') } - let!(:status) { Fabricate(:status, account: alice) } - let!(:reply1) { Fabricate(:status, thread: status, account: alice) } - let!(:reply2) { Fabricate(:status, thread: status, account: bob) } - let!(:reply3) { Fabricate(:status, thread: reply1, account: jeff) } - let!(:viewer) { Fabricate(:account, username: 'viewer') } - - it 'returns replies' do - expect(status.descendants).to include(reply1, reply2, reply3) - end - - it 'does not return replies user is not allowed to see' do - reply1.update(visibility: :private) - reply3.update(visibility: :direct) - - expect(status.descendants(viewer)).to_not include(reply1, reply3) - end - - it 'does not return replies from blocked users' do - viewer.block!(jeff) - expect(status.descendants(viewer)).to_not include(reply3) - end - - it 'does not return replies from muted users' do - viewer.mute!(jeff) - expect(status.descendants(viewer)).to_not include(reply3) - end - - it 'does not return replies from silenced and not followed users' do - jeff.update(silenced: true) - expect(status.descendants(viewer)).to_not include(reply3) - end - - it 'does not return replies from blocked domains' do - viewer.block_domain!('example.com') - expect(status.descendants(viewer)).to_not include(reply2) - end - end - describe '.mutes_map' do let(:status) { Fabricate(:status) } let(:account) { Fabricate(:account) } -- cgit