mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Fix a spuriously failing spec that assumed we required short bios like upstream

This commit is contained in:
Surinna Curtis 2017-09-10 19:43:52 -05:00
parent 29c44fa5fa
commit 3cac5bc2c3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/account.rb
View File

@ -54,6 +54,8 @@ class Account < ApplicationRecord
include Remotable include Remotable
include EmojiHelper include EmojiHelper
MAX_NOTE_LENGTH = 500
enum protocol: [:ostatus, :activitypub] enum protocol: [:ostatus, :activitypub]
# Local users # Local users
@ -288,7 +290,7 @@ class Account < ApplicationRecord
note_without_metadata = note[(idx + YAML_END.length) .. -1] note_without_metadata = note[(idx + YAML_END.length) .. -1]
end end
end end
if note_without_metadata.mb_chars.grapheme_length > 500 if note_without_metadata.mb_chars.grapheme_length > MAX_NOTE_LENGTH
errors.add(:note, "can't be longer than 500 graphemes") errors.add(:note, "can't be longer than 500 graphemes")
end end
end end

4
spec/controllers/api/v1/accounts/credentials_controller_spec.rb
View File

@ -51,7 +51,9 @@ describe Api::V1::Accounts::CredentialsController do
describe 'with invalid data' do describe 'with invalid data' do
before do before do
patch :update, params: { note: 'This is too long. ' * 10 } note = 'This is too long. '
note = note + 'a' * (Account::MAX_NOTE_LENGTH - note.length + 1)
patch :update, params: { note: note }
end end
it 'returns http unprocessable entity' do it 'returns http unprocessable entity' do