Merge remote-tracking branch 'parent/main' into upstream-20240319
This commit is contained in:
commit
76598bd542
496 changed files with 5795 additions and 3709 deletions
|
@ -1,6 +1,100 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
# Reverted this commit.temporarily because load issues.
|
||||
# Whenever a manual merge occurs, be sure to check the following commits.
|
||||
# Hash: ee8d0b94473df357677cd1f82581251ce0423c01
|
||||
# Message: Fix follow suggestions potentially including silenced or blocked accounts (#29306)
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe AccountSuggestions::FriendsOfFriendsSource do
|
||||
describe '#get' do
|
||||
subject { described_class.new }
|
||||
|
||||
let!(:bob) { Fabricate(:account, discoverable: true, hide_collections: false) }
|
||||
let!(:alice) { Fabricate(:account, discoverable: true, hide_collections: true) }
|
||||
let!(:eve) { Fabricate(:account, discoverable: true, hide_collections: false) }
|
||||
let!(:mallory) { Fabricate(:account, discoverable: false, hide_collections: false) }
|
||||
let!(:eugen) { Fabricate(:account, discoverable: true, hide_collections: false) }
|
||||
let!(:neil) { Fabricate(:account, discoverable: true, hide_collections: false) }
|
||||
let!(:john) { Fabricate(:account, discoverable: true, hide_collections: false) }
|
||||
let!(:jerk) { Fabricate(:account, discoverable: true, hide_collections: false) }
|
||||
let!(:larry) { Fabricate(:account, discoverable: true, hide_collections: false) }
|
||||
|
||||
context 'with follows and blocks' do
|
||||
before do
|
||||
bob.block!(jerk)
|
||||
FollowRecommendationMute.create!(account: bob, target_account: neil)
|
||||
|
||||
# bob follows eugen, alice and larry
|
||||
[eugen, alice, larry].each { |account| bob.follow!(account) }
|
||||
|
||||
# alice follows eve and mallory
|
||||
[john, mallory].each { |account| alice.follow!(account) }
|
||||
|
||||
# eugen follows eve, john, jerk, larry and neil
|
||||
[eve, mallory, jerk, larry, neil].each { |account| eugen.follow!(account) }
|
||||
end
|
||||
|
||||
it 'returns eligible accounts', :aggregate_failures do
|
||||
results = subject.get(bob)
|
||||
|
||||
# eve is returned through eugen
|
||||
expect(results).to include([eve.id, :friends_of_friends])
|
||||
|
||||
# john is not reachable because alice hides who she follows
|
||||
expect(results).to_not include([john.id, :friends_of_friends])
|
||||
|
||||
# mallory is not discoverable
|
||||
expect(results).to_not include([mallory.id, :friends_of_friends])
|
||||
|
||||
# larry is not included because he's followed already
|
||||
expect(results).to_not include([larry.id, :friends_of_friends])
|
||||
|
||||
# jerk is blocked
|
||||
expect(results).to_not include([jerk.id, :friends_of_friends])
|
||||
|
||||
# the suggestion for neil has already been rejected
|
||||
expect(results).to_not include([neil.id, :friends_of_friends])
|
||||
end
|
||||
end
|
||||
|
||||
context 'with deterministic order' do
|
||||
before do
|
||||
# bob follows eve and mallory
|
||||
[eve, mallory].each { |account| bob.follow!(account) }
|
||||
|
||||
# eve follows eugen, john, and jerk
|
||||
[jerk, eugen, john].each { |account| eve.follow!(account) }
|
||||
|
||||
# mallory follows eugen, john, and neil
|
||||
[neil, eugen, john].each { |account| mallory.follow!(account) }
|
||||
|
||||
john.follow!(eugen)
|
||||
john.follow!(neil)
|
||||
end
|
||||
|
||||
it 'returns eligible accounts in the expected order' do
|
||||
expect(subject.get(bob)).to eq expected_results
|
||||
end
|
||||
|
||||
it 'contains correct underlying source data' do
|
||||
expect(source_query_values)
|
||||
.to contain_exactly(
|
||||
[john.id, 2, 2], # Followed by 2 friends of bob (eve, mallory), 2 followers total (breaks tie)
|
||||
[eugen.id, 2, 3], # Followed by 2 friends of bob (eve, mallory), 3 followers total
|
||||
[jerk.id, 1, 1], # Followed by 1 friends of bob (eve), 1 followers total (breaks tie)
|
||||
[neil.id, 1, 2] # Followed by 1 friends of bob (mallory), 2 followers total
|
||||
)
|
||||
end
|
||||
|
||||
def expected_results
|
||||
[
|
||||
[john.id, :friends_of_friends],
|
||||
[eugen.id, :friends_of_friends],
|
||||
[jerk.id, :friends_of_friends],
|
||||
[neil.id, :friends_of_friends],
|
||||
]
|
||||
end
|
||||
|
||||
def source_query_values
|
||||
subject.source_query(bob).to_a
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue