From 0190aac240fd804180a56b5fe174526a9e4c3f6d Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 22 Jun 2017 02:38:50 +0200 Subject: Fix regression from #3842 (#3892) * Fix regression from #3842 Simplify the query by omitting all direct statuses. Private statuses are allowed because they are from accounts we are following (so by definition) Resolves #3887 (alternative) * Adjust test --- spec/models/status_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'spec/models') diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb index a3ced1abc..0b90205ee 100644 --- a/spec/models/status_spec.rb +++ b/spec/models/status_spec.rb @@ -201,17 +201,17 @@ RSpec.describe Status, type: :model do expect(@results).to include(@self_status) end - it 'includes direct statuses from self' do - expect(@results).to include(@self_direct_status) + it 'does not include direct statuses from self' do + expect(@results).to_not include(@self_direct_status) end it 'includes statuses from followed' do expect(@results).to include(@followed_status) end - it 'includes direct statuses mentioning recipient from followed' do + it 'does not include direct statuses mentioning recipient from followed' do Fabricate(:mention, account: account, status: @followed_direct_status) - expect(@results).to include(@followed_direct_status) + expect(@results).to_not include(@followed_direct_status) end it 'does not include direct statuses not mentioning recipient from followed' do -- cgit