From 9e40d3ef37554a5ebdaf3ead485c5e13c8ddc926 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 18 Feb 2026 08:43:21 -0500 Subject: [PATCH] Use validation matchers for `ReactionValidator` spec (#37900) --- spec/validators/reaction_validator_spec.rb | 50 ++++++++++------------ 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/spec/validators/reaction_validator_spec.rb b/spec/validators/reaction_validator_spec.rb index c4d4a517799..d17c4b0505d 100644 --- a/spec/validators/reaction_validator_spec.rb +++ b/spec/validators/reaction_validator_spec.rb @@ -3,41 +3,35 @@ require 'rails_helper' RSpec.describe ReactionValidator do - let(:announcement) { Fabricate(:announcement) } + subject { Fabricate.build :announcement_reaction } - describe '#validate' do - it 'adds error when not a valid unicode emoji' do - reaction = announcement.announcement_reactions.build(name: 'F') - subject.validate(reaction) - expect(reaction.errors).to_not be_empty - end + context 'when not valid unicode emoji' do + it { is_expected.to_not allow_value('F').for(:name).with_message(I18n.t('reactions.errors.unrecognized_emoji')) } + end - it 'does not add error when non-unicode emoji is a custom emoji' do - custom_emoji = Fabricate(:custom_emoji) - reaction = announcement.announcement_reactions.build(name: custom_emoji.shortcode, custom_emoji_id: custom_emoji.id) - subject.validate(reaction) - expect(reaction.errors).to be_empty - end + context 'when non-unicode emoji is a custom emoji' do + let!(:custom_emoji) { Fabricate :custom_emoji } - it 'adds error when reaction limit count has already been reached' do - stub_const 'ReactionValidator::LIMIT', 2 - %w(🐘 ❤️).each do |name| - announcement.announcement_reactions.create!(name: name, account: Fabricate(:account)) - end + it { is_expected.to allow_value(custom_emoji.shortcode).for(:name) } + end - reaction = announcement.announcement_reactions.build(name: '😘') - subject.validate(reaction) - expect(reaction.errors).to_not be_empty - end + describe 'limiting reactions' do + subject { Fabricate.build :announcement_reaction, announcement: } + + let(:announcement) { Fabricate :announcement } + + before { stub_const 'ReactionValidator::LIMIT', 2 } - it 'does not add error when new reaction is part of the existing ones' do - %w(🐘 ❤️ 🙉 😍 😋 😂 😞 👍).each do |name| - announcement.announcement_reactions.create!(name: name, account: Fabricate(:account)) + context 'when limit has been reached' do + before { %w(🐘 ❤️).each { |name| Fabricate :announcement_reaction, name:, announcement: } } + + context 'with emoji already used' do + it { is_expected.to allow_value('❤️').for(:name) } end - reaction = announcement.announcement_reactions.build(name: '😋') - subject.validate(reaction) - expect(reaction.errors).to be_empty + context 'with emoji not already used' do + it { is_expected.to_not allow_value('😘').for(:name).against(:base).with_message(I18n.t('reactions.errors.limit_reached')) } + end end end end