From 7f28dd117944166b14cb97674995e988d8c6c31d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 17 Feb 2026 04:03:46 -0500
Subject: [PATCH] Use validation matchers for `FollowLimitValidator` spec
 (#37792)

---
 .../validators/follow_limit_validator_spec.rb | 86 ++++++-------------
 1 file changed, 27 insertions(+), 59 deletions(-)

diff --git a/spec/validators/follow_limit_validator_spec.rb b/spec/validators/follow_limit_validator_spec.rb
index e069b0ed3a..f6c525d5b4 100644
--- a/spec/validators/follow_limit_validator_spec.rb
+++ b/spec/validators/follow_limit_validator_spec.rb
@@ -3,76 +3,44 @@
 require 'rails_helper'
 
 RSpec.describe FollowLimitValidator do
-  describe '#validate' do
-    context 'with a nil account' do
-      it 'does not add validation errors to base' do
-        follow = Fabricate.build(:follow, account: nil)
+  subject { Fabricate.build(:follow) }
 
-        follow.valid?
+  context 'with a nil account' do
+    it { is_expected.to allow_values(nil).for(:account).against(:base) }
+  end
 
-        expect(follow.errors[:base]).to be_empty
-      end
+  context 'with a non-local account' do
+    let(:account) { Account.new(domain: 'host.example') }
+
+    it { is_expected.to allow_values(account).for(:account).against(:base) }
+  end
+
+  context 'with a local account' do
+    let(:account) { Account.new }
+
+    context 'when the followers count is under the limit' do
+      before { account.following_count = described_class::LIMIT - 100 }
+
+      it { is_expected.to allow_values(account).for(:account).against(:base) }
     end
 
-    context 'with a non-local account' do
-      it 'does not add validation errors to base' do
-        follow = Fabricate.build(:follow, account: Account.new(domain: 'host.example'))
+    context 'when the following count is over the limit' do
+      before { account.following_count = described_class::LIMIT + 100 }
 
-        follow.valid?
+      context 'when the followers count is low' do
+        before { account.followers_count = 10 }
 
-        expect(follow.errors[:base]).to be_empty
-      end
-    end
+        it { is_expected.to_not allow_values(account).for(:account).against(:base).with_message(limit_reached_message) }
 
-    context 'with a local account' do
-      let(:account) { Account.new }
-
-      context 'when the followers count is under the limit' do
-        before do
-          allow(account).to receive(:following_count).and_return(described_class::LIMIT - 100)
-        end
-
-        it 'does not add validation errors to base' do
-          follow = Fabricate.build(:follow, account: account)
-
-          follow.valid?
-
-          expect(follow.errors[:base]).to be_empty
+        def limit_reached_message
+          I18n.t('users.follow_limit_reached', limit: described_class::LIMIT)
         end
       end
 
-      context 'when the following count is over the limit' do
-        before do
-          allow(account).to receive(:following_count).and_return(described_class::LIMIT + 100)
-        end
+      context 'when the followers count is high' do
+        before { account.followers_count = 100_000 }
 
-        context 'when the followers count is low' do
-          before do
-            allow(account).to receive(:followers_count).and_return(10)
-          end
-
-          it 'adds validation errors to base' do
-            follow = Fabricate.build(:follow, account: account)
-
-            follow.valid?
-
-            expect(follow.errors[:base]).to include(I18n.t('users.follow_limit_reached', limit: described_class::LIMIT))
-          end
-        end
-
-        context 'when the followers count is high' do
-          before do
-            allow(account).to receive(:followers_count).and_return(100_000)
-          end
-
-          it 'does not add validation errors to base' do
-            follow = Fabricate.build(:follow, account: account)
-
-            follow.valid?
-
-            expect(follow.errors[:base]).to be_empty
-          end
-        end
+        it { is_expected.to allow_values(account).for(:account).against(:base) }
       end
     end
   end