mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-25 16:24:00 +00:00
Add pending specs for StatusLengthValidator (#9647)
* Add pending specs of StatusLengthValidator * Use instance variable
This commit is contained in:
parent
c1693827ae
commit
ccb9c1b952
|
@ -5,27 +5,29 @@ class StatusLengthValidator < ActiveModel::Validator
|
||||||
|
|
||||||
def validate(status)
|
def validate(status)
|
||||||
return unless status.local? && !status.reblog?
|
return unless status.local? && !status.reblog?
|
||||||
status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if too_long?(status)
|
|
||||||
|
@status = status
|
||||||
|
status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if too_long?
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def too_long?(status)
|
def too_long?
|
||||||
countable_length(status) > MAX_CHARS
|
countable_length > MAX_CHARS
|
||||||
end
|
end
|
||||||
|
|
||||||
def countable_length(status)
|
def countable_length
|
||||||
total_text(status).mb_chars.grapheme_length
|
total_text.mb_chars.grapheme_length
|
||||||
end
|
end
|
||||||
|
|
||||||
def total_text(status)
|
def total_text
|
||||||
[status.spoiler_text, countable_text(status)].join
|
[@status.spoiler_text, countable_text].join
|
||||||
end
|
end
|
||||||
|
|
||||||
def countable_text(status)
|
def countable_text
|
||||||
return '' if status.text.nil?
|
return '' if @status.text.nil?
|
||||||
|
|
||||||
status.text.dup.tap do |new_text|
|
@status.text.dup.tap do |new_text|
|
||||||
new_text.gsub!(FetchLinkCardService::URL_PATTERN, 'x' * 23)
|
new_text.gsub!(FetchLinkCardService::URL_PATTERN, 'x' * 23)
|
||||||
new_text.gsub!(Account::MENTION_RE, '@\2')
|
new_text.gsub!(Account::MENTION_RE, '@\2')
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,8 +4,17 @@ require 'rails_helper'
|
||||||
|
|
||||||
describe StatusLengthValidator do
|
describe StatusLengthValidator do
|
||||||
describe '#validate' do
|
describe '#validate' do
|
||||||
it 'does not add errors onto remote statuses'
|
it 'does not add errors onto remote statuses' do
|
||||||
it 'does not add errors onto local reblogs'
|
status = double(local?: false)
|
||||||
|
subject.validate(status)
|
||||||
|
expect(status).not_to receive(:errors)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not add errors onto local reblogs' do
|
||||||
|
status = double(local?: false, reblog?: true)
|
||||||
|
subject.validate(status)
|
||||||
|
expect(status).not_to receive(:errors)
|
||||||
|
end
|
||||||
|
|
||||||
it 'adds an error when content warning is over 500 characters' do
|
it 'adds an error when content warning is over 500 characters' do
|
||||||
status = double(spoiler_text: 'a' * 520, text: '', errors: double(add: nil), local?: true, reblog?: false)
|
status = double(spoiler_text: 'a' * 520, text: '', errors: double(add: nil), local?: true, reblog?: false)
|
||||||
|
|
Loading…
Reference in a new issue