techhub/mastodon
2
0
Fork 0
Code Activity

Fix regression from #3842 (#3892)

Browse Source 
* 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
This commit is contained in:
Eugen Rochko
2017-06-22 02:38:50 +02:00
committed by GitHub
parent cc382c5006
commit 0190aac240
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/models/status_spec.rb
View File

@@ -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