From 2447497a4cc6ea305f9431e4d8002b7abb750c7e Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 2 May 2024 04:31:06 -0400 Subject: [PATCH] Status length validation spec updates (#30132) --- .../status_length_validator_spec.rb | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/spec/validators/status_length_validator_spec.rb b/spec/validators/status_length_validator_spec.rb index 06625917b..ead69dfe2 100644 --- a/spec/validators/status_length_validator_spec.rb +++ b/spec/validators/status_length_validator_spec.rb @@ -4,6 +4,8 @@ require 'rails_helper' describe StatusLengthValidator do describe '#validate' do + before { stub_const("#{described_class}::MAX_CHARS", 500) } # Example values below are relative to this baseline + it 'does not add errors onto remote statuses' do status = instance_double(Status, local?: false) allow(status).to receive(:errors) @@ -22,27 +24,27 @@ describe StatusLengthValidator do expect(status).to_not have_received(:errors) end - it 'adds an error when content warning is over 500 characters' do - status = instance_double(Status, spoiler_text: 'a' * 520, text: '', errors: activemodel_errors, local?: true, reblog?: false) + it 'adds an error when content warning is over character limit' do + status = status_double(spoiler_text: 'a' * 520) subject.validate(status) expect(status.errors).to have_received(:add) end - it 'adds an error when text is over 500 characters' do - status = instance_double(Status, spoiler_text: '', text: 'a' * 520, errors: activemodel_errors, local?: true, reblog?: false) + it 'adds an error when text is over character limit' do + status = status_double(text: 'a' * 520) subject.validate(status) expect(status.errors).to have_received(:add) end - it 'adds an error when text and content warning are over 500 characters total' do - status = instance_double(Status, spoiler_text: 'a' * 250, text: 'b' * 251, errors: activemodel_errors, local?: true, reblog?: false) + it 'adds an error when text and content warning are over character limit total' do + status = status_double(spoiler_text: 'a' * 250, text: 'b' * 251) subject.validate(status) expect(status.errors).to have_received(:add) end it 'counts URLs as 23 characters flat' do text = ('a' * 476) + " http://#{'b' * 30}.com/example" - status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false) + status = status_double(text: text) subject.validate(status) expect(status.errors).to_not have_received(:add) @@ -50,7 +52,7 @@ describe StatusLengthValidator do it 'does not count non-autolinkable URLs as 23 characters flat' do text = ('a' * 476) + "http://#{'b' * 30}.com/example" - status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false) + status = status_double(text: text) subject.validate(status) expect(status.errors).to have_received(:add) @@ -58,14 +60,14 @@ describe StatusLengthValidator do it 'does not count overly long URLs as 23 characters flat' do text = "http://example.com/valid?#{'#foo?' * 1000}" - status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false) + status = status_double(text: text) subject.validate(status) expect(status.errors).to have_received(:add) end it 'counts only the front part of remote usernames' do text = ('a' * 475) + " @alice@#{'b' * 30}.com" - status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false) + status = status_double(text: text) subject.validate(status) expect(status.errors).to_not have_received(:add) @@ -73,7 +75,7 @@ describe StatusLengthValidator do it 'does count both parts of remote usernames for overly long domains' do text = "@alice@#{'b' * 500}.com" - status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false) + status = status_double(text: text) subject.validate(status) expect(status.errors).to have_received(:add) @@ -82,6 +84,17 @@ describe StatusLengthValidator do private + def status_double(spoiler_text: '', text: '') + instance_double( + Status, + spoiler_text: spoiler_text, + text: text, + errors: activemodel_errors, + local?: true, + reblog?: false + ) + end + def activemodel_errors instance_double(ActiveModel::Errors, add: nil) end