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

Fix whois #2623

Browse source
This commit is contained in:
Martin Lensment 2015-06-15 18:36:57 +03:00
parent 12a05c524c
commit 777f3836e7
3 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/whois_record.rb
View file

@ -34,10 +34,14 @@ class WhoisRecord < ActiveRecord::Base
h = HashWithIndifferentAccess.new h = HashWithIndifferentAccess.new
return h if domain.blank? return h if domain.blank?
status_map = {
'ok' => 'ok (paid and in zone)'
}
@disclosed = [] @disclosed = []
h[:name] = domain.name h[:name] = domain.name
h[:registrant] = domain.registrant.name h[:registrant] = domain.registrant.name
h[:status] = domain.domain_statuses.map(&:human_value).join(', ') h[:status] = domain.statuses.map { |x| status_map[x] || x }.join(', ')
h[:registered] = domain.registered_at.try(:to_s, :iso8601) h[:registered] = domain.registered_at.try(:to_s, :iso8601)
h[:updated_at] = domain.updated_at.try(:to_s, :iso8601) h[:updated_at] = domain.updated_at.try(:to_s, :iso8601)
h[:valid_to] = domain.valid_to.try(:to_s, :iso8601) h[:valid_to] = domain.valid_to.try(:to_s, :iso8601)

2
spec/features/registrant/domain_delete_confirm_spec.rb
View file

@ -26,7 +26,7 @@ feature 'DomainDeleteConfirm', type: :feature do
registrant_verification_token: '123', registrant_verification_token: '123',
registrant_verification_asked_at: Time.zone.now registrant_verification_asked_at: Time.zone.now
) )
@domain.domain_statuses.create(value: DomainStatus::PENDING_DELETE) @domain.statuses << DomainStatus::PENDING_DELETE
end end
it 'should see warning info if token is missing in request' do it 'should see warning info if token is missing in request' do

2
spec/features/registrant/domain_update_confirm_spec.rb
View file

@ -26,7 +26,7 @@ feature 'DomainUpdateConfirm', type: :feature do
registrant_verification_token: '123', registrant_verification_token: '123',
registrant_verification_asked_at: Time.zone.now registrant_verification_asked_at: Time.zone.now
) )
@domain.domain_statuses.create(value: DomainStatus::PENDING_UPDATE) @domain.statuses << DomainStatus::PENDING_UPDATE
end end
it 'should see warning info if token is missing in request' do it 'should see warning info if token is missing in request' do