zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-05 01:11:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Test fixes

Browse source
This commit is contained in:
Martin Lensment 2015-03-09 12:31:46 +02:00
parent 7017c34297
commit b4545bae08
3 changed files with 41 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/models/domain.rb
View file

@ -35,8 +35,7 @@ class Domain < ActiveRecord::Base
has_many :keyrelays
accepts_nested_attributes_for :dnskeys, allow_destroy: true,
reject_if: proc { |attrs| attrs[:public_key].blank? }
accepts_nested_attributes_for :dnskeys, allow_destroy: true
has_many :legal_documents, as: :documentable
accepts_nested_attributes_for :legal_documents, reject_if: proc { |attrs| attrs[:body].blank? }
@ -68,10 +67,10 @@ class Domain < ActiveRecord::Base
validate :validate_period
# validates :nameservers, object_count: {
# min: -> { Setting.ns_min_count },
# max: -> { Setting.ns_max_count }
# }
validates :nameservers, object_count: {
min: -> { Setting.ns_min_count },
max: -> { Setting.ns_max_count }
}
validates :dnskeys, object_count: {
min: -> { Setting.dnskeys_min_count },
@ -90,9 +89,9 @@ class Domain < ActiveRecord::Base
max: -> { Setting.tech_contacts_max_count }
}
# validates :nameservers, uniqueness_multi: {
# attribute: 'hostname'
# }
validates :nameservers, uniqueness_multi: {
attribute: 'hostname'
}
validates :tech_domain_contacts, uniqueness_multi: {
association: 'domain_contacts',
@ -112,7 +111,7 @@ class Domain < ActiveRecord::Base
attribute: 'public_key'
}
# validate :validate_nameserver_ips
validate :validate_nameserver_ips
attr_accessor :owner_contact_typeahead, :update_me