zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-20 17:55:55 +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 has_many :keyrelays
accepts_nested_attributes_for :dnskeys, allow_destroy: true, accepts_nested_attributes_for :dnskeys, allow_destroy: true
reject_if: proc { |attrs| attrs[:public_key].blank? }
has_many :legal_documents, as: :documentable has_many :legal_documents, as: :documentable
accepts_nested_attributes_for :legal_documents, reject_if: proc { |attrs| attrs[:body].blank? } accepts_nested_attributes_for :legal_documents, reject_if: proc { |attrs| attrs[:body].blank? }
@ -68,10 +67,10 @@ class Domain < ActiveRecord::Base
validate :validate_period validate :validate_period
# validates :nameservers, object_count: { validates :nameservers, object_count: {
# min: -> { Setting.ns_min_count }, min: -> { Setting.ns_min_count },
# max: -> { Setting.ns_max_count } max: -> { Setting.ns_max_count }
# } }
validates :dnskeys, object_count: { validates :dnskeys, object_count: {
min: -> { Setting.dnskeys_min_count }, min: -> { Setting.dnskeys_min_count },
@ -90,9 +89,9 @@ class Domain < ActiveRecord::Base
max: -> { Setting.tech_contacts_max_count } max: -> { Setting.tech_contacts_max_count }
} }
# validates :nameservers, uniqueness_multi: { validates :nameservers, uniqueness_multi: {
# attribute: 'hostname' attribute: 'hostname'
# } }
validates :tech_domain_contacts, uniqueness_multi: { validates :tech_domain_contacts, uniqueness_multi: {
association: 'domain_contacts', association: 'domain_contacts',
@ -112,7 +111,7 @@ class Domain < ActiveRecord::Base
attribute: 'public_key' attribute: 'public_key'
} }
# validate :validate_nameserver_ips validate :validate_nameserver_ips
attr_accessor :owner_contact_typeahead, :update_me attr_accessor :owner_contact_typeahead, :update_me

22
app/models/epp/epp_domain.rb
View file

@ -88,7 +88,14 @@ class Epp::EppDomain < Domain
at[:nameservers_attributes] = nameservers_attrs(frame, action) at[:nameservers_attributes] = nameservers_attrs(frame, action)
at[:domain_contacts_attributes] = domain_contacts_attrs(frame, action) at[:domain_contacts_attributes] = domain_contacts_attrs(frame, action)
at[:domain_statuses_attributes] = domain_statuses_attrs(frame, action) at[:domain_statuses_attributes] = domain_statuses_attrs(frame, action)
at[:dnskeys_attributes] = dnskeys_attrs(frame, action)
if new_record?
dnskey_frame = frame.css('extension create')
else
dnskey_frame = frame
end
at[:dnskeys_attributes] = dnskeys_attrs(dnskey_frame, action)
at[:legal_documents_attributes] = legal_document_from(frame) at[:legal_documents_attributes] = legal_document_from(frame)
at at
@ -141,8 +148,19 @@ class Epp::EppDomain < Domain
frame.css('contact').each do |x| frame.css('contact').each do |x|
c = Contact.find_by(code: x.text).try(:id) c = Contact.find_by(code: x.text).try(:id)
# contact = Contact.find_by(code: x[:contact])
# unless contact
# add_epp_error('2303', 'contact', x[:contact], [:domain_contacts, :not_found])
# next
# end
# if k == :admin && contact.bic?
# add_epp_error('2306', 'contact', x[:contact], [:domain_contacts, :admin_contact_can_be_only_citizen])
# next
# end
unless c unless c
add_epp_error('2303', 'contact', x.text, msg: I18n.t('contact_not_found')) add_epp_error('2303', 'contact', x.text, [:domain_contacts, :not_found])
next next
end end

1
spec/epp/domain_spec.rb
View file

@ -170,6 +170,7 @@ describe 'EPP Domain', epp: true do
}) })
response = epp_plain_request(xml, :xml) response = epp_plain_request(xml, :xml)
response[:result_code].should == '2306' response[:result_code].should == '2306'
response[:msg].should == 'IPv4 is missing [ipv4]' response[:msg].should == 'IPv4 is missing [ipv4]'
end end