From 53b2b1b2389c0ea941c50d4a9c726539d808c384 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 29 Jul 2017 00:06:29 +0200 Subject: Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427) * Count all URLs in text as 23 characters flat, do not count domain part of usernames * Add new status text counting logic to web UI --- spec/models/status_spec.rb | 2 +- spec/validators/status_length_validator_spec.rb | 44 +++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 spec/validators/status_length_validator_spec.rb (limited to 'spec') diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb index 0b90205ee..626fc3f98 100644 --- a/spec/models/status_spec.rb +++ b/spec/models/status_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe Status, type: :model do let(:alice) { Fabricate(:account, username: 'alice') } let(:bob) { Fabricate(:account, username: 'bob') } - let(:other) { Fabricate(:status, account: bob, text: 'Skulls for the skull god! The enemy\'s gates are sideways!')} + let(:other) { Fabricate(:status, account: bob, text: 'Skulls for the skull god! The enemy\'s gates are sideways!') } subject { Fabricate(:status, account: alice) } diff --git a/spec/validators/status_length_validator_spec.rb b/spec/validators/status_length_validator_spec.rb new file mode 100644 index 000000000..e2d1a15ec --- /dev/null +++ b/spec/validators/status_length_validator_spec.rb @@ -0,0 +1,44 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe StatusLengthValidator do + describe '#validate' do + it 'does not add errors onto remote statuses' + it 'does not add errors onto local reblogs' + + 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) + subject.validate(status) + expect(status.errors).to have_received(:add) + end + + it 'adds an error when text is over 500 characters' do + status = double(spoiler_text: '', text: 'a' * 520, errors: double(add: nil), local?: true, reblog?: false) + 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 = double(spoiler_text: 'a' * 250, text: 'b' * 251, errors: double(add: nil), local?: true, reblog?: false) + 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 = double(spoiler_text: '', text: text, errors: double(add: nil), local?: true, reblog?: false) + + subject.validate(status) + expect(status.errors).to_not have_received(:add) + end + + it 'counts only the front part of remote usernames' do + text = ('a' * 475) + " @alice@#{'b' * 30}.com" + status = double(spoiler_text: '', text: text, errors: double(add: nil), local?: true, reblog?: false) + + subject.validate(status) + expect(status.errors).to_not have_received(:add) + end + end +end -- cgit