zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-24 19:48:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Validate registrar's billing email (#1253)

Browse source 
Previously it was being validated only if contact email changed (contact
and billing emails have nothing in common).
This commit is contained in:
Artur Beljajev 2019-07-08 13:45:45 +03:00 • committed by Georg
parent 1dfe30ccfd
commit 9bb73b7cdd
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/registrar.rb
View file

@ -32,9 +32,9 @@ class Registrar < ActiveRecord::Base
attribute :vat_rate, ::Type::VATRate.new
after_initialize :set_defaults
validates :email, :billing_email,
email_format: { message: :invalid },
allow_blank: true, if: proc { |c| c.email_changed? }
validates :email, email_format: { message: :invalid },
allow_blank: true, if: proc { |c| c.email_changed? }
validates :billing_email, email_format: { message: :invalid }, allow_blank: true
WHOIS_TRIGGERS = %w(name email phone street city state zip)

16
test/models/registrar_test.rb
View file

@ -47,6 +47,22 @@ class RegistrarTest < ActiveSupport::TestCase
assert registrar.invalid?
end
def test_optional_billing_email
registrar = valid_registrar
registrar.billing_email = ''
assert registrar.valid?
end
def test_billing_email_format_validation
registrar = valid_registrar
registrar.billing_email = 'invalid'
assert registrar.invalid?
registrar.billing_email = 'valid@email.test'
assert registrar.valid?
end
def test_invalid_without_language
registrar = valid_registrar
registrar.language = ''