diff --git a/app/controllers/registrant/whois_controller.rb b/app/controllers/registrant/whois_controller.rb deleted file mode 100644 index 2936477eb..000000000 --- a/app/controllers/registrant/whois_controller.rb +++ /dev/null @@ -1,11 +0,0 @@ -# As non-GDPR compliant, this controller is deprecated. Needs to be replaced with one that relies -# on the REST WHOIS API. -class Registrant::WhoisController < RegistrantController - def index - authorize! :view, :registrant_whois - - if params[:domain_name].present? - @domain = WhoisRecord.find_by(name: params[:domain_name]); - end - end -end diff --git a/app/views/layouts/registrant/application.html.erb b/app/views/layouts/registrant/application.html.erb index f38f8fcea..075ac4652 100644 --- a/app/views/layouts/registrant/application.html.erb +++ b/app/views/layouts/registrant/application.html.erb @@ -1,84 +1,86 @@ - - - - <% if content_for? :head_title %> - <%= yield :head_title %> - <% else %> - - <%= t(:registrant_head_title) %> - - <% end %> - <%= csrf_meta_tags %> - <%= stylesheet_link_tag 'registrant-manifest', media: 'all' %> - <%= favicon_link_tag 'favicon.ico' %> - - - - -
- <%= render 'shared/flash' %> - <%= yield %> -
- - <%= javascript_include_tag 'registrant-manifest', async: true %> - + + <%= javascript_include_tag 'registrant-manifest', async: true %> + diff --git a/test/integration/registrant/layout_test.rb b/test/integration/registrant/layout_test.rb index 82b8026b7..fa811694f 100644 --- a/test/integration/registrant/layout_test.rb +++ b/test/integration/registrant/layout_test.rb @@ -9,9 +9,16 @@ class RegistrantLayoutTest < ActionDispatch::IntegrationTest travel_to Time.zone.parse('2010-07-05') end - def test_has_link_to_rest_whois + def teardown + super + + travel_back + end + + def test_has_link_to_rest_whois_and_internet_ee visit registrant_domains_url + assert(has_link?('Internet.ee', href: 'https://internet.ee')) - refute(has_link?('WHOIS', href: 'registrant/whois')) + assert(has_link?('WHOIS', href: 'https://whois.internet.ee')) end end