From ae33129975083e4e1a9a78bab20124b17e81259d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Reeves?= Date: Mon, 11 Mar 2019 20:48:24 +0100 Subject: [PATCH] Squish username before validation (#10239) * Squish username before validation (#10101) Fix #10101 * Move before_validation hook to a private method Also add Unicode wite-spaces to the spec to support the use of squish over strip. --- app/models/account.rb | 5 +++++ spec/models/account_spec.rb | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/app/models/account.rb b/app/models/account.rb index b81c641820..d6d718354b 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -472,6 +472,7 @@ class Account < ApplicationRecord before_create :generate_keys before_validation :prepare_contents, if: :local? + before_validation :prepare_username, on: :create before_destroy :clean_feed_manager private @@ -481,6 +482,10 @@ class Account < ApplicationRecord note&.strip! end + def prepare_username + username&.squish! + end + def generate_keys return unless local? && !Rails.env.test? diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index f7f78d34c6..46886b91f5 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -558,6 +558,11 @@ RSpec.describe Account, type: :model do expect(account).to model_have_error_on_field(:username) end + it 'squishes the username before validation' do + account = Fabricate(:account, domain: nil, username: " \u3000bob \t \u00a0 \n ") + expect(account.username).to eq 'bob' + end + context 'when is local' do it 'is invalid if the username is not unique in case-insensitive comparison among local accounts' do account_1 = Fabricate(:account, username: 'the_doctor')