mirror of
https://github.com/mastodon/mastodon.git
synced 2025-09-08 02:41:06 +00:00
Rebase
This commit is contained in:
parent
98d0ef4936
commit
0c4b79467c
|
@ -4,6 +4,8 @@ require 'rails_helper'
|
||||||
|
|
||||||
describe StatusLengthValidator do
|
describe StatusLengthValidator do
|
||||||
describe '#validate' 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
|
it 'does not add errors onto remote statuses' do
|
||||||
status = instance_double(Status, local?: false)
|
status = instance_double(Status, local?: false)
|
||||||
allow(status).to receive(:errors)
|
allow(status).to receive(:errors)
|
||||||
|
@ -22,32 +24,27 @@ describe StatusLengthValidator do
|
||||||
expect(status).to_not have_received(:errors)
|
expect(status).to_not have_received(:errors)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'adds an error when content warning is over MAX_CHARS characters' do
|
it 'adds an error when content warning is over character limit' do
|
||||||
chars = StatusLengthValidator::MAX_CHARS + 1
|
status = status_double(spoiler_text: 'a' * 520)
|
||||||
status = instance_double(Status, spoiler_text: 'a' * chars, text: '', errors: activemodel_errors, local?: true, reblog?: false)
|
|
||||||
subject.validate(status)
|
subject.validate(status)
|
||||||
expect(status.errors).to have_received(:add)
|
expect(status.errors).to have_received(:add)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'adds an error when text is over MAX_CHARS characters' do
|
it 'adds an error when text is over character limit' do
|
||||||
chars = StatusLengthValidator::MAX_CHARS + 1
|
status = status_double(text: 'a' * 520)
|
||||||
status = instance_double(Status, spoiler_text: '', text: 'a' * chars, errors: activemodel_errors, local?: true, reblog?: false)
|
|
||||||
subject.validate(status)
|
subject.validate(status)
|
||||||
expect(status.errors).to have_received(:add)
|
expect(status.errors).to have_received(:add)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'adds an error when text and content warning are over MAX_CHARS characters total' do
|
it 'adds an error when text and content warning are over character limit total' do
|
||||||
chars1 = 20
|
status = status_double(spoiler_text: 'a' * 250, text: 'b' * 251)
|
||||||
chars2 = StatusLengthValidator::MAX_CHARS + 1 - chars1
|
|
||||||
status = instance_double(Status, spoiler_text: 'a' * chars1, text: 'b' * chars2, errors: activemodel_errors, local?: true, reblog?: false)
|
|
||||||
subject.validate(status)
|
subject.validate(status)
|
||||||
expect(status.errors).to have_received(:add)
|
expect(status.errors).to have_received(:add)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'counts URLs as 23 characters flat' do
|
it 'counts URLs as 23 characters flat' do
|
||||||
chars = StatusLengthValidator::MAX_CHARS - 1 - 23
|
text = ('a' * 476) + " http://#{'b' * 30}.com/example"
|
||||||
text = ('a' * chars) + " http://#{'b' * 30}.com/example"
|
status = status_double(text: text)
|
||||||
status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false)
|
|
||||||
|
|
||||||
subject.validate(status)
|
subject.validate(status)
|
||||||
expect(status.errors).to_not have_received(:add)
|
expect(status.errors).to_not have_received(:add)
|
||||||
|
@ -55,7 +52,7 @@ describe StatusLengthValidator do
|
||||||
|
|
||||||
it 'does not count non-autolinkable URLs as 23 characters flat' do
|
it 'does not count non-autolinkable URLs as 23 characters flat' do
|
||||||
text = ('a' * 476) + "http://#{'b' * 30}.com/example"
|
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)
|
subject.validate(status)
|
||||||
expect(status.errors).to have_received(:add)
|
expect(status.errors).to have_received(:add)
|
||||||
|
@ -63,16 +60,14 @@ describe StatusLengthValidator do
|
||||||
|
|
||||||
it 'does not count overly long URLs as 23 characters flat' do
|
it 'does not count overly long URLs as 23 characters flat' do
|
||||||
text = "http://example.com/valid?#{'#foo?' * 1000}"
|
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)
|
subject.validate(status)
|
||||||
expect(status.errors).to have_received(:add)
|
expect(status.errors).to have_received(:add)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'counts only the front part of remote usernames' do
|
it 'counts only the front part of remote usernames' do
|
||||||
username = '@alice'
|
text = ('a' * 475) + " @alice@#{'b' * 30}.com"
|
||||||
chars = StatusLengthValidator::MAX_CHARS - 1 - username.length
|
status = status_double(text: text)
|
||||||
text = ('a' * chars) + " #{username}@#{'b' * 30}.com"
|
|
||||||
status = instance_double(Status, spoiler_text: '', text: text, errors: activemodel_errors, local?: true, reblog?: false)
|
|
||||||
|
|
||||||
subject.validate(status)
|
subject.validate(status)
|
||||||
expect(status.errors).to_not have_received(:add)
|
expect(status.errors).to_not have_received(:add)
|
||||||
|
@ -80,7 +75,7 @@ describe StatusLengthValidator do
|
||||||
|
|
||||||
it 'does count both parts of remote usernames for overly long domains' do
|
it 'does count both parts of remote usernames for overly long domains' do
|
||||||
text = "@alice@#{'b' * 500}.com"
|
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)
|
subject.validate(status)
|
||||||
expect(status.errors).to have_received(:add)
|
expect(status.errors).to have_received(:add)
|
||||||
|
@ -89,6 +84,17 @@ describe StatusLengthValidator do
|
||||||
|
|
||||||
private
|
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
|
def activemodel_errors
|
||||||
instance_double(ActiveModel::Errors, add: nil)
|
instance_double(ActiveModel::Errors, add: nil)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user