tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

Add pending specs for StatusLengthValidator (#9647)

Browse Source 
* Add pending specs of StatusLengthValidator

* Use instance variable
This commit is contained in:
ysksn 2018-12-28 16:18:47 +09:00 committed by Eugen Rochko
parent c1693827ae
commit ccb9c1b952
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/validators/status_length_validator.rb
View File

@ -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

13
spec/validators/status_length_validator_spec.rb
View File

@ -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)