From c08561fa0d8184fbf3d554e7eb788a5e4a6ad0bb Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Fri, 27 Apr 2018 14:10:16 +0300 Subject: [PATCH] Remove information about web-based whois form name fields --- app/views/for_models/whois.erb | 13 ++++++------- test/models/whois_record_test.rb | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/views/for_models/whois.erb b/app/views/for_models/whois.erb index 5bc1b30f5..02b9b1398 100644 --- a/app/views/for_models/whois.erb +++ b/app/views/for_models/whois.erb @@ -1,7 +1,6 @@ -<%- if json['disclaimer'].present? %> +<%- if json['disclaimer'].present? -%> <%= json['disclaimer'].scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n") %> - -<%- end %> +<%- end -%> Estonia .ee Top Level Domain WHOIS server Domain: @@ -27,18 +26,18 @@ changed: <%= json['registrant_changed'].to_s.tr('T',' ').sub('+', ' +') %> <%- if json['admin_contacts'].present? -%> Administrative contact: <%- for contact in json['admin_contacts'] -%> -name: Not Disclosed - Visit www.internet.ee for webbased WHOIS +name: Not Disclosed email: Not Disclosed - Visit www.internet.ee for webbased WHOIS -changed: Not Disclosed - Visit www.internet.ee for webbased WHOIS +changed: Not Disclosed <%- end -%> <%- end -%> <% if json['tech_contacts'].present? %> Technical contact: <%- for contact in json['tech_contacts'] -%> -name: Not Disclosed - Visit www.internet.ee for webbased WHOIS +name: Not Disclosed email: Not Disclosed - Visit www.internet.ee for webbased WHOIS -changed: Not Disclosed - Visit www.internet.ee for webbased WHOIS +changed: Not Disclosed <%- end -%> <%- end -%> diff --git a/test/models/whois_record_test.rb b/test/models/whois_record_test.rb index 9d050bc29..438ee9cc4 100644 --- a/test/models/whois_record_test.rb +++ b/test/models/whois_record_test.rb @@ -39,9 +39,9 @@ class WhoisRecordTest < ActiveSupport::TestCase end expected_technical_contact = begin 'Technical contact:\n' \ - 'name: Not Disclosed - Visit www.internet.ee for webbased WHOIS\n' \ + 'name: Not Disclosed\n' \ 'email: Not Disclosed - Visit www.internet.ee for webbased WHOIS\n' \ - 'changed: Not Disclosed - Visit www.internet.ee for webbased WHOIS' + 'changed: Not Disclosed' end regexp_contact = Regexp.new(expected_technical_contact, Regexp::MULTILINE)