From cd37048439f9b324f48e6af1f426a7894c54b4da Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 12 Jan 2024 04:11:34 -0500
Subject: [PATCH] Move followable_by coverage to suggestions (#28697)
---
.../follow_recommendation_mute_fabricator.rb | 6 ++
spec/models/account_spec.rb | 23 --------
.../models/account_suggestions/source_spec.rb | 57 +++++++++++++++++++
3 files changed, 63 insertions(+), 23 deletions(-)
create mode 100644 spec/fabricators/follow_recommendation_mute_fabricator.rb
create mode 100644 spec/models/account_suggestions/source_spec.rb
diff --git a/spec/fabricators/follow_recommendation_mute_fabricator.rb b/spec/fabricators/follow_recommendation_mute_fabricator.rb
new file mode 100644
index 000000000..0f924386e
--- /dev/null
+++ b/spec/fabricators/follow_recommendation_mute_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:follow_recommendation_mute) do
+ account { Fabricate.build(:account) }
+ target_account { Fabricate.build(:account) }
+end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 1a4c14c45..ab7457962 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -1011,27 +1011,4 @@ RSpec.describe Account do
expect(subject.reload.followers_count).to eq 15
end
end
-
- describe '.followable_by' do
- context 'with follows and follow requests' do
- let!(:account) { Fabricate(:account) }
- let!(:eligible_account) { Fabricate(:account) }
- let!(:following_account) { Fabricate(:account) }
- let!(:follow_requested_account) { Fabricate(:account) }
-
- before do
- Fabricate :follow, account: account, target_account: following_account
- Fabricate :follow_request, account: account, target_account: follow_requested_account
- end
-
- it 'returns accounts not already following or requested to follow' do
- results = described_class.followable_by(account)
-
- expect(results)
- .to include(eligible_account)
- .and not_include(following_account)
- .and not_include(follow_requested_account)
- end
- end
- end
end
diff --git a/spec/models/account_suggestions/source_spec.rb b/spec/models/account_suggestions/source_spec.rb
new file mode 100644
index 000000000..d8227e01b
--- /dev/null
+++ b/spec/models/account_suggestions/source_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AccountSuggestions::Source do
+ describe '#base_account_scope' do
+ subject { FakeSource.new }
+
+ before do
+ stub_const 'FakeSource', fake_source_class
+ end
+
+ context 'with follows and follow requests' do
+ let!(:account_domain_blocked_account) { Fabricate(:account, domain: 'blocked.host') }
+ let!(:account) { Fabricate(:account) }
+ let!(:blocked_account) { Fabricate(:account) }
+ let!(:eligible_account) { Fabricate(:account) }
+ let!(:follow_recommendation_muted_account) { Fabricate(:account) }
+ let!(:follow_requested_account) { Fabricate(:account) }
+ let!(:following_account) { Fabricate(:account) }
+ let!(:moved_account) { Fabricate(:account, moved_to_account: Fabricate(:account)) }
+
+ before do
+ Fabricate :account_domain_block, account: account, domain: account_domain_blocked_account.domain
+ Fabricate :block, account: account, target_account: blocked_account
+ Fabricate :follow_recommendation_mute, account: account, target_account: follow_recommendation_muted_account
+ Fabricate :follow_request, account: account, target_account: follow_requested_account
+ Fabricate :follow, account: account, target_account: following_account
+ end
+
+ it 'returns eligible accounts' do
+ results = subject.get(account)
+
+ expect(results)
+ .to include(eligible_account)
+ .and not_include(account_domain_blocked_account)
+ .and not_include(account)
+ .and not_include(blocked_account)
+ .and not_include(follow_recommendation_muted_account)
+ .and not_include(follow_requested_account)
+ .and not_include(following_account)
+ .and not_include(moved_account)
+ end
+ end
+ end
+
+ private
+
+ def fake_source_class
+ Class.new described_class do
+ def get(account, limit: 10)
+ base_account_scope(account)
+ .limit(limit)
+ end
+ end
+ end
+end