zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-12 04:29:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2074 from internetee/1795-validation-contacts-name

Browse source 
fix contacts name validation
This commit is contained in:
Timo Võhmar 2021-07-08 16:30:26 +03:00 • committed by GitHub
commit e2116a505e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/models/contact.rb
View file

@ -28,7 +28,12 @@ class Contact < ApplicationRecord
.where('success = false and verified_at IS NOT NULL') .where('success = false and verified_at IS NOT NULL')
} }
NAME_REGEXP = /([\u00A1-\u00B3\u00B5-\u00BF\u0021-\u0026\u0028-\u002C\u003A-\u0040]|
[\u005B-\u005F\u007B-\u007E\u2040-\u206F\u20A0-\u20BF\u2100-\u218F])/x.freeze
validates :name, :email, presence: true validates :name, :email, presence: true
validates :name, format: { without: NAME_REGEXP, message: :invalid }
validates :street, :city, :zip, :country_code, presence: true, if: lambda { validates :street, :city, :zip, :country_code, presence: true, if: lambda {
self.class.address_processing? self.class.address_processing?
} }

10
test/models/contact_test.rb
View file

@ -32,6 +32,16 @@ class ContactTest < ActiveJob::TestCase
assert contact.invalid? assert contact.invalid?
end end
def test_allowed_and_disallowed_symbols_for_name
contact = valid_contact
contact.name = 'MARY ÄNN O’CONNEŽ-ŠUSLIK'
assert contact.valid?
contact.name = 'Boğaçhan Çağlayan'
assert contact.valid?
contact.name = '# "¤ #" ¤ "?'
assert contact.invalid?
end
def test_validates_code_format def test_validates_code_format
contact = valid_contact.dup contact = valid_contact.dup
max_length = 100 max_length = 100