From 228078a84e42dc7114f1129645fde30f5db6a1fa Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Mar 2018 00:55:35 +0200 Subject: [PATCH 01/11] Add bulk replace to registrar area #662 --- app/api/repp/api.rb | 1 + app/api/repp/domain_contacts_v1.rb | 35 ++++++ .../registrar/bulk_change_controller.rb | 20 ++++ ...ontroller.rb => nameservers_controller.rb} | 8 +- .../registrar/tech_contacts_controller.rb | 58 ++++++++++ app/models/tech_domain_contact.rb | 21 ++++ .../_flash_messages.html.erb | 6 +- app/views/layouts/registrar/base.html.erb | 2 +- .../_nameserver_form.html.erb} | 7 +- .../bulk_change/_tech_contact_form.html.erb | 48 ++++++++ app/views/registrar/bulk_change/new.html.erb | 32 ++++++ app/views/registrar/domains/index.html.erb | 32 +++--- .../registrar_nameservers/edit.html.erb | 11 -- config/locales/registrar/bulk_change.en.yml | 14 +++ config/locales/registrar/domains.en.yml | 2 +- config/locales/registrar/nameservers.en.yml | 5 + .../registrar/registrar_nameservers.en.yml | 13 --- config/locales/registrar/tech_contacts.en.yml | 7 ++ config/routes.rb | 6 +- doc/repp/v1/domain_contacts.md | 19 ++++ test/fixtures/domain_contacts.yml | 15 +++ test/fixtures/nameservers.yml | 4 + test/integration/api/domain_contacts_test.rb | 103 ++++++++++++++++++ test/integration/api/domain_transfers_test.rb | 2 +- .../epp/domain/transfer/request_test.rb | 2 +- .../nameserver_test.rb} | 11 +- .../bulk_change/tech_contact_test.rb | 47 ++++++++ .../registrar/domain_transfers_test.rb | 3 +- test/models/domain_transfer_test.rb | 2 +- test/models/nameserver_test.rb | 4 +- 30 files changed, 474 insertions(+), 66 deletions(-) create mode 100644 app/api/repp/domain_contacts_v1.rb create mode 100644 app/controllers/registrar/bulk_change_controller.rb rename app/controllers/registrar/{registrar_nameservers_controller.rb => nameservers_controller.rb} (94%) create mode 100644 app/controllers/registrar/tech_contacts_controller.rb rename app/views/{admin/base => application}/_flash_messages.html.erb (77%) rename app/views/registrar/{registrar_nameservers/_form.html.erb => bulk_change/_nameserver_form.html.erb} (89%) create mode 100644 app/views/registrar/bulk_change/_tech_contact_form.html.erb create mode 100644 app/views/registrar/bulk_change/new.html.erb delete mode 100644 app/views/registrar/registrar_nameservers/edit.html.erb create mode 100644 config/locales/registrar/bulk_change.en.yml create mode 100644 config/locales/registrar/nameservers.en.yml delete mode 100644 config/locales/registrar/registrar_nameservers.en.yml create mode 100644 config/locales/registrar/tech_contacts.en.yml create mode 100644 doc/repp/v1/domain_contacts.md create mode 100644 test/integration/api/domain_contacts_test.rb rename test/integration/registrar/{nameserver_replacement_test.rb => bulk_change/nameserver_test.rb} (91%) create mode 100644 test/integration/registrar/bulk_change/tech_contact_test.rb diff --git a/app/api/repp/api.rb b/app/api/repp/api.rb index 9c12470a0..7858cd625 100644 --- a/app/api/repp/api.rb +++ b/app/api/repp/api.rb @@ -59,5 +59,6 @@ module Repp mount Repp::AccountV1 mount Repp::DomainTransfersV1 mount Repp::NameserversV1 + mount Repp::DomainContactsV1 end end diff --git a/app/api/repp/domain_contacts_v1.rb b/app/api/repp/domain_contacts_v1.rb new file mode 100644 index 000000000..2d2cc4dbb --- /dev/null +++ b/app/api/repp/domain_contacts_v1.rb @@ -0,0 +1,35 @@ +module Repp + class DomainContactsV1 < Grape::API + version 'v1', using: :path + + resource :domains do + resource :contacts do + patch '/' do + predecessor = current_user.registrar.contacts.find_by(code: params[:predecessor]) + successor = current_user.registrar.contacts.find_by(code: params[:successor]) + + unless predecessor + error!({ error: { type: 'invalid_request_error', + param: 'predecessor', + message: "No such contact: #{params[:predecessor]}" } }, :bad_request) + end + + unless successor + error!({ error: { type: 'invalid_request_error', + param: 'successor', + message: "No such contact: #{params[:successor]}" } }, :bad_request) + end + + if predecessor == successor + error!({ error: { type: 'invalid_request_error', + message: 'Successor contact must be different from predecessor' } }, + :bad_request) + end + + affected_domains, skipped_domains = TechDomainContact.replace(predecessor, successor) + @response = { affected_domains: affected_domains, skipped_domains: skipped_domains } + end + end + end + end +end diff --git a/app/controllers/registrar/bulk_change_controller.rb b/app/controllers/registrar/bulk_change_controller.rb new file mode 100644 index 000000000..562344a46 --- /dev/null +++ b/app/controllers/registrar/bulk_change_controller.rb @@ -0,0 +1,20 @@ +class Registrar + class BulkChangeController < DeppController + helper_method :available_contacts + + def new + authorize! :manage, :repp + render file: 'registrar/bulk_change/new', locals: { active_tab: default_tab } + end + + private + + def available_contacts + current_user.registrar.contacts.order(:name).pluck(:name, :code) + end + + def default_tab + :technical_contact + end + end +end diff --git a/app/controllers/registrar/registrar_nameservers_controller.rb b/app/controllers/registrar/nameservers_controller.rb similarity index 94% rename from app/controllers/registrar/registrar_nameservers_controller.rb rename to app/controllers/registrar/nameservers_controller.rb index 1af3cde64..b6f7af829 100644 --- a/app/controllers/registrar/registrar_nameservers_controller.rb +++ b/app/controllers/registrar/nameservers_controller.rb @@ -1,9 +1,5 @@ class Registrar - class RegistrarNameserversController < DeppController - def edit - authorize! :manage, :repp - end - + class NameserversController < BulkChangeController def update authorize! :manage, :repp @@ -52,7 +48,7 @@ class Registrar redirect_to registrar_domains_url else @api_errors = parsed_response[:errors] - render :edit + render file: 'registrar/bulk_change/new', locals: { active_tab: :nameserver } end end end diff --git a/app/controllers/registrar/tech_contacts_controller.rb b/app/controllers/registrar/tech_contacts_controller.rb new file mode 100644 index 000000000..fccb10f78 --- /dev/null +++ b/app/controllers/registrar/tech_contacts_controller.rb @@ -0,0 +1,58 @@ +class Registrar + class TechContactsController < BulkChangeController + def update + authorize! :manage, :repp + + uri = URI.parse("#{ENV['repp_url']}domains/contacts") + + request = Net::HTTP::Patch.new(uri) + request.set_form_data(predecessor: params[:predecessor], successor: params[:successor]) + request.basic_auth(current_user.username, current_user.password) + + if Rails.env.test? + response = Net::HTTP.start(uri.hostname, uri.port, + use_ssl: (uri.scheme == 'https'), + verify_mode: OpenSSL::SSL::VERIFY_NONE) do |http| + http.request(request) + end + elsif Rails.env.development? + client_cert = File.read(ENV['cert_path']) + client_key = File.read(ENV['key_path']) + response = Net::HTTP.start(uri.hostname, uri.port, + use_ssl: (uri.scheme == 'https'), + verify_mode: OpenSSL::SSL::VERIFY_NONE, + cert: OpenSSL::X509::Certificate.new(client_cert), + key: OpenSSL::PKey::RSA.new(client_key)) do |http| + http.request(request) + end + else + client_cert = File.read(ENV['cert_path']) + client_key = File.read(ENV['key_path']) + response = Net::HTTP.start(uri.hostname, uri.port, + use_ssl: (uri.scheme == 'https'), + cert: OpenSSL::X509::Certificate.new(client_cert), + key: OpenSSL::PKey::RSA.new(client_key)) do |http| + http.request(request) + end + end + + parsed_response = JSON.parse(response.body, symbolize_names: true) + + if response.code == '200' + notices = [t('.replaced')] + + notices << "#{t('.affected_domains')}: #{parsed_response[:affected_domains].join(', ')}" + + if parsed_response[:skipped_domains] + notices << "#{t('.skipped_domains')}: #{parsed_response[:skipped_domains].join(', ')}" + end + + flash[:notice] = notices + redirect_to registrar_domains_url + else + @error = parsed_response[:error] + render file: 'registrar/bulk_change/new', locals: { active_tab: :technical_contact } + end + end + end +end diff --git a/app/models/tech_domain_contact.rb b/app/models/tech_domain_contact.rb index 68ae35dde..55cc45aed 100644 --- a/app/models/tech_domain_contact.rb +++ b/app/models/tech_domain_contact.rb @@ -1,2 +1,23 @@ class TechDomainContact < DomainContact + # Audit log is needed, therefore no raw SQL + def self.replace(predecessor, successor) + affected_domains = [] + skipped_domains = [] + tech_contacts = where(contact: predecessor) + + transaction do + tech_contacts.each do |tech_contact| + if tech_contact.domain.discarded? + skipped_domains << tech_contact.domain.name + next + end + + tech_contact.contact = successor + tech_contact.save! + affected_domains << tech_contact.domain.name + end + end + + return affected_domains.sort, skipped_domains.sort + end end diff --git a/app/views/admin/base/_flash_messages.html.erb b/app/views/application/_flash_messages.html.erb similarity index 77% rename from app/views/admin/base/_flash_messages.html.erb rename to app/views/application/_flash_messages.html.erb index 4a10df304..9b31f0d3f 100644 --- a/app/views/admin/base/_flash_messages.html.erb +++ b/app/views/application/_flash_messages.html.erb @@ -1,7 +1,11 @@ <% if flash[:notice] %>
-

<%= flash[:notice] %>

+ <% if flash[:notice].respond_to?(:join) %> +

<%= flash[:notice].join('
').html_safe %>

+ <% else %> +

<%= flash[:notice] %>

+ <% end %>
<% end %> diff --git a/app/views/layouts/registrar/base.html.erb b/app/views/layouts/registrar/base.html.erb index 6116c7a26..c1b67673e 100644 --- a/app/views/layouts/registrar/base.html.erb +++ b/app/views/layouts/registrar/base.html.erb @@ -39,7 +39,7 @@
- <%= render 'shared/flash' %> + <%= render 'flash_messages' %> <% if depp_controller? %> <%= render 'registrar/shared/epp_results' %> <% end %> diff --git a/app/views/registrar/registrar_nameservers/_form.html.erb b/app/views/registrar/bulk_change/_nameserver_form.html.erb similarity index 89% rename from app/views/registrar/registrar_nameservers/_form.html.erb rename to app/views/registrar/bulk_change/_nameserver_form.html.erb index 3aca3e0e1..1b1900314 100644 --- a/app/views/registrar/registrar_nameservers/_form.html.erb +++ b/app/views/registrar/bulk_change/_nameserver_form.html.erb @@ -1,12 +1,13 @@ -<%= form_tag registrar_update_registrar_nameserver_path, method: :put, class: 'form-horizontal' do %> +<%= form_tag registrar_nameservers_path, method: :patch, class: 'form-horizontal' do %> + <%= render 'registrar/domain_transfers/form/api_errors' %> +
<%= label_tag :old_hostname %>
- <%= text_field_tag :old_hostname, params[:old_hostname], autofocus: true, - required: true, + <%= text_field_tag :old_hostname, params[:old_hostname], required: true, class: 'form-control' %>
diff --git a/app/views/registrar/bulk_change/_tech_contact_form.html.erb b/app/views/registrar/bulk_change/_tech_contact_form.html.erb new file mode 100644 index 000000000..24e7ff27f --- /dev/null +++ b/app/views/registrar/bulk_change/_tech_contact_form.html.erb @@ -0,0 +1,48 @@ +<%= form_tag registrar_tech_contacts_path, method: :patch, class: 'form-horizontal' do %> + <% if @error %> +
+ <%= @error[:message] %> +
+ <% end %> + +
+
+ <%= label_tag :predecessor %> +
+ +
+ <%= text_field_tag :predecessor, params[:predecessor], + list: :contacts, + required: true, + autofocus: true, + class: 'form-control' %> +
+
+ +
+
+ <%= label_tag :successor %> +
+ +
+ <%= text_field_tag :successor, params[:successor], + list: :contacts, + required: true, + class: 'form-control' %> +
+
+ +
+
+ +
+
+<% end %> + + + <% available_contacts.each do |data| %> + + <% end %> + diff --git a/app/views/registrar/bulk_change/new.html.erb b/app/views/registrar/bulk_change/new.html.erb new file mode 100644 index 000000000..77cc2d20a --- /dev/null +++ b/app/views/registrar/bulk_change/new.html.erb @@ -0,0 +1,32 @@ +
    +
  1. <%= link_to t('registrar.domains.index.header'), registrar_domains_path %>
    2. +
+ +
+

<%= t '.header' %>

+
+ +
+
+ + +
+
+ <%= render 'tech_contact_form', available_contacts: available_contacts %> +
+ +
+ <%= render 'nameserver_form' %> +
+
+
+
diff --git a/app/views/registrar/domains/index.html.erb b/app/views/registrar/domains/index.html.erb index 319f0d04f..cbc048697 100644 --- a/app/views/registrar/domains/index.html.erb +++ b/app/views/registrar/domains/index.html.erb @@ -1,13 +1,13 @@
-
+

<%= t '.header' %>

-
+
<%= link_to t('.new_btn'), new_registrar_domain_path, class: 'btn btn-primary' %> <%= link_to t('.transfer_btn'), new_registrar_domain_transfer_path, class: 'btn btn-default' %> - <%= link_to t('.replace_nameserver_btn'), registrar_edit_registrar_nameserver_path, + <%= link_to t('.bulk_change_btn'), new_registrar_bulk_change_path, class: 'btn btn-default' %>
@@ -24,22 +24,22 @@
- - - - - - + + + + + + - <%= render @domains %> + <%= render @domains %>
- <%= sort_link(@q, 'name') %> - - <%= sort_link @q, 'registrant_name', Registrant.model_name.human %> - - <%= sort_link @q, 'valid_to', Domain.human_attribute_name(:expire_time) %> -
+ <%= sort_link(@q, 'name') %> + + <%= sort_link @q, 'registrant_name', Registrant.model_name.human %> + + <%= sort_link @q, 'valid_to', Domain.human_attribute_name(:expire_time) %> +
diff --git a/app/views/registrar/registrar_nameservers/edit.html.erb b/app/views/registrar/registrar_nameservers/edit.html.erb deleted file mode 100644 index 0903f1556..000000000 --- a/app/views/registrar/registrar_nameservers/edit.html.erb +++ /dev/null @@ -1,11 +0,0 @@ -
    -
  1. <%= link_to t('registrar.domains.index.header'), registrar_domains_path %>
    2. -
- -
-

<%= t '.header' %>

-
- -<%= render 'registrar/domain_transfers/form/api_errors' %> - -<%= render 'form' %> diff --git a/config/locales/registrar/bulk_change.en.yml b/config/locales/registrar/bulk_change.en.yml new file mode 100644 index 000000000..033d63e74 --- /dev/null +++ b/config/locales/registrar/bulk_change.en.yml @@ -0,0 +1,14 @@ +en: + registrar: + bulk_change: + new: + header: Bulk change + technical_contact: Technical contact + nameserver: Nameserver + + tech_contact_form: + submit_btn: Replace technical contacts + + nameserver_form: + ip_hint: One IP per line + replace_btn: Replace nameserver diff --git a/config/locales/registrar/domains.en.yml b/config/locales/registrar/domains.en.yml index ddd30676d..31380074f 100644 --- a/config/locales/registrar/domains.en.yml +++ b/config/locales/registrar/domains.en.yml @@ -5,7 +5,7 @@ en: header: Domains new_btn: New domain transfer_btn: Transfer - replace_nameserver_btn: Replace nameserver + bulk_change_btn: Bulk change csv: domain_name: Domain transfer_code: Transfer code diff --git a/config/locales/registrar/nameservers.en.yml b/config/locales/registrar/nameservers.en.yml new file mode 100644 index 000000000..fbe4c387e --- /dev/null +++ b/config/locales/registrar/nameservers.en.yml @@ -0,0 +1,5 @@ +en: + registrar: + nameservers: + update: + replaced: Nameserver have been successfully replaced diff --git a/config/locales/registrar/registrar_nameservers.en.yml b/config/locales/registrar/registrar_nameservers.en.yml deleted file mode 100644 index b9e7cb2fa..000000000 --- a/config/locales/registrar/registrar_nameservers.en.yml +++ /dev/null @@ -1,13 +0,0 @@ -en: - registrar: - registrar_nameservers: - edit: - header: Replace nameserver - replace_btn: Replace - - form: - ip_hint: One IP per line - replace_btn: Replace nameserver - - update: - replaced: Nameserver have been successfully replaced diff --git a/config/locales/registrar/tech_contacts.en.yml b/config/locales/registrar/tech_contacts.en.yml new file mode 100644 index 000000000..bf57f0cc7 --- /dev/null +++ b/config/locales/registrar/tech_contacts.en.yml @@ -0,0 +1,7 @@ +en: + registrar: + tech_contacts: + update: + replaced: Technical contacts have been successfully replaced. + affected_domains: Affected domains + skipped_domains: Skipped domains diff --git a/config/routes.rb b/config/routes.rb index 9caeef4a2..099702346 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -62,9 +62,9 @@ Rails.application.routes.draw do end end resources :domain_transfers, only: %i[new create] - get 'registrar/nameservers', to: 'registrar_nameservers#edit', as: :edit_registrar_nameserver - put 'registrar/nameservers', to: 'registrar_nameservers#update', as: :update_registrar_nameserver - + resource :bulk_change, controller: :bulk_change, only: :new + resource :tech_contacts, only: :update + resource :nameservers, only: :update resources :contacts, constraints: {:id => /[^\/]+(?=#{ ActionController::Renderers::RENDERERS.map{|e| "\\.#{e}\\z"}.join("|") })|[^\/]+/} do member do get 'delete' diff --git a/doc/repp/v1/domain_contacts.md b/doc/repp/v1/domain_contacts.md new file mode 100644 index 000000000..8a024e763 --- /dev/null +++ b/doc/repp/v1/domain_contacts.md @@ -0,0 +1,19 @@ +# Domain contacts + +## PATCH https://repp.internet.ee/v1/domains/contacts +Replaces all domain contacts of the current registrar. + +### Example request +``` +$ curl https://repp.internet.ee/v1/domains/contacts \ + -X PATCH \ + -u username:password \ + -d predecessor=foo \ + -d successor=bar +``` +### Example response +``` +{ + "affected_domains": ["example.com", "example.org"] +} +``` diff --git a/test/fixtures/domain_contacts.yml b/test/fixtures/domain_contacts.yml index 3442278a1..43d082e31 100644 --- a/test/fixtures/domain_contacts.yml +++ b/test/fixtures/domain_contacts.yml @@ -8,11 +8,26 @@ shop_william: contact: william type: TechDomainContact +shop_acme_ltd: + domain: shop + contact: acme_ltd + type: TechDomainContact + airport_john: domain: airport contact: john type: AdminDomainContact +airport_william_admin: + domain: airport + contact: william + type: AdminDomainContact + +airport_william_tech: + domain: airport + contact: william + type: TechDomainContact + library_john: domain: library contact: john diff --git a/test/fixtures/nameservers.yml b/test/fixtures/nameservers.yml index 8c3c021d6..344f7894d 100644 --- a/test/fixtures/nameservers.yml +++ b/test/fixtures/nameservers.yml @@ -18,6 +18,10 @@ airport_ns1: hostname: ns1.bestnames.test domain: airport +airport_ns2: + hostname: ns2.bestnames.test + domain: airport + metro_ns1: hostname: ns1.bestnames.test domain: metro diff --git a/test/integration/api/domain_contacts_test.rb b/test/integration/api/domain_contacts_test.rb new file mode 100644 index 000000000..c069bc23d --- /dev/null +++ b/test/integration/api/domain_contacts_test.rb @@ -0,0 +1,103 @@ +require 'test_helper' + +class APIDomainContactsTest < ActionDispatch::IntegrationTest + def test_replace_all_tech_contacts_of_the_current_registrar + patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'john-001' }, + { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert_nil domains(:shop).tech_contacts.find_by(code: 'william-001') + assert domains(:shop).tech_contacts.find_by(code: 'john-001') + assert domains(:airport).tech_contacts.find_by(code: 'john-001') + end + + def test_skip_discarded_domains + domains(:airport).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) + + patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'john-001' }, + { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert domains(:airport).tech_contacts.find_by(code: 'william-001') + end + + def test_return_affected_domains_in_alphabetical_order + patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'john-001' }, + { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert_response :ok + assert_equal ({ affected_domains: %w[airport.test shop.test], + skipped_domains: [] }), + JSON.parse(response.body, symbolize_names: true) + end + + def test_return_skipped_domains_in_alphabetical_order + domains(:shop).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) + domains(:airport).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) + + patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'john-001' }, + { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert_response :ok + assert_equal %w[airport.test shop.test], JSON.parse(response.body, + symbolize_names: true)[:skipped_domains] + end + + def test_keep_other_tech_contacts_intact + patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'john-001' }, + { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert domains(:shop).tech_contacts.find_by(code: 'acme-ltd-001') + end + + def test_keep_admin_contacts_intact + patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'john-001' }, + { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert domains(:airport).admin_contacts.find_by(code: 'william-001') + end + + def test_restrict_contacts_to_the_current_registrar + patch '/repp/v1/domains/contacts', { predecessor: 'jack-001', successor: 'william-002' }, + { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert_response :bad_request + assert_equal ({ error: { type: 'invalid_request_error', + param: 'predecessor', + message: 'No such contact: jack-001' } }), + JSON.parse(response.body, symbolize_names: true) + end + + def test_non_existent_predecessor + patch '/repp/v1/domains/contacts', { predecessor: 'non-existent', successor: 'john-001' }, + { 'HTTP_AUTHORIZATION' => http_auth_key } + assert_response :bad_request + assert_equal ({ error: { type: 'invalid_request_error', + param: 'predecessor', + message: 'No such contact: non-existent' } }), + JSON.parse(response.body, symbolize_names: true) + end + + def test_non_existent_successor + patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'non-existent' }, + { 'HTTP_AUTHORIZATION' => http_auth_key } + assert_response :bad_request + assert_equal ({ error: { type: 'invalid_request_error', + param: 'successor', + message: 'No such contact: non-existent' } }), + JSON.parse(response.body, symbolize_names: true) + end + + def test_disallow_self_replacement + patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'william-001' }, + { 'HTTP_AUTHORIZATION' => http_auth_key } + assert_response :bad_request + assert_equal ({ error: { type: 'invalid_request_error', + message: 'Successor contact must be different from predecessor' } }), + JSON.parse(response.body, symbolize_names: true) + end + + private + + def http_auth_key + ActionController::HttpAuthentication::Basic.encode_credentials('test_bestnames', 'testtest') + end +end diff --git a/test/integration/api/domain_transfers_test.rb b/test/integration/api/domain_transfers_test.rb index 08ce2e34c..e70d1d272 100644 --- a/test/integration/api/domain_transfers_test.rb +++ b/test/integration/api/domain_transfers_test.rb @@ -53,7 +53,7 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest end def test_duplicates_registrant_admin_and_tech_contacts - assert_difference -> { @new_registrar.contacts.size }, 2 do + assert_difference -> { @new_registrar.contacts.size }, 3 do post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } end end diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index 508ec4334..871c3e4d6 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -49,7 +49,7 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest end def test_duplicates_registrant_admin_and_tech_contacts - assert_difference -> { @new_registrar.contacts.size }, 2 do + assert_difference -> { @new_registrar.contacts.size }, 3 do post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } end end diff --git a/test/integration/registrar/nameserver_replacement_test.rb b/test/integration/registrar/bulk_change/nameserver_test.rb similarity index 91% rename from test/integration/registrar/nameserver_replacement_test.rb rename to test/integration/registrar/bulk_change/nameserver_test.rb index 9523d2bbd..fbbdee105 100644 --- a/test/integration/registrar/nameserver_replacement_test.rb +++ b/test/integration/registrar/bulk_change/nameserver_test.rb @@ -1,8 +1,7 @@ require 'test_helper' -class RegistrarNameserverReplacementTest < ActionDispatch::IntegrationTest - def setup - WebMock.reset! +class RegistrarAreaNameserverBulkChangeTest < ActionDispatch::IntegrationTest + setup do login_as users(:api_goodnames) end @@ -21,7 +20,8 @@ class RegistrarNameserverReplacementTest < ActionDispatch::IntegrationTest }] }.to_json, status: 200) visit registrar_domains_url - click_link 'Replace nameserver' + click_link 'Bulk change' + click_link 'Nameserver' fill_in 'Old hostname', with: 'ns1.bestnames.test' fill_in 'New hostname', with: 'new-ns.bestnames.test' @@ -40,7 +40,8 @@ class RegistrarNameserverReplacementTest < ActionDispatch::IntegrationTest headers: { 'Content-type' => 'application/json' }) visit registrar_domains_url - click_link 'Replace nameserver' + click_link 'Bulk change' + click_link 'Nameserver' fill_in 'Old hostname', with: 'old hostname' fill_in 'New hostname', with: 'new hostname' diff --git a/test/integration/registrar/bulk_change/tech_contact_test.rb b/test/integration/registrar/bulk_change/tech_contact_test.rb new file mode 100644 index 000000000..f45880c7b --- /dev/null +++ b/test/integration/registrar/bulk_change/tech_contact_test.rb @@ -0,0 +1,47 @@ +require 'test_helper' + +class RegistrarAreaTechContactBulkChangeTest < ActionDispatch::IntegrationTest + setup do + login_as users(:api_bestnames) + end + + def test_replace_domain_contacts_of_current_registrar + request_stub = stub_request(:patch, /domains\/contacts/) + .with(body: { predecessor: 'william-001', successor: 'john-001' }, + basic_auth: ['test_bestnames', 'testtest']) + .to_return(body: { affected_domains: %w[foo.test bar.test], + skipped_domains: %w[baz.test qux.test] }.to_json, + status: 200) + + visit registrar_domains_url + click_link 'Bulk change' + + fill_in 'Predecessor', with: 'william-001' + fill_in 'Successor', with: 'john-001' + click_on 'Replace technical contacts' + + assert_requested request_stub + assert_current_path registrar_domains_path + assert_text 'Technical contacts have been successfully replaced' + assert_text 'Affected domains: foo.test, bar.test' + assert_text 'Skipped domains: baz.test, qux.test' + end + + def test_fails_gracefully + stub_request(:patch, /domains\/contacts/) + .to_return(status: 400, + body: { error: { message: 'epic fail' } }.to_json, + headers: { 'Content-type' => 'application/json' }) + + visit registrar_domains_url + click_link 'Bulk change' + + fill_in 'Predecessor', with: 'william-001' + fill_in 'Successor', with: 'john-001' + click_on 'Replace technical contacts' + + assert_text 'epic fail' + assert_field 'Predecessor', with: 'william-001' + assert_field 'Successor', with: 'john-001' + end +end diff --git a/test/integration/registrar/domain_transfers_test.rb b/test/integration/registrar/domain_transfers_test.rb index e29a11070..59202c624 100644 --- a/test/integration/registrar/domain_transfers_test.rb +++ b/test/integration/registrar/domain_transfers_test.rb @@ -1,8 +1,7 @@ require 'test_helper' class RegistrarDomainTransfersTest < ActionDispatch::IntegrationTest - def setup - WebMock.reset! + setup do login_as users(:api_goodnames) end diff --git a/test/models/domain_transfer_test.rb b/test/models/domain_transfer_test.rb index 7f11caf80..758a3c2ea 100644 --- a/test/models/domain_transfer_test.rb +++ b/test/models/domain_transfer_test.rb @@ -20,7 +20,7 @@ class DomainTransferTest < ActiveSupport::TestCase body = 'Transfer of domain shop.test has been approved.' \ ' It was associated with registrant john-001' \ - ' and contacts jane-001, william-001.' + ' and contacts acme-ltd-001, jane-001, william-001.' id = @domain_transfer.id class_name = @domain_transfer.class.name diff --git a/test/models/nameserver_test.rb b/test/models/nameserver_test.rb index 5a552a7ee..acf50eee1 100644 --- a/test/models/nameserver_test.rb +++ b/test/models/nameserver_test.rb @@ -50,9 +50,11 @@ class NameserverTest < ActiveSupport::TestCase end def test_hostnames - assert_equal %w[ns1.bestnames.test + assert_equal %w[ + ns1.bestnames.test ns2.bestnames.test ns1.bestnames.test + ns2.bestnames.test ns1.bestnames.test], Nameserver.hostnames end From a713d6f811bdeea40e73871132735e90fb5ab45b Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 18 Apr 2018 12:44:24 +0300 Subject: [PATCH 02/11] Improve registrar area bulk change UI #662 --- app/api/repp/domain_contacts_v1.rb | 3 +- app/assets/javascripts/popover.js | 9 +++++ .../javascripts/registrar-manifest.coffee | 1 + .../registrar/domain_transfers_controller.rb | 4 +-- .../bulk_change/_bulk_transfer_form.html.erb | 35 +++++++++++++++++++ .../bulk_change/_nameserver_form.html.erb | 24 ++++++++++--- .../bulk_change/_tech_contact_form.html.erb | 23 +++++++++--- app/views/registrar/bulk_change/new.html.erb | 13 ++++--- .../{form/_single.html.erb => _form.html.erb} | 4 ++- .../domain_transfers/form/_batch.html.erb | 19 ---------- .../registrar/domain_transfers/new.html.erb | 20 +---------- config/locales/registrar/bulk_change.en.yml | 17 +++++++++ .../locales/registrar/domain_transfers.en.yml | 9 +---- test/integration/api/domain_contacts_test.rb | 2 +- .../bulk_transfer_test.rb} | 20 +++++------ .../bulk_change/tech_contact_test.rb | 12 +++---- 16 files changed, 133 insertions(+), 82 deletions(-) create mode 100644 app/assets/javascripts/popover.js create mode 100644 app/views/registrar/bulk_change/_bulk_transfer_form.html.erb rename app/views/registrar/domain_transfers/{form/_single.html.erb => _form.html.erb} (92%) delete mode 100644 app/views/registrar/domain_transfers/form/_batch.html.erb rename test/integration/registrar/{domain_transfers_test.rb => bulk_change/bulk_transfer_test.rb} (81%) diff --git a/app/api/repp/domain_contacts_v1.rb b/app/api/repp/domain_contacts_v1.rb index 2d2cc4dbb..5a38897d4 100644 --- a/app/api/repp/domain_contacts_v1.rb +++ b/app/api/repp/domain_contacts_v1.rb @@ -22,7 +22,8 @@ module Repp if predecessor == successor error!({ error: { type: 'invalid_request_error', - message: 'Successor contact must be different from predecessor' } }, + message: 'New contact ID must be different from current' \ + ' contact ID' } }, :bad_request) end diff --git a/app/assets/javascripts/popover.js b/app/assets/javascripts/popover.js new file mode 100644 index 000000000..2f8ed57b5 --- /dev/null +++ b/app/assets/javascripts/popover.js @@ -0,0 +1,9 @@ +(function() { + function initPopover() { + $(function () { + $('[data-toggle="popover"]').popover(); + }) + } + + initPopover(); +})(); diff --git a/app/assets/javascripts/registrar-manifest.coffee b/app/assets/javascripts/registrar-manifest.coffee index 5c4a58df6..b5eb13a99 100644 --- a/app/assets/javascripts/registrar-manifest.coffee +++ b/app/assets/javascripts/registrar-manifest.coffee @@ -7,6 +7,7 @@ #= require select2 #= require datepicker #= require spell_check +#= require popover #= require shared/general #= require registrar/autocomplete #= require registrar/application diff --git a/app/controllers/registrar/domain_transfers_controller.rb b/app/controllers/registrar/domain_transfers_controller.rb index 65127155e..7c0925f03 100644 --- a/app/controllers/registrar/domain_transfers_controller.rb +++ b/app/controllers/registrar/domain_transfers_controller.rb @@ -1,5 +1,5 @@ class Registrar - class DomainTransfersController < DeppController + class DomainTransfersController < BulkChangeController before_action do authorize! :transfer, Depp::Domain end @@ -58,7 +58,7 @@ class Registrar redirect_to registrar_domains_url else @api_errors = parsed_response[:errors] - render :new + render file: 'registrar/bulk_change/new', locals: { active_tab: :bulk_transfer } end else params[:request] = true # EPP domain:transfer "op" attribute diff --git a/app/views/registrar/bulk_change/_bulk_transfer_form.html.erb b/app/views/registrar/bulk_change/_bulk_transfer_form.html.erb new file mode 100644 index 000000000..3450cd4e9 --- /dev/null +++ b/app/views/registrar/bulk_change/_bulk_transfer_form.html.erb @@ -0,0 +1,35 @@ +<%= form_tag registrar_domain_transfers_path, multipart: true, class: 'form-horizontal' do %> + <%= render 'registrar/domain_transfers/form/api_errors' %> + +
+
+ <%= label_tag :batch_file %> +
+
+ <%= file_field_tag :batch_file, required: true %> + <%= t '.file_field_hint' %> +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ <%= t '.help' %> +
+
+
+
+<% end %> diff --git a/app/views/registrar/bulk_change/_nameserver_form.html.erb b/app/views/registrar/bulk_change/_nameserver_form.html.erb index 1b1900314..2a6e8f689 100644 --- a/app/views/registrar/bulk_change/_nameserver_form.html.erb +++ b/app/views/registrar/bulk_change/_nameserver_form.html.erb @@ -6,7 +6,7 @@ <%= label_tag :old_hostname %>
-
+
<%= text_field_tag :old_hostname, params[:old_hostname], required: true, class: 'form-control' %>
@@ -17,7 +17,7 @@ <%= label_tag :new_hostname %>
-
+
<%= text_field_tag :new_hostname, params[:new_hostname], required: true, class: 'form-control' %>
@@ -28,7 +28,7 @@ <%= label_tag :ipv4 %>
-
+
<%= text_area_tag :ipv4, params[:ipv4], class: 'form-control' %>
@@ -38,17 +38,31 @@ <%= label_tag :ipv6 %>
-
+
<%= text_area_tag :ipv6, params[:ipv6], class: 'form-control' %> <%= t '.ip_hint' %>
-
+
+ +
+
+ +
+
+ <%= t '.help' %> +
+
+
+
<% end %> diff --git a/app/views/registrar/bulk_change/_tech_contact_form.html.erb b/app/views/registrar/bulk_change/_tech_contact_form.html.erb index 24e7ff27f..f64c738fe 100644 --- a/app/views/registrar/bulk_change/_tech_contact_form.html.erb +++ b/app/views/registrar/bulk_change/_tech_contact_form.html.erb @@ -7,10 +7,10 @@
- <%= label_tag :predecessor %> + <%= label_tag :predecessor, t('.predecessor') %>
-
+
<%= text_field_tag :predecessor, params[:predecessor], list: :contacts, required: true, @@ -21,10 +21,10 @@
- <%= label_tag :successor %> + <%= label_tag :successor, t('.successor') %>
-
+
<%= text_field_tag :successor, params[:successor], list: :contacts, required: true, @@ -33,12 +33,25 @@
-
+
+ +
+
+ +
+
+ <%= t '.help' %> +
+
+
+
<% end %> diff --git a/app/views/registrar/bulk_change/new.html.erb b/app/views/registrar/bulk_change/new.html.erb index 77cc2d20a..da85899ff 100644 --- a/app/views/registrar/bulk_change/new.html.erb +++ b/app/views/registrar/bulk_change/new.html.erb @@ -6,8 +6,7 @@

<%= t '.header' %>

-
-
+
@@ -27,6 +30,8 @@
<%= render 'nameserver_form' %>
+ +
+ <%= render 'bulk_transfer_form' %> +
-
-
diff --git a/app/views/registrar/domain_transfers/form/_single.html.erb b/app/views/registrar/domain_transfers/_form.html.erb similarity index 92% rename from app/views/registrar/domain_transfers/form/_single.html.erb rename to app/views/registrar/domain_transfers/_form.html.erb index 8a9488580..52dcca468 100644 --- a/app/views/registrar/domain_transfers/form/_single.html.erb +++ b/app/views/registrar/domain_transfers/_form.html.erb @@ -1,4 +1,6 @@ <%= form_tag registrar_domain_transfers_path, multipart: true, class: 'form-horizontal' do %> + <%= render 'registrar/domain_transfers/form/api_errors' %> +
<%= label_tag :domain_name, nil, class: 'required' %> @@ -30,7 +32,7 @@
diff --git a/app/views/registrar/domain_transfers/form/_batch.html.erb b/app/views/registrar/domain_transfers/form/_batch.html.erb deleted file mode 100644 index 6effa8a86..000000000 --- a/app/views/registrar/domain_transfers/form/_batch.html.erb +++ /dev/null @@ -1,19 +0,0 @@ -<%= form_tag registrar_domain_transfers_path, multipart: true, class: 'form-horizontal' do %> -
-
- <%= label_tag :batch_file %> -
-
- <%= file_field_tag :batch_file, required: true %> - <%= t '.batch_file_help' %> -
-
- -
-
- -
-
-<% end %> diff --git a/app/views/registrar/domain_transfers/new.html.erb b/app/views/registrar/domain_transfers/new.html.erb index 8ba658023..52dd3f900 100644 --- a/app/views/registrar/domain_transfers/new.html.erb +++ b/app/views/registrar/domain_transfers/new.html.erb @@ -6,24 +6,6 @@
- - -
-
- <%= render 'registrar/domain_transfers/form/single' %> -
- -
- <%= render 'registrar/domain_transfers/form/batch' %> -
-
+ <%= render 'form' %>
diff --git a/config/locales/registrar/bulk_change.en.yml b/config/locales/registrar/bulk_change.en.yml index 033d63e74..0bbd222bd 100644 --- a/config/locales/registrar/bulk_change.en.yml +++ b/config/locales/registrar/bulk_change.en.yml @@ -5,10 +5,27 @@ en: header: Bulk change technical_contact: Technical contact nameserver: Nameserver + bulk_transfer: Bulk transfer tech_contact_form: + predecessor: Current contact ID + successor: New contact ID submit_btn: Replace technical contacts + help_btn: Toggle help + help: >- + Replace technical contact specified in "current contact ID" with the one in "new + contact ID" on any domain registered under this registrar nameserver_form: ip_hint: One IP per line replace_btn: Replace nameserver + help_btn: Toggle help + help: >- + Replace nameserver specified in the "old hostname" with the one in "new hostname" with + optional IPv4 and IPv6 addresses on any domain registered under this registrar + + bulk_transfer_form: + file_field_hint: CSV file with domain list provided by another registrar + submit_btn: Transfer + help_btn: Toggle help + help: Transfer domains in the csv file with correct transfer code to this registrar diff --git a/config/locales/registrar/domain_transfers.en.yml b/config/locales/registrar/domain_transfers.en.yml index d162110ce..c146a5fd1 100644 --- a/config/locales/registrar/domain_transfers.en.yml +++ b/config/locales/registrar/domain_transfers.en.yml @@ -3,17 +3,10 @@ en: domain_transfers: new: header: Domain transfer - single: One by one - batch: Batch create: header: Domain transfer transferred: "%{count} domains have been successfully transferred" form: - single: - transfer_btn: Transfer - - batch: - batch_file_help: CSV file with domain list provided by another registrar - transfer_btn: Transfer batch + submit_btn: Transfer diff --git a/test/integration/api/domain_contacts_test.rb b/test/integration/api/domain_contacts_test.rb index c069bc23d..b9d405219 100644 --- a/test/integration/api/domain_contacts_test.rb +++ b/test/integration/api/domain_contacts_test.rb @@ -91,7 +91,7 @@ class APIDomainContactsTest < ActionDispatch::IntegrationTest { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :bad_request assert_equal ({ error: { type: 'invalid_request_error', - message: 'Successor contact must be different from predecessor' } }), + message: 'New contact ID must be different from current contact ID' } }), JSON.parse(response.body, symbolize_names: true) end diff --git a/test/integration/registrar/domain_transfers_test.rb b/test/integration/registrar/bulk_change/bulk_transfer_test.rb similarity index 81% rename from test/integration/registrar/domain_transfers_test.rb rename to test/integration/registrar/bulk_change/bulk_transfer_test.rb index 59202c624..5bfe7cc68 100644 --- a/test/integration/registrar/domain_transfers_test.rb +++ b/test/integration/registrar/bulk_change/bulk_transfer_test.rb @@ -1,11 +1,11 @@ require 'test_helper' -class RegistrarDomainTransfersTest < ActionDispatch::IntegrationTest +class RegistrarAreaBulkTransferTest < ActionDispatch::IntegrationTest setup do login_as users(:api_goodnames) end - def test_batch_transfer_succeeds + def test_transfer_multiple_domains_in_bulk request_body = { data: { domainTransfers: [{ domainName: 'shop.test', transferCode: '65078d5' }] } } headers = { 'Content-type' => 'application/json' } request_stub = stub_request(:post, /domain_transfers/).with(body: request_body, @@ -16,28 +16,26 @@ class RegistrarDomainTransfersTest < ActionDispatch::IntegrationTest }] }.to_json, status: 200) visit registrar_domains_url - click_link 'Transfer' - - click_on 'Batch' + click_link 'Bulk change' + click_link 'Bulk transfer' attach_file 'Batch file', Rails.root.join('test', 'fixtures', 'files', 'valid_domains_for_transfer.csv').to_s - click_button 'Transfer batch' + click_button 'Transfer' assert_requested request_stub assert_current_path registrar_domains_path assert_text '1 domains have been successfully transferred' end - def test_batch_transfer_fails_gracefully + def test_fail_gracefully body = { errors: [{ title: 'epic fail' }] }.to_json headers = { 'Content-type' => 'application/json' } stub_request(:post, /domain_transfers/).to_return(status: 400, body: body, headers: headers) visit registrar_domains_url - click_link 'Transfer' - - click_on 'Batch' + click_link 'Bulk change' + click_link 'Bulk transfer' attach_file 'Batch file', Rails.root.join('test', 'fixtures', 'files', 'valid_domains_for_transfer.csv').to_s - click_button 'Transfer batch' + click_button 'Transfer' assert_text 'epic fail' end diff --git a/test/integration/registrar/bulk_change/tech_contact_test.rb b/test/integration/registrar/bulk_change/tech_contact_test.rb index f45880c7b..2999a8853 100644 --- a/test/integration/registrar/bulk_change/tech_contact_test.rb +++ b/test/integration/registrar/bulk_change/tech_contact_test.rb @@ -16,8 +16,8 @@ class RegistrarAreaTechContactBulkChangeTest < ActionDispatch::IntegrationTest visit registrar_domains_url click_link 'Bulk change' - fill_in 'Predecessor', with: 'william-001' - fill_in 'Successor', with: 'john-001' + fill_in 'Current contact ID', with: 'william-001' + fill_in 'New contact ID', with: 'john-001' click_on 'Replace technical contacts' assert_requested request_stub @@ -36,12 +36,12 @@ class RegistrarAreaTechContactBulkChangeTest < ActionDispatch::IntegrationTest visit registrar_domains_url click_link 'Bulk change' - fill_in 'Predecessor', with: 'william-001' - fill_in 'Successor', with: 'john-001' + fill_in 'Current contact ID', with: 'william-001' + fill_in 'New contact ID', with: 'john-001' click_on 'Replace technical contacts' assert_text 'epic fail' - assert_field 'Predecessor', with: 'william-001' - assert_field 'Successor', with: 'john-001' + assert_field 'Current contact ID', with: 'william-001' + assert_field 'New contact ID', with: 'john-001' end end From 038f102bdbed4abf3500a5119ba6b5d86e5fa264 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 18 Apr 2018 15:37:03 +0300 Subject: [PATCH 03/11] Trim all text fields in UI #662 --- app/assets/javascripts/registrar-manifest.coffee | 1 + app/assets/javascripts/text_field_trimmer.js | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 app/assets/javascripts/text_field_trimmer.js diff --git a/app/assets/javascripts/registrar-manifest.coffee b/app/assets/javascripts/registrar-manifest.coffee index b5eb13a99..f83d9f76e 100644 --- a/app/assets/javascripts/registrar-manifest.coffee +++ b/app/assets/javascripts/registrar-manifest.coffee @@ -8,6 +8,7 @@ #= require datepicker #= require spell_check #= require popover +#= require text_field_trimmer #= require shared/general #= require registrar/autocomplete #= require registrar/application diff --git a/app/assets/javascripts/text_field_trimmer.js b/app/assets/javascripts/text_field_trimmer.js new file mode 100644 index 000000000..71cbc5295 --- /dev/null +++ b/app/assets/javascripts/text_field_trimmer.js @@ -0,0 +1,15 @@ +(function () { + function trimTextFields() { + let selector = 'input[type=text], input[type=search], input[type=email], textarea'; + let textFields = document.querySelectorAll(selector); + let listener = function () { + this.value = this.value.trim(); + }; + + for (let field of textFields) { + field.addEventListener('change', listener); + } + } + + trimTextFields(); +})(); From 710d5802e05a95b69b0158f575133968b1a1ba34 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Thu, 31 May 2018 21:40:32 +0300 Subject: [PATCH 04/11] Improve CodeClimate config - Show all offences - Use shared rubocop.yml - Remove customizations --- .codeclimate.yml | 30 +- .csslintrc | 2 - .eslintignore | 1 - .eslintrc.yml | 7 - .gitignore | 24 +- .reek | 1136 --------------------------------------- .rubocop.yml | 7 - .rubocop_todo.yml | 1282 --------------------------------------------- coffeelint.json | 129 ----- 9 files changed, 16 insertions(+), 2602 deletions(-) delete mode 100644 .csslintrc delete mode 100644 .eslintignore delete mode 100644 .eslintrc.yml delete mode 100644 .reek delete mode 100644 .rubocop.yml delete mode 100644 .rubocop_todo.yml delete mode 100644 coffeelint.json diff --git a/.codeclimate.yml b/.codeclimate.yml index e33254023..9df308022 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,12 +1,12 @@ +version: "2" +prepare: + fetch: + - "https://raw.githubusercontent.com/internetee/style-guide/master/ruby/.rubocop.yml" plugins: brakeman: enabled: true bundler-audit: enabled: true - csslint: - enabled: true - coffeelint: - enabled: true duplication: enabled: true config: @@ -17,22 +17,12 @@ plugins: enabled: true fixme: enabled: true - config: - strings: - - FIXME - - TODO - - HACK rubocop: enabled: true - channel: rubocop-0-51 - reek: - enabled: true - checks: - IrresponsibleModule: - enabled: false exclude_patterns: -- "config/" -- "db/" -- "vendor/" -- "spec/" -- "test/" + - "bin/" + - "config/" + - "db/" + - "vendor/" + - "test/" + - "spec/" diff --git a/.csslintrc b/.csslintrc deleted file mode 100644 index aacba956e..000000000 --- a/.csslintrc +++ /dev/null @@ -1,2 +0,0 @@ ---exclude-exts=.min.css ---ignore=adjoining-classes,box-model,ids,order-alphabetical,unqualified-attributes diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 96212a359..000000000 --- a/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -**/*{.,-}min.js diff --git a/.eslintrc.yml b/.eslintrc.yml deleted file mode 100644 index be7b1250d..000000000 --- a/.eslintrc.yml +++ /dev/null @@ -1,7 +0,0 @@ -env: - browser: true - es6: true - jquery: true -extends: google -rules: - require-jsdoc: off diff --git a/.gitignore b/.gitignore index be64af3ba..af512c5b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,13 @@ -*.rbc -capybara-*.html -.rspec /log /tmp -/db/*.sqlite3 /public/system -/public/assets /coverage/ -/spec/tmp -**.orig -config/initializers/secret_token.rb -config/deploy.rb -config/database.yml -config/application.yml -config/environments/development.rb -misc -/export -/import -/ca /.bundle /vendor/bundle +/config/database.yml +/config/application.yml +/config/environments/development.rb +/config/deploy.rb -# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: -.rvmrc +# Do not commit one. Instead, download the latest from https://github.com/internetee/style-guide. +.rubocop.yml diff --git a/.reek b/.reek deleted file mode 100644 index a511bdb43..000000000 --- a/.reek +++ /dev/null @@ -1,1136 +0,0 @@ -exclude_paths: - - db/migrate/ - - db/data/ -UncommunicativeModuleName: - exclude: - - Repp::AccountV1 - - Repp::ContactV1 - - Repp::DomainV1 -UncommunicativeVariableName: - exclude: - - Repp::DomainV1 - - Admin::AccountActivitiesController - - Admin::AdminUsersController - - Admin::ApiUsersController - - Admin::BankStatementsController - - Admin::Billing::PricesController - - Admin::BlockedDomainsController - - Admin::ContactVersionsController - - Admin::ContactVersionsController#index - - Admin::ContactsController - - Admin::DomainVersionsController - - Admin::DomainVersionsController#index - - Admin::DomainsController - - Admin::DomainsController#build_associations - - Admin::EppLogsController - - Admin::InvoicesController - - Admin::InvoicesController#create - - Admin::KeyrelaysController - - Admin::MailTemplatesController - - Admin::RegistrarsController - - Admin::ReppLogsController - - Admin::ReservedDomainsController - - Admin::SettingsController#casted_settings - - Admin::SettingsController#create - - Epp::DomainsController#renew - - Epp::DomainsController#update - - Epp::SessionsController#login - - EppController - - EppController#create_full_selectors - - EppController#optional - - EppController#xml_attrs_present? - - Registrant::DomainsController - - Registrar::AccountActivitiesController - - Registrar::ContactsController - - Registrar::ContactsController#download_list - - Registrar::ContactsController#index - - Registrar::DeppController#response_ok? - - Registrar::DomainsController - - Registrar::DomainsController#index - - Registrar::DomainsController#search_contacts - - Registrar::InvoicesController - - ContactMailer#email_updated - - Ability#billing - - Ability#epp - - AccountActivity#to_csv - - AccountActivity#types_for_select - - ApiUser#api_pki_ok? - - ApiUser#registrar_pki_ok? - - BankLink::Request#calc_mac - - BankLink::Response#validate_cancel - - BankLink::Response#validate_success - - BankStatement#import_th6_file - - BlockedDomain#generate_json - - Concerns::Domain::ForceDelete#cancel_force_delete - - EppErrors#add_epp_error - - EppErrors#collect_child_errors - - EppErrors#find_epp_code_and_value - - Versions::ClassMethods#all_versions_for - - Contact - - Contact#all_domains - - Contact#all_registrant_domains - - Contact#manage_emails - - Contact#search_by_query - - Contact#status_notes_array= - - Depp::Contact#construct_create_disclosure_xml - - Depp::Contact#extract_disclosure_hash - - Depp::Contact#extract_info_disclosure - - Depp::Contact#find_by_id - - Depp::Contact#handle_errors - - Depp::Contact#type_string - - Depp::Domain#construct_params_from_server_data - - Depp::Domain#create_contacts_hash - - Depp::Domain#create_dnskeys_hash - - Depp::Domain#create_nameservers_hash - - Depp::Domain#default_params - - Depp::User#initialize - - Depp::User#request - - Depp::User#validate_existance_in_server - - Directo#self.send_monthly_invoices - - DNS::Zone#self.generate_zonefile - - Dnskey#bin_to_hex - - Dnskey#generate_ds_key_tag - - Dnskey#int_to_hex - - Domain#admin_status_update - - Domain#delegated_nameservers - - Domain#name_in_wire_format - - Domain#parent_valid? - - Domain#status_notes_array= - - Domain#subordinate_nameservers - - DomainCron#self.destroy_delete_candidates - - DomainMailModel#admins - - Epp::Contact#attrs_from - - Epp::Contact#check_availability - - Epp::Domain#check_availability - - Epp::Domain#domain_contact_attrs_from - - Epp::Domain#domain_status_list_from - - Epp::Domain#domain_statuses_attrs - - Epp::Domain#nameservers_from - - Epp::Domain#parse_period_unit_from_frame - - Epp::Domain#validate_contacts - - Invoice#cancel_overdue_invoices - - Legacy::Db - - LegalDocument#save_to_filesystem - - RegistrantUser#find_or_create_by_idc_data - - RegistrantUser#find_or_create_by_mid_data - - Registrar - - Registrar#search_by_query - - ReservedDomain#generate_json - - WhoisRecord#generate_json - - UniquenessMultiValidator#validate_each - - Registry::Application - - ActiveRecord::Base - - Ransack::Adapters::ActiveRecord::Context#evaluate - - EppConstraint#matches? - - Iptable#counter_update -DuplicateMethodCall: - exclude: - - Admin::AccountActivitiesController#index - - Admin::AccountActivitiesController#set_default_dates - - Admin::AdminUsersController#update - - Admin::ApiUsersController#update - - Admin::BankStatementsController#download_import_file - - Admin::Billing::PricesController#index - - Admin::BlockedDomainsController#delete - - Admin::BlockedDomainsController#index - - Admin::CertificatesController#create - - Admin::CertificatesController#set_certificate - - Admin::ContactVersionsController#index - - Admin::ContactVersionsController#show - - Admin::ContactsController#index - - Admin::ContactsController#normalize_search_parameters - - Admin::DomainVersionsController#index - - Admin::DomainVersionsController#show - - Admin::DomainsController#build_associations - - Admin::DomainsController#index - - Admin::DomainsController#normalize_search_parameters - - Admin::EppLogsController#index - - Admin::EppLogsController#set_default_dates - - Admin::LegalDocumentsController#show - - Admin::PendingDeletesController#destroy - - Admin::PendingDeletesController#update - - Admin::PendingUpdatesController#destroy - - Admin::PendingUpdatesController#update - - Admin::ReppLogsController#index - - Admin::ReppLogsController#set_default_dates - - Admin::ReservedDomainsController#delete - - Admin::ReservedDomainsController#index - - Admin::SessionsController#create - - Admin::SettingsController#casted_settings - - Admin::ZonefilesController#create - - ApplicationController#comma_support_for - - Epp::ContactsController#validate_create - - Epp::DomainsController#create - - Epp::DomainsController#delete - - Epp::DomainsController#renew - - Epp::DomainsController#transfer - - Epp::DomainsController#update - - Epp::KeyrelaysController#keyrelay - - Epp::PollsController#ack_poll - - Epp::PollsController#poll - - Epp::PollsController#req_poll - - Epp::SessionsController#ip_white? - - Epp::SessionsController#login - - Epp::SessionsController#login_params - - EppController#current_user - - EppController#handle_errors - - EppController#iptables_counter_update - - EppController#latin_only - - EppController#optional - - EppController#update_epp_session - - EppController#write_to_epp_log - - Registrant::DomainDeleteConfirmsController#update - - Registrant::DomainUpdateConfirmsController#update - - Registrant::DomainsController#domain_verification_url - - Registrant::DomainsController#download_list - - Registrant::DomainsController#get_confirm_path - - Registrant::DomainsController#index - - Registrant::DomainsController#normalize_search_parameters - - Registrant::SessionsController#id - - Registrant::SessionsController#mid - - Registrant::SessionsController#mid_status - - Registrant::WhoisController#index - - Registrar::AccountActivitiesController#index - - Registrar::ContactsController#download_list - - Registrar::ContactsController#index - - Registrar::ContactsController#normalize_search_parameters - - Registrar::ContactsController#update - - Registrar::DomainsController#check - - Registrar::DomainsController#destroy - - Registrar::DomainsController#index - - Registrar::DomainsController#info - - Registrar::DomainsController#normalize_search_parameters - - Registrar::DomainsController#renew - - Registrar::DomainsController#search_contacts - - Registrar::DomainsController#update - - Registrar::InvoicesController#index - - Registrar::InvoicesController#normalize_search_parameters - - Registrar::PaymentsController#back - - Registrar::SessionsController#create - - Registrar::SessionsController#mid - - Registrar::SessionsController#mid_status - - ApplicationHelper#changing_css_class - - ApplicationHelper#creator_link - - ApplicationHelper#custom_sort_link - - ApplicationHelper#unstable_env - - ApplicationHelper#updator_link - - Registrant::ApplicationHelper#pagination_details - - Registrar::ApplicationHelper#pagination_details - - DomainDeleteConfirmJob#raise_errors! - - DomainDeleteConfirmJob#run - - DomainUpdateConfirmJob#raise_errors! - - DomainUpdateConfirmJob#run - - UpdateWhoisRecordJob#update_domain - - ApplicationMailer#whitelist_blocked? - - DomainExpireMailer#expired - - DomainMailer#compose_from - - DomainMailer#delete_confirmation - - DomainMailer#pending_delete_expired_notification - - DomainMailer#pending_delete_rejected_notification - - InvoiceMailer#invoice_email - - Ability#epp - - Ability#initialize - - BankLink::Request#fields - - BankLink::Response#initialize - - BankStatement#import_th6_file - - BankStatement#parse_th6_row - - BankStatement#status - - Billing::Price#self.effective - - Billing::Price#self.valid - - BusinessRegistryCache#fetch_by_ident_and_cc - - Certificate#parse_metadata - - Certificate#reload_apache - - Certificate#revoke! - - Certificate#status - - Certificate#update_id_crl - - Certificate#update_registry_crl - - EppErrors#add_epp_error - - UserEvents#cr_id - - Versions#user_from_id_role_username - - Versions::ClassMethods#all_versions_for - - Contact#all_domains - - Contact#all_registrant_domains - - Contact#destroy_orphans - - Contact#domain_names_with_roles - - Contact#generate_code - - Contact#related_domain_descriptions - - Contact#val_ident_valid_format? - - Deposit#validate_amount - - Depp::Contact#construct_check_hash_from_data - - Depp::Contact#construct_create_disclosure_xml - - Depp::Contact#extension_xml - - Depp::Contact#extract_info_disclosure - - Depp::Contact#find_by_id - - Depp::Contact#new_from_params - - Depp::Contact#update_attributes - - Depp::Domain#confirm_transfer - - Depp::Domain#construct_custom_params_hash - - Depp::Domain#construct_edit_hash - - Depp::Domain#construct_ext_edit_hash - - Depp::Domain#construct_params_from_server_data - - Depp::Domain#create - - Depp::Domain#create_contacts_hash - - Depp::Domain#create_dnskeys_hash - - Depp::Domain#create_key_data_hash - - Depp::Domain#create_nameservers_hash - - Depp::Domain#default_params - - Depp::Domain#renew - - Depp::Keyrelay#keyrelay - - Depp::User#validate_existance_in_server - - Directo#self.dump_result_to_db - - Directo#self.load_price - - Directo#self.send_monthly_invoices - - Directo#self.send_receipts - - DNS::Zone#self.generate_zonefile - - Dnskey#generate_digest - - Domain#manage_automatic_statuses - - Domain#parent_valid? - - Domain#pending_registrant - - Domain#renewable? - - Domain#set_graceful_expired - - DomainCron#self.clean_expired_pendings - - DomainCron#self.destroy_delete_candidates - - DomainCron#self.start_expire_period - - DomainCron#self.start_redemption_grace_period - - DomainMailModel#registrant_pending - - DomainMailModel#subject - - DomainMailModel#verification_token - - Epp::Contact#attrs_from - - Epp::Contact#legal_document_attrs - - Epp::Contact#status_list_from - - Epp::Contact#update_attributes - - Epp::Domain#apply_pending_update! - - Epp::Domain#attrs_from - - Epp::Domain#dnskeys_attrs - - Epp::Domain#domain_contact_attrs_from - - Epp::Domain#domain_status_list_from - - Epp::Domain#new_from_epp - - Epp::Domain#parse_legal_document_from_frame - - Epp::Domain#query_transfer - - Epp::Domain#renew - - Epp::Domain#update - - Epp::Domain#validate_contacts - - Epp::Domain#validate_exp_dates - - Invoice#cancel_overdue_invoices - - Invoice#set_invoice_number - - LegalDocument#save_to_filesystem - - LegalDocument#self.remove_duplicates - - Setting#self.params_errors - - Setting#self.reload_settings! - - Soap::Arireg#associated_businesses - - Soap::Arireg#body - - Soap::Arireg#debug - - Soap::Arireg#initialize - - WhoisRecord#generate_json - - DomainPresenter#delete_date - - DomainPresenter#force_delete_date - - DomainPresenter#on_hold_date - - DomainNameValidator#validate_each - - DomainNameValidator#validate_format - - DurationIso8601Validator#validate_each - - UniquenessMultiValidator#validate_each - - ActionView::Helpers::FormBuilder#label - - ActionDispatch::Flash#call - - Rack::Request#trusted_proxy? - - Ransack::Adapters::ActiveRecord::Context#evaluate - - DeviseCustomFailure#redirect_url - - EppConstraint#matches? - - PhoneValidator#validate_each -InstanceVariableAssumption: - exclude: - - Admin::AccountActivitiesController - - Admin::AdminUsersController - - Admin::ApiUsersController - - Admin::BankStatementsController - - Admin::BankTransactionsController - - Admin::Billing::PricesController - - Admin::BlockedDomainsController - - Admin::CertificatesController - - Admin::ContactVersionsController - - Admin::ContactsController - - Admin::DNS::ZonesController - - Admin::DomainVersionsController - - Admin::DomainsController - - Admin::EppLogsController - - Admin::InvoicesController - - Admin::KeyrelaysController - - Admin::LegalDocumentsController - - Admin::MailTemplatesController - - Admin::PendingDeletesController - - Admin::PendingUpdatesController - - Admin::RegistrarsController - - Admin::ReppLogsController - - Admin::ReservedDomainsController - - Admin::SessionsController - - Admin::SettingsController - - Admin::WhiteIpsController - - Admin::ZonefilesController - - Epp::ContactsController - - Epp::DomainsController - - Epp::KeyrelaysController - - Epp::PollsController - - Epp::SessionsController - - EppController - - Registrant::ContactsController - - Registrant::DomainDeleteConfirmsController - - Registrant::DomainUpdateConfirmsController - - Registrant::DomainsController - - Registrant::RegistrarsController - - Registrant::SessionsController - - Registrar::AccountActivitiesController - - Registrar::ContactsController - - Registrar::DepositsController - - Registrar::DeppController - - Registrar::DomainsController - - Registrar::InvoicesController - - Registrar::PaymentsController - - Registrar::PollsController - - Registrar::SessionsController - - DefaultFormBuilder - - ContactMailer - - DomainMailer - - InvoiceMailer - - ApiUser - - BankTransaction - - Certificate - - Contact - - Deposit - - Depp::Contact - - Domain - - DomainContact - - WhoisRecord - - ActiveModel::Errors - - ActionDispatch::Flash - - Ransack::Adapters::ActiveRecord::Context -IrresponsibleModule: - exclude: - - Admin::AccountActivitiesController - - Admin::AdminUsersController - - Admin::ApiUsersController - - Admin::BankStatementsController - - Admin::BankTransactionsController - - Admin::Billing::PricesController - - Admin::BlockedDomainsController - - Admin::CertificatesController - - Admin::ContactVersionsController - - Admin::ContactsController - - Admin::DashboardsController - - Admin::DelayedJobsController - - Admin::DNS::ZonesController - - Admin::DomainVersionsController - - Admin::DomainsController - - Admin::EppLogsController - - Admin::InvoicesController - - Admin::KeyrelaysController - - Admin::LegalDocumentsController - - Admin::MailTemplatesController - - Admin::PendingDeletesController - - Admin::PendingUpdatesController - - Admin::RegistrarsController - - Admin::ReppLogsController - - Admin::ReservedDomainsController - - Admin::SessionsController - - Admin::SettingsController - - Admin::WhiteIpsController - - Admin::ZonefilesController - - AdminController - - ApplicationController - - Epp::ContactsController - - Epp::DomainsController - - Epp::ErrorsController - - Epp::KeyrelaysController - - Epp::PollsController - - Epp::SessionsController - - EppController - - Registrant::ContactsController - - Registrant::DomainDeleteConfirmsController - - Registrant::DomainUpdateConfirmsController - - Registrant::DomainsController - - Registrant::RegistrarsController - - Registrant::SessionsController - - Registrant::WhoisController - - RegistrantController - - Registrar::AccountActivitiesController - - Registrar::BaseController - - Registrar::ContactsController - - Registrar::DashboardController - - Registrar::DepositsController - - Registrar::DeppController - - Registrar::DomainsController - - Registrar::InvoicesController - - Registrar::KeyrelaysController - - Registrar::PaymentsController - - Registrar::PollsController - - Registrar::SessionsController - - Registrar::XmlConsolesController - - ApplicationHelper - - DefaultFormBuilder - - FormHelper - - FormTagHelper - - Registrant::ApplicationHelper - - Registrar::ApplicationHelper - - DomainDeleteConfirmEmailJob - - DomainDeleteConfirmJob - - DomainDeleteJob - - DomainExpireEmailJob - - DomainUpdateConfirmJob - - RegenerateRegistrarWhoisesJob - - RegistrantChangeConfirmEmailJob - - RegistrantChangeExpiredEmailJob - - RegistrantChangeNoticeEmailJob - - UpdateWhoisRecordJob - - ApplicationMailer - - ContactMailer - - DomainDeleteMailer - - DomainExpireMailer - - DomainMailer - - InvoiceMailer - - RegistrantChangeMailer - - Ability - - Account - - AccountActivity - - AdminDomainContact - - AdminUser - - ApiLog::EppLog - - ApiLog::ReppLog - - ApiUser - - BankLink::Base - - BankLink::Request - - BankLink::Response - - BankStatement - - BankTransaction - - Billing::Price - - Billing - - BlockedDomain - - Certificate - - Concerns::Billing::Price::Expirable - - DisableHtml5Validation - - Concerns::Domain::Activatable - - Concerns::Domain::Deletable - - Concerns::Domain::Expirable - - Concerns::Domain::ForceDelete - - EppErrors - - UserEvents - - VersionSession - - Versions::ClassMethods - - Contact - - Counter - - Deposit - - Depp::Contact - - Depp::Domain - - Depp::Keyrelay - - Depp::User - - Directo - - DNS::Zone - - DNS - - Dnskey - - DomainContact - - DomainCron - - DomainMailModel - - DomainStatus - - DomainTransfer - - Epp::Contact - - Invoice - - InvoiceItem - - Keyrelay - - Legacy::Db - - Legacy::Object - - Legacy::ObjectHistory - - Legacy::ObjectState - - Legacy::Registrar - - LegalDocument - - Message - - Nameserver - - Registrant - - RegistrantUser - - Registrar - - ReservedDomain - - Setting - - Soap::Arireg - - Soap::Arireg::NotAvailableError - - TechDomainContact - - User - - WhiteIp - - WhoisRecord - - DomainPresenter - - RegistrantPresenter - - Registrar::DomainListCSVPresenter - - RegistrarPresenter - - RegistrantChange - - DateTimeIso8601Validator - - DomainNameValidator - - DomainNameserverValidator - - DurationIso8601Validator - - ObjectCountValidator - - UniquenessMultiValidator - - PaperSession - - Array - - ActionView::Helpers::FormBuilder - - ActiveModel::Errors - - ActionDispatch::Flash - - Rack::Request - - Ransack::Adapters::ActiveRecord::Context - - DeviseCustomFailure - - EppConstraint - - Builder::XmlMarkup - - VersionGenerator - - Iptable - - SortedCountry - - EmailValidator - - PhoneValidator - - FakeDeppContact - - Features::SessionHelpers - - CapybaraViewMacros - - Matchers::EPP::Code - - Requests::EPPHelpers - - Requests::SessionHelpers -NilCheck: - exclude: - - Admin::AccountActivitiesController#set_default_dates - - Admin::EppLogsController#set_default_dates - - Admin::ReppLogsController#set_default_dates - - ApplicationController#user_log_str - - EppController#requires - - ApplicationHelper#env_style - - Registrant::ApplicationHelper#env_style - - Registrar::ApplicationHelper#env_style - - UserEvents#cr_id - - Depp::Contact#handle_errors - - Directo#self.send_receipts - - DomainMailModel#format - - LegalDocument#val_body_length - - Soap::Arireg#body - - Soap::Arireg#country_code_3 - - Soap::Arireg#initialize - - ActionDispatch::Flash#call -TooManyStatements: - exclude: - - initialize - - Admin::AccountActivitiesController#index - - Admin::AdminUsersController#update - - Admin::BankTransactionsController#create - - Admin::Billing::PricesController#index - - Admin::CertificatesController#create - - Admin::ContactVersionsController#index - - Admin::ContactVersionsController#show - - Admin::ContactsController#index - - Admin::ContactsController#normalize_search_parameters - - Admin::DomainVersionsController#index - - Admin::DomainVersionsController#show - - Admin::DomainsController#index - - Admin::DomainsController#normalize_search_parameters - - Admin::DomainsController#update - - Admin::EppLogsController#index - - Admin::InvoicesController#create - - Admin::InvoicesController#forward - - Admin::RegistrarsController#create - - Admin::ReppLogsController#index - - Admin::SessionsController#create - - Admin::SettingsController#casted_settings - - Admin::SettingsController#create - - Admin::WhiteIpsController#create - - Epp::ContactsController#create - - Epp::ContactsController#update - - Epp::ContactsController#validate_create - - Epp::ContactsController#validate_update - - Epp::DomainsController#balance_ok? - - Epp::DomainsController#create - - Epp::DomainsController#delete - - Epp::DomainsController#info - - Epp::DomainsController#renew - - Epp::DomainsController#transfer - - Epp::DomainsController#update - - Epp::DomainsController#validate_create - - Epp::DomainsController#validate_transfer - - Epp::PollsController#req_poll - - Epp::SessionsController#login - - EppController#catch_epp_errors - - EppController#element_count - - EppController#handle_errors - - EppController#optional - - EppController#optional_attribute - - EppController#requires - - EppController#requires_attribute - - EppController#update_epp_session - - EppController#validate_request - - EppController#write_to_epp_log - - Registrant::DomainDeleteConfirmsController#update - - Registrant::DomainUpdateConfirmsController#update - - Registrant::DomainsController#domain_verification_url - - Registrant::DomainsController#domains - - Registrant::DomainsController#download_list - - Registrant::DomainsController#index - - Registrant::DomainsController#normalize_search_parameters - - Registrant::SessionsController#id - - Registrant::SessionsController#mid - - Registrant::SessionsController#mid_status - - Registrar::AccountActivitiesController#index - - Registrar::ContactsController#download_list - - Registrar::ContactsController#index - - Registrar::ContactsController#normalize_search_parameters - - Registrar::DepositsController#create - - Registrar::DomainsController#destroy - - Registrar::DomainsController#index - - Registrar::DomainsController#normalize_search_parameters - - Registrar::DomainsController#search_contacts - - Registrar::DomainsController#update - - Registrar::InvoicesController#forward - - Registrar::InvoicesController#index - - Registrar::InvoicesController#normalize_search_parameters - - Registrar::KeyrelaysController#create - - Registrar::PaymentsController#back - - Registrar::SessionsController#create - - Registrar::SessionsController#mid - - Registrar::SessionsController#mid_status - - ApplicationHelper#ident_for - - DomainDeleteConfirmJob#run - - DomainDeleteJob#run - - DomainUpdateConfirmJob#run - - UpdateWhoisRecordJob#run - - ApplicationMailer#whitelist_blocked? - - ContactMailer#email_updated - - DomainDeleteMailer#forced - - DomainExpireMailer#expired - - DomainMailer#compose_from - - DomainMailer#pending_delete_rejected_notification - - InvoiceMailer#invoice_email - - RegistrantChangeMailer#confirm - - RegistrantChangeMailer#notice - - Ability#admin - - Ability#epp - - AccountActivity#to_csv - - ApiUser#api_pki_ok? - - ApiUser#registrar_pki_ok? - - BankLink::Request#fields - - BankLink::Response#complete_payment - - BankStatement#import_th6_file - - BankTransaction#autobind_invoice - - BankTransaction#bind_invoice - - BusinessRegistryCache#fetch_by_ident_and_cc - - Certificate#parse_md_from_string - - Certificate#parse_metadata - - Certificate#revoke! - - Certificate#sign! - - Certificate#status - - Concerns::Domain::ForceDelete#cancel_force_delete - - Concerns::Domain::ForceDelete#schedule_force_delete - - EppErrors#add_epp_error - - EppErrors#collect_child_errors - - EppErrors#collect_parent_errors - - EppErrors#construct_epp_errors - - EppErrors#construct_msg_args_and_value - - EppErrors#find_epp_code_and_value - - UserEvents#cr_id - - Versions::ClassMethods#all_versions_for - - Contact#all_domains - - Contact#all_registrant_domains - - Contact#destroy_and_clean - - Contact#destroy_orphans - - Contact#domain_names_with_roles - - Contact#filter_by_states - - Contact#generate_code - - Contact#manage_emails - - Contact#related_domain_descriptions - - Contact#statuses - - Contact#validate_html - - Depp::Contact#construct_check_hash_from_data - - Depp::Contact#construct_create_disclosure_xml - - Depp::Contact#extension_xml - - Depp::Contact#extract_info_disclosure - - Depp::Contact#handle_errors - - Depp::Contact#save - - Depp::Contact#update_attributes - - Depp::Domain#construct_edit_hash - - Depp::Domain#construct_ext_edit_hash - - Depp::Domain#construct_params_from_server_data - - Depp::Domain#create - - Depp::Domain#create_dnskeys_hash - - Depp::Domain#create_nameservers_hash - - Depp::Domain#default_params - - Depp::Domain#transfer - - Depp::User#validate_existance_in_server - - Directo#self.send_monthly_invoices - - Directo#self.send_receipts - - DNS::Zone#self.generate_zonefile - - Dnskey#generate_digest - - Dnskey#generate_ds_key_tag - - Domain#children_log - - Domain#clean_pendings! - - Domain#clean_pendings_lowlevel - - Domain#manage_automatic_statuses - - Domain#name_in_wire_format - - Domain#pending_delete! - - Domain#pending_update! - - Domain#pricelist - - DomainCron#self.clean_expired_pendings - - DomainCron#self.destroy_delete_candidates - - DomainCron#self.start_expire_period - - DomainCron#self.start_redemption_grace_period - - DomainMailModel#domain_info - - Epp::Contact#add_legal_file_to_new - - Epp::Contact#attrs_from - - Epp::Contact#check_availability - - Epp::Contact#status_list_from - - Epp::Contact#statuses_attrs - - Epp::Contact#update_attributes - - Epp::Domain#add_legal_file_to_new - - Epp::Domain#apply_pending_delete! - - Epp::Domain#apply_pending_update! - - Epp::Domain#approve_transfer - - Epp::Domain#attrs_from - - Epp::Domain#check_availability - - Epp::Domain#destroy_attrs - - Epp::Domain#dnskeys_attrs - - Epp::Domain#domain_contact_attrs_from - - Epp::Domain#domain_status_list_from - - Epp::Domain#domain_statuses_attrs - - Epp::Domain#epp_destroy - - Epp::Domain#keyrelay - - Epp::Domain#manage_permissions - - Epp::Domain#nameservers_attrs - - Epp::Domain#nameservers_from - - Epp::Domain#new_from_epp - - Epp::Domain#query_transfer - - Epp::Domain#reject_transfer - - Epp::Domain#renew - - Epp::Domain#transfer - - Epp::Domain#update - - Epp::Domain#validate_contacts - - Invoice#cancel - - Invoice#cancel_overdue_invoices - - Invoice#set_invoice_number - - LegalDocument#save_to_filesystem - - LegalDocument#self.remove_duplicates - - RegistrantUser#find_or_create_by_idc_data - - Registrar#generate_iso_11649_reference_no - - Soap::Arireg#associated_businesses - - WhoisRecord#generate_json - - Registrar::DomainListCSVPresenter#domain_to_row - - DomainNameValidator#validate_format - - DomainNameserverValidator#validate_each - - DurationIso8601Validator#validate - - UniquenessMultiValidator#validate_each - - ActionDispatch::Flash#call - - Ransack::Adapters::ActiveRecord::Context#evaluate - - EppConstraint#matches? - - Iptable#counter_update - - fill_form -TooManyInstanceVariables: - exclude: - - Admin::BankStatementsController - - Admin::DomainsController - - Admin::MailTemplatesController - - Epp::ContactsController - - Epp::DomainsController - - EppController - - Registrar::DomainsController - - DomainDeleteMailer - - RegistrantChangeMailer -UtilityFunction: - exclude: - - Admin::Billing::PricesController#durations - - Admin::Billing::PricesController#operation_categories - - Admin::Billing::PricesController#statuses - - Admin::Billing::PricesController#zones - - ApplicationController#user_log_str - - Epp::ContactsController#address_processing? - - EppController#has_attribute - - Registrant::DomainsController#get_confirm_path - - Registrant::SessionsController#find_user_by_idc - - Registrar::ContactsController#address_processing? - - Registrar::PaymentsController#banks - - Registrar::SessionsController#find_user_by_idc - - ApplicationHelper#changing_css_class - - ApplicationHelper#ident_for - - ApplicationHelper#legal_document_types - - ApplicationHelper#plain_username - - ApplicationHelper#unstable_env - - DomainDeleteConfirmEmailJob#logger - - DomainExpireEmailJob#run - - RegenerateRegistrarWhoisesJob#run - - RegistrantChangeConfirmEmailJob#logger - - RegistrantChangeExpiredEmailJob#logger - - RegistrantChangeNoticeEmailJob#logger - - UpdateWhoisRecordJob#delete_domain - - UpdateWhoisRecordJob#delete_reserved - - UpdateWhoisRecordJob#update_domain - - UpdateWhoisRecordJob#update_reserved - - ApplicationMailer#format - - ContactMailer#address_processing - - RegistrantChangeMailer#address_processing - - EppErrors#construct_msg_args_and_value - - Versions#user_from_id_role_username - - Depp::Keyrelay#expiry - - Epp::Domain#nameservers_from - - Epp::Domain::DnsSecKeys#mark - - Epp::Domain::DnsSecKeys#xm_copy - - Invoice#pdf - - Soap::Arireg#extract - - Soap::Arireg#items - - Registrar::DomainListCSVPresenter#domain_to_row - - Rack::Request#trusted_proxy? - - PhoneValidator#zeros_only? - - Requests::EPPHelpers#have_code_of - - Requests::EPPHelpers#valid_legal_document -FeatureEnvy: - exclude: - - Admin::SettingsController#casted_settings - - ApplicationHelper#creator_link - - ApplicationHelper#updator_link - - FormHelper#legal_document_field - - FormHelper#money_field - - FormTagHelper#legal_document_field_tag - - DomainDeleteConfirmEmailJob#log - - DomainDeleteConfirmEmailJob#run - - DomainDeleteConfirmJob#raise_errors! - - DomainDeleteConfirmJob#run - - DomainDeleteJob#run - - DomainUpdateConfirmJob#raise_errors! - - DomainUpdateConfirmJob#run - - RegistrantChangeConfirmEmailJob#log - - RegistrantChangeConfirmEmailJob#run - - RegistrantChangeExpiredEmailJob#log - - RegistrantChangeExpiredEmailJob#run - - RegistrantChangeNoticeEmailJob#log - - RegistrantChangeNoticeEmailJob#run - - ApplicationMailer#whitelist_blocked? - - DomainExpireMailer#filter_invalid_emails - - AccountActivity#to_csv - - ApiUser#api_pki_ok? - - ApiUser#find_by_idc_data - - ApiUser#registrar_pki_ok? - - BankLink::Base#prepend_size - - BankLink::Request#fields - - BankStatement#parse_th6_row - - BusinessRegistryCache#fetch_by_ident_and_cc - - EppErrors#collect_parent_errors - - Contact#all_domains - - Contact#all_registrant_domains - - Contact#destroy_orphans - - Contact#domain_names_with_roles - - Contact#filter_by_states - - Contact#search_by_query - - Contact#statuses - - Depp::Contact#construct_check_hash_from_data - - Depp::Contact#find_by_id - - Depp::Contact#handle_errors - - Depp::Contact#new_from_params - - Depp::Domain#construct_params_from_server_data - - Depp::Domain#create - - Depp::Domain#create_dnskeys_hash - - Depp::Domain#renew - - Depp::Domain#transfer - - Depp::Keyrelay#keyrelay - - DomainMailModel#format - - Epp::Contact#attach_legal_document - - Epp::Contact#attrs_from - - Epp::Contact#check_availability - - Epp::Contact#ident_attrs - - Epp::Contact#status_list_from - - Epp::Domain#attach_legal_document - - Epp::Domain#attrs_from - - Epp::Domain#destroy_attrs - - Epp::Domain#domain_contact_attrs_from - - Epp::Domain#domain_status_list_from - - LegalDocument#calc_checksum - - Nameserver#find_by_hash_params - - RegistrantUser#find_or_create_by_idc_data - - RegistrantUser#find_or_create_by_mid_data - - Registrar#debit! - - Registrar#search_by_query - - ReservedDomain#new_password_for - - Soap::Arireg#country_code_3 - - WhoisRecord#generate_json - - RegistrantPresenter#domain_names_with_roles - - ActionDispatch::Flash#call - - Ransack::Adapters::ActiveRecord::Context#evaluate - - EppConstraint#matches? -TooManyMethods: - exclude: - - Epp::ContactsController - - Epp::DomainsController - - EppController - - Contact - - Depp::Contact - - Depp::Domain - - Domain - - DomainMailModel - - Epp::Domain - - Invoice - - Registrar -RepeatedConditional: - exclude: - - Epp::DomainsController - - EppController - - Registrar::DomainsController - - DomainMailer - - BankTransaction - - Certificate - - Contact - - Depp::Contact - - Domain - - DomainCron - - Epp::Domain - - Invoice - - RegistrantVerification -ManualDispatch: - exclude: - - EppController#has_attribute - - EppController#validate_request - - ActionView::Helpers::FormBuilder#label - - ActionDispatch::Flash#call - - Ransack::Adapters::ActiveRecord::Context#evaluate -NestedIterators: - exclude: - - Registrar::DomainsController#index - - AccountActivity#to_csv - - EppErrors#collect_child_errors - - EppErrors#find_epp_code_and_value - - Versions::ClassMethods#all_versions_for - - Contact#destroy_orphans - - Contact#to_csv - - Depp::Contact#extract_info_disclosure - - Depp::Domain#create_nameservers_hash - - Directo#self.send_monthly_invoices - - Directo#self.send_receipts - - Domain#name_in_wire_format - - Domain#self.to_csv - - Epp::Domain#nameservers_from - - LegalDocument#self.remove_duplicates - - RegistrantPresenter#domain_names_with_roles - - UniquenessMultiValidator#validate_each -UnusedParameters: - exclude: - - Registrar::PollsController#show#@data.css -PrimaDonnaMethod: - exclude: - - DomainDeleteConfirmJob - - DomainUpdateConfirmJob - - Certificate - - Contact - - Domain - - Epp::Domain - - RegistrantVerification - - Registrar -BooleanParameter: - exclude: - - ApplicationMailer#delivery_off? - - Directo#self.send_monthly_invoices - - Epp::Contact#attrs_from - - Epp::Domain#update -ControlParameter: - exclude: - - ApplicationMailer#delivery_off? - - Ability#initialize - - EppErrors#find_epp_code_and_value - - Depp::Contact#extension_xml - - Directo#self.send_monthly_invoices - - Domain#registrant_delete_confirmable? - - Domain#registrant_update_confirmable? - - Epp::Contact#attrs_from - - Epp::Contact#statuses_attrs - - Epp::Domain#authenticate - - Epp::Domain#dnskeys_attrs - - Epp::Domain#domain_contact_attrs_from - - Epp::Domain#domain_statuses_attrs - - Epp::Domain#nameservers_attrs - - Epp::Domain#transfer - - Epp::Domain#update - - Legacy::Object#self.instance_method_already_implemented? - - Legacy::ObjectHistory#self.instance_method_already_implemented? - - RegistrantUser#find_or_create_by_idc_data -LongParameterList: - exclude: - - ContactMailer#email_updated - - DomainDeleteMailer#forced - - RegistrantChangeMailer#confirm - - RegistrantChangeMailer#notice - - EppErrors#add_epp_error - - Contact#all_registrant_domains -DataClump: - exclude: - - DomainMailer - - Epp::Domain -Attribute: - exclude: - - ApiUser#registrar_typeahead - - BankLink::Request#controller - - BankLink::Request#invoice - - BankLink::Request#type - - BankLink::Response#invoice - - BankLink::Response#params - - BankLink::Response#type - - BankStatement#th6_file - - Versions#version_loader - - Contact#deliver_emails - - Contact#legal_document_id - - Counter#value - - Deposit#amount - - Deposit#description - - Deposit#registrar - - Deposit#registrar_id - - Depp::Contact#city - - Depp::Contact#code - - Depp::Contact#country_code - - Depp::Contact#email - - Depp::Contact#id - - Depp::Contact#ident - - Depp::Contact#ident_country_code - - Depp::Contact#ident_type - - Depp::Contact#legal_document - - Depp::Contact#name - - Depp::Contact#org_name - - Depp::Contact#password - - Depp::Contact#phone - - Depp::Contact#state - - Depp::Contact#statuses - - Depp::Contact#street - - Depp::Contact#zip - - Depp::Domain#current_user - - Depp::Domain#epp_xml - - Depp::Domain#name - - Depp::Keyrelay#current_user - - Depp::Keyrelay#epp_xml - - Depp::User#password - - Depp::User#pki - - Depp::User#tag - - Domain#deliver_emails - - Domain#epp_pending_delete - - Domain#epp_pending_update - - Domain#is_admin - - Domain#legal_document_id - - Domain#registrant_typeahead - - Domain#reserved_pw - - Domain#roles - - Domain#update_me - - DomainContact#value_typeahead - - Epp::Domain#is_renewal - - Epp::Domain#is_transfer - - Invoice#billing_email - - LegalDocument#body - - RegistrantUser#idc_data - - Soap::Arireg#host - - Soap::Arireg#password - - Soap::Arireg#username - - Soap::Arireg#wsdl - - Soap::Arireg::NotAvailableError#json - - User#phone - - PaperSession#session -TooManyConstants: - exclude: - - Certificate - - Contact - - DomainStatus - - DomainTransfer -UncommunicativeParameterName: - exclude: - - Counter#next - - Counter#prev - - Depp::Domain#array_difference - - Dnskey#bin_to_hex - - Dnskey#hex_to_bin - - Dnskey#int_to_hex -UncommunicativeMethodName: - exclude: - - Soap::Arireg#country_code_3 - - WhiteIp#validate_ipv4_and_ipv6 diff --git a/.rubocop.yml b/.rubocop.yml deleted file mode 100644 index 497e45bbe..000000000 --- a/.rubocop.yml +++ /dev/null @@ -1,7 +0,0 @@ -inherit_from: .rubocop_todo.yml - -Style/Alias: - EnforcedStyle: prefer_alias_method - -Style/FrozenStringLiteralComment: - Enabled: false diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml deleted file mode 100644 index 7acf2bd1b..000000000 --- a/.rubocop_todo.yml +++ /dev/null @@ -1,1282 +0,0 @@ -# This configuration was generated by -# `rubocop --auto-gen-config` -# on 2017-08-23 18:09:30 +0300 using RuboCop version 0.49.1. -# The point is for the user to remove these configuration records -# one by one as the offenses are removed from the code base. -# Note that changes in the inspected code, or installation of new -# versions of RuboCop, may require this file to be generated again. - -# Offense count: 16 -# Cop supports --auto-correct. -# Configuration parameters: Include, TreatCommentsAsGroupSeparators. -# Include: **/Gemfile, **/gems.rb -Bundler/OrderedGems: - Exclude: - - 'Gemfile' - -Lint/UnneededDisable: - Enabled: false -Style/ConditionalAssignment: - Enabled: false - -# Offense count: 11 -# Cop supports --auto-correct. -Layout/AlignArray: - Exclude: - - 'app/models/bank_link.rb' - - 'db/migrate/20150110113257_add_json_based_versions.rb' - - 'db/migrate/20150129144652_add_creator_and_updater.rb' - - 'db/migrate/20150130191056_add_session_id_to_log.rb' - -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedHashRocketStyle, SupportedHashRocketStyles, EnforcedColonStyle, SupportedColonStyles, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles. -# SupportedHashRocketStyles: key, separator, table -# SupportedColonStyles: key, separator, table -# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit -Layout/AlignHash: - Exclude: - - 'app/models/soap/arireg.rb' - -# Offense count: 16 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth. -# SupportedStyles: with_first_parameter, with_fixed_indentation -Layout/AlignParameters: - Exclude: - - 'Gemfile' - - 'app/controllers/admin/admin_users_controller.rb' - - 'app/mailers/domain_mailer.rb' - - 'app/models/contact.rb' - - 'app/models/depp/contact.rb' - - 'app/models/depp/domain.rb' - - 'app/models/domain.rb' - - 'app/models/registrar.rb' - - 'spec/models/domain_spec.rb' - -# Offense count: 3 -# Cop supports --auto-correct. -Layout/BlockEndNewline: - Exclude: - - 'app/models/invoice.rb' - - 'spec/requests/epp/contact/info_spec.rb' - -# Offense count: 34 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, IndentOneStep, IndentationWidth. -# SupportedStyles: case, end -Layout/CaseIndentation: - Exclude: - - 'app/controllers/admin/contact_versions_controller.rb' - - 'app/controllers/admin/domain_versions_controller.rb' - - 'app/controllers/registrar/sessions_controller.rb' - - 'app/jobs/update_whois_record_job.rb' - - 'app/models/ability.rb' - - 'app/models/bank_link.rb' - - 'app/models/contact.rb' - - 'app/models/domain.rb' - - 'app/models/legal_document.rb' - - 'lib/tasks/db.rake' - - 'lib/tasks/documents.rake' - -# Offense count: 1 -# Cop supports --auto-correct. -Layout/ClosingParenthesisIndentation: - Exclude: - - 'app/presenters/domain_presenter.rb' - -# Offense count: 48 -# Cop supports --auto-correct. -Layout/CommentIndentation: - Enabled: false - -# Offense count: 8 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: leading, trailing -Layout/DotPosition: - Exclude: - - 'app/models/concerns/versions.rb' - - 'app/models/legal_document.rb' - -# Offense count: 2 -# Cop supports --auto-correct. -Layout/ElseAlignment: - Exclude: - - 'app/controllers/admin/domain_versions_controller.rb' - - 'app/helpers/application_helper.rb' - -# Offense count: 3 -# Cop supports --auto-correct. -Layout/EmptyLineAfterMagicComment: - Exclude: - - 'app/models/soap/arireg.rb' - - 'db/api_log_schema.rb' - - 'db/whois_schema.rb' - -# Offense count: 26 -# Cop supports --auto-correct. -# Configuration parameters: AllowAdjacentOneLineDefs, NumberOfEmptyLines. -Layout/EmptyLineBetweenDefs: - Enabled: false - -# Offense count: 64 -# Cop supports --auto-correct. -Layout/EmptyLines: - Enabled: false - -# Offense count: 3 -# Cop supports --auto-correct. -Layout/EmptyLinesAroundAccessModifier: - Exclude: - - 'app/controllers/epp/sessions_controller.rb' - - 'app/mailers/domain_mailer.rb' - - 'app/models/bank_link.rb' - -# Offense count: 31 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: empty_lines, no_empty_lines -Layout/EmptyLinesAroundBlockBody: - Enabled: false - -# Offense count: 20 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines -Layout/EmptyLinesAroundClassBody: - Enabled: false - -# Offense count: 1 -# Cop supports --auto-correct. -Layout/EmptyLinesAroundExceptionHandlingKeywords: - Exclude: - - 'app/models/depp/user.rb' - -# Offense count: 32 -# Cop supports --auto-correct. -Layout/EmptyLinesAroundMethodBody: - Enabled: false - -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines -Layout/EmptyLinesAroundModuleBody: - Exclude: - - 'app/models/concerns/user_events.rb' - - 'app/models/soap/arireg.rb' - -# Offense count: 39 -# Cop supports --auto-correct. -# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment. -Layout/ExtraSpacing: - Enabled: false - -# Offense count: 16 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth. -# SupportedStyles: consistent, special_for_inner_method_call, special_for_inner_method_call_in_parentheses -Layout/FirstParameterIndentation: - Exclude: - - 'app/jobs/domain_delete_job.rb' - - 'app/models/bank_link.rb' - - 'app/models/contact.rb' - - 'app/models/depp/domain.rb' - - 'app/models/directo.rb' - - 'app/models/domain_cron.rb' - - 'app/models/epp/contact.rb' - - 'app/models/epp/domain.rb' - - 'lib/tasks/bootstrap.rake' - - 'lib/tasks/import.rake' - - 'spec/jobs/domain_delete_confirm_email_job_spec.rb' - - 'spec/jobs/domain_delete_forced_email_job_spec.rb' - - 'spec/jobs/domain_expire_email_job_spec.rb' - - 'spec/jobs/registrant_change_confirm_email_job_spec.rb' - -# Offense count: 56 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth. -# SupportedStyles: special_inside_parentheses, consistent, align_brackets -Layout/IndentArray: - Enabled: false - -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: IndentationWidth. -Layout/IndentAssignment: - Exclude: - - 'app/models/epp/domain.rb' - -# Offense count: 81 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth. -# SupportedStyles: special_inside_parentheses, consistent, align_braces -Layout/IndentHash: - Enabled: false - -# Offense count: 17 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: normal, rails -Layout/IndentationConsistency: - Exclude: - - 'app/models/bank_link.rb' - - 'lib/tasks/convert.rake' - -# Offense count: 18 -# Cop supports --auto-correct. -# Configuration parameters: Width, IgnoredPatterns. -Layout/IndentationWidth: - Exclude: - - 'app/controllers/admin/domain_versions_controller.rb' - - 'app/controllers/registrant/domains_controller.rb' - - 'app/helpers/application_helper.rb' - - 'app/models/ability.rb' - - 'app/models/contact.rb' - - 'app/models/domain.rb' - - 'app/models/legal_document.rb' - - 'app/views/epp/contacts/info.xml.builder' - - 'app/views/epp/contacts/save.xml.builder' - - 'db/migrate/20161004101419_adduuid_index_to_epp_logs.rb' - - 'lib/tasks/convert.rake' - -# Offense count: 12 -# Cop supports --auto-correct. -Layout/LeadingCommentSpace: - Exclude: - - 'app/models/directo.rb' - - 'app/models/domain_cron.rb' - - 'app/models/domain_status.rb' - - 'app/models/epp/domain.rb' - - 'app/models/registrant_user.rb' - - 'app/views/epp/domains/info.xml.builder' - - 'app/views/epp/sessions/greeting.xml.builder' - - 'db/migrate/20150407145943_add_invoice_columns.rb' - - 'db/migrate/20150413080832_create_bank_transactions.rb' - -# Offense count: 8 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: symmetrical, new_line, same_line -Layout/MultilineArrayBraceLayout: - Exclude: - - 'app/models/domain_mail_model.rb' - - 'app/models/epp/domain.rb' - - 'db/migrate/20150110113257_add_json_based_versions.rb' - - 'db/migrate/20150129144652_add_creator_and_updater.rb' - - 'db/migrate/20150130191056_add_session_id_to_log.rb' - -# Offense count: 80 -# Cop supports --auto-correct. -Layout/MultilineBlockLayout: - Enabled: false - -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: symmetrical, new_line, same_line -Layout/MultilineHashBraceLayout: - Exclude: - - 'app/models/depp/domain.rb' - - 'app/models/epp/domain.rb' - -# Offense count: 5 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: symmetrical, new_line, same_line -Layout/MultilineMethodCallBraceLayout: - Exclude: - - 'app/presenters/domain_presenter.rb' - - 'spec/jobs/domain_delete_confirm_email_job_spec.rb' - - 'spec/jobs/domain_delete_forced_email_job_spec.rb' - - 'spec/jobs/domain_expire_email_job_spec.rb' - - 'spec/jobs/registrant_change_confirm_email_job_spec.rb' - -# Offense count: 28 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth. -# SupportedStyles: aligned, indented, indented_relative_to_receiver -Layout/MultilineMethodCallIndentation: - Enabled: false - -# Offense count: 7 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth. -# SupportedStyles: aligned, indented -Layout/MultilineOperationIndentation: - Exclude: - - 'app/controllers/epp_controller.rb' - - 'app/controllers/registrant/domains_controller.rb' - - 'app/models/directo.rb' - - 'lib/tasks/convert.rake' - - 'lib/tasks/documents.rake' - -# Offense count: 4 -# Cop supports --auto-correct. -Layout/RescueEnsureAlignment: - Exclude: - - 'app/models/certificate.rb' - - 'app/models/depp/keyrelay.rb' - - 'app/models/depp/user.rb' - -# Offense count: 10 -# Cop supports --auto-correct. -Layout/SpaceAfterComma: - Exclude: - - 'app/api/repp/domain_v1.rb' - - 'app/controllers/epp_controller.rb' - - 'app/models/directo.rb' - - 'app/models/dnskey.rb' - - 'app/models/domain_mail_model.rb' - - 'app/views/epp/contacts/_disclosure_policy.xml.builder' - - 'app/views/epp/error.xml.builder' - -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyleInsidePipes, SupportedStylesInsidePipes. -# SupportedStylesInsidePipes: space, no_space -Layout/SpaceAroundBlockParameters: - Exclude: - - 'lib/tasks/convert.rake' - -# Offense count: 300 -# Cop supports --auto-correct. -# Configuration parameters: AllowForAlignment. -Layout/SpaceAroundOperators: - Enabled: false - -# Offense count: 36 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: space, no_space -Layout/SpaceBeforeBlockBraces: - Exclude: - - 'app/api/repp/domain_v1.rb' - - 'app/models/bank_link.rb' - - 'app/models/contact.rb' - - 'app/models/directo.rb' - - 'app/models/invoice.rb' - - 'app/models/legal_document.rb' - - 'app/models/soap/arireg.rb' - - 'app/models/whois_record.rb' - - 'app/views/epp/domains/info.xml.builder' - - 'config/routes.rb' - - 'lib/tasks/convert.rake' - - 'lib/tasks/import.rake' - -# Offense count: 1 -# Cop supports --auto-correct. -Layout/SpaceBeforeComment: - Exclude: - - 'app/models/contact.rb' - -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: AllowForAlignment. -Layout/SpaceBeforeFirstArg: - Exclude: - - 'db/migrate/20150422092514_add_whois_body_to_registry.rb' - -# Offense count: 48 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters. -# SupportedStyles: space, no_space -# SupportedStylesForEmptyBraces: space, no_space -Layout/SpaceInsideBlockBraces: - Exclude: - - 'app/api/repp/domain_v1.rb' - - 'app/models/bank_link.rb' - - 'app/models/contact.rb' - - 'app/models/dnskey.rb' - - 'app/models/invoice.rb' - - 'app/models/legal_document.rb' - - 'app/models/soap/arireg.rb' - - 'app/models/whois_record.rb' - - 'app/views/epp/domains/info.xml.builder' - - 'config/routes.rb' - - 'lib/epp_constraint.rb' - - 'lib/tasks/convert.rake' - - 'lib/tasks/import.rake' - -# Offense count: 3 -# Cop supports --auto-correct. -Layout/SpaceInsideBrackets: - Exclude: - - 'db/migrate/20140926121409_domain_related_archives.rb' - - 'db/migrate/20141015135255_create_settings.rb' - -# Offense count: 64 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces. -# SupportedStyles: space, no_space, compact -# SupportedStylesForEmptyBraces: space, no_space -Layout/SpaceInsideHashLiteralBraces: - Exclude: - - 'app/controllers/admin/domains_controller.rb' - - 'app/helpers/application_helper.rb' - - 'app/models/contact.rb' - - 'app/models/depp/domain.rb' - - 'app/models/directo.rb' - - 'app/models/domain_mail_model.rb' - - 'app/models/epp/contact.rb' - - 'app/models/epp/domain.rb' - - 'app/models/nameserver.rb' - - 'app/models/soap/arireg.rb' - - 'config/routes.rb' - - 'lib/tasks/import.rake' - -# Offense count: 3 -# Cop supports --auto-correct. -Layout/SpaceInsideParens: - Exclude: - - 'db/migrate/20160414110443_add_time_indexing_to_epp_log.rb' - - 'db/migrate/20161004101419_adduuid_index_to_epp_logs.rb' - -# Offense count: 8 -# Cop supports --auto-correct. -Layout/SpaceInsidePercentLiteralDelimiters: - Exclude: - - 'app/models/depp/contact.rb' - - 'config/initializers/assets.rb' - - 'lib/daemons/que.rb' - -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: space, no_space -Layout/SpaceInsideStringInterpolation: - Exclude: - - 'app/models/soap/arireg.rb' - -# Offense count: 22 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: final_newline, final_blank_line -Layout/TrailingBlankLines: - Enabled: false - -# Offense count: 41 -# Cop supports --auto-correct. -Layout/TrailingWhitespace: - Enabled: false - -# Offense count: 18 -Lint/AmbiguousBlockAssociation: - Exclude: - - 'spec/models/dns/zone_spec.rb' - - 'spec/requests/epp/contact/delete/used_spec.rb' - - 'spec/requests/epp/domain/create/account_balance_spec.rb' - - 'spec/requests/epp/domain/create/optional_nameserver_spec.rb' - - 'spec/requests/epp/domain/create/price_spec.rb' - - 'spec/requests/epp/domain/create/required_nameserver_spec.rb' - - 'spec/requests/epp/domain/renew/expire_time_spec.rb' - - 'spec/requests/epp/domain/renew/price_spec.rb' - - 'spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb' - - 'spec/requests/epp/domain/update/registrant_change/verified_spec.rb' - -# Offense count: 6 -# Configuration parameters: AllowSafeAssignment. -Lint/AssignmentInCondition: - Exclude: - - 'app/models/epp/contact.rb' - - 'app/models/epp/domain.rb' - - 'bin/spring' - - 'lib/tasks/convert.rake' - -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith. -# SupportedStylesAlignWith: either, start_of_block, start_of_line -Lint/BlockAlignment: - Exclude: - - 'lib/tasks/convert.rake' - -# Offense count: 3 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect. -# SupportedStylesAlignWith: start_of_line, def -Lint/DefEndAlignment: - Exclude: - - 'app/models/epp/domain.rb' - - 'db/migrate/20161004101419_adduuid_index_to_epp_logs.rb' - -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect. -# SupportedStylesAlignWith: keyword, variable, start_of_line -Lint/EndAlignment: - Exclude: - - 'app/jobs/update_whois_record_job.rb' - - 'app/models/contact.rb' - -# Offense count: 1 -Lint/HandleExceptions: - Exclude: - - 'bin/rspec' - -# Offense count: 1 -Lint/ImplicitStringConcatenation: - Exclude: - - 'spec/models/contact_spec.rb' - -# Offense count: 1 -Lint/NestedMethodDefinition: - Exclude: - - 'app/controllers/registrar/polls_controller.rb' - -# Offense count: 2 -Lint/NonLocalExitFromIterator: - Exclude: - - 'app/mailers/domain_mailer.rb' - - 'app/models/contact.rb' - -# Offense count: 2 -Lint/RandOne: - Exclude: - - 'lib/tasks/dev.rake' - -# Offense count: 1 -Lint/ShadowedException: - Exclude: - - 'app/mailers/contact_mailer.rb' - -# Offense count: 5 -# Cop supports --auto-correct. -Lint/StringConversionInInterpolation: - Exclude: - - 'app/controllers/admin/domain_versions_controller.rb' - - 'app/controllers/registrant/contacts_controller.rb' - - 'app/controllers/registrant/domains_controller.rb' - - 'app/models/domain_mail_model.rb' - -# Offense count: 3 -# Cop supports --auto-correct. -# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments. -Lint/UnusedBlockArgument: - Exclude: - - 'app/models/depp/domain.rb' - - 'lib/tasks/dev.rake' - -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods. -Lint/UnusedMethodArgument: - Exclude: - - 'app/controllers/registrar/polls_controller.rb' - -# Offense count: 6 -Lint/UselessAssignment: - Exclude: - - 'app/controllers/epp/domains_controller.rb' - - 'lib/tasks/import.rake' - - 'spec/jobs/domain_update_confirm_job_spec.rb' - - 'spec/models/legal_document_spec.rb' - -# Offense count: 104 -Lint/Void: - Enabled: false - -# Offense count: 155 -Metrics/AbcSize: - Max: 155 - -# Offense count: 215 -# Configuration parameters: CountComments, ExcludedMethods. -Metrics/BlockLength: - Max: 618 - -# Offense count: 3 -# Configuration parameters: CountBlocks. -Metrics/BlockNesting: - Max: 4 - -# Offense count: 32 -# Configuration parameters: CountComments. -Metrics/ClassLength: - Max: 5794 - -# Offense count: 22 -Metrics/CyclomaticComplexity: - Max: 23 - -# Offense count: 1337 -# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. -# URISchemes: http, https -Metrics/LineLength: - Max: 7122 - -# Offense count: 179 -# Configuration parameters: CountComments. -Metrics/MethodLength: - Max: 5789 - -# Offense count: 1 -# Configuration parameters: CountKeywordArgs. -Metrics/ParameterLists: - Max: 6 - -# Offense count: 18 -Metrics/PerceivedComplexity: - Max: 25 - -# Offense count: 2 -# Cop supports --auto-correct. -Performance/Casecmp: - Exclude: - - 'app/models/epp/domain.rb' - -# Offense count: 7 -# Cop supports --auto-correct. -Performance/RedundantMatch: - Exclude: - - 'app/controllers/epp_controller.rb' - - 'app/models/certificate.rb' - - 'lib/devise_custom_failure.rb' - -# Offense count: 6 -# Cop supports --auto-correct. -# Configuration parameters: MaxKeyValuePairs. -Performance/RedundantMerge: - Exclude: - - 'app/models/epp/contact.rb' - -# Offense count: 2 -# Cop supports --auto-correct. -Performance/Sample: - Exclude: - - 'lib/tasks/import.rake' - -# Offense count: 5 -# Cop supports --auto-correct. -Performance/StringReplacement: - Exclude: - - 'app/controllers/registrar/invoices_controller.rb' - - 'app/models/directo.rb' - - 'app/models/dnskey.rb' - -# Offense count: 4 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: prefer_alias, prefer_alias_method -Style/Alias: - Exclude: - - 'app/models/blocked_domain.rb' - - 'app/models/reserved_domain.rb' - - 'config/initializers/autolabel.rb' - - 'config/initializers/relaxed_i18n.rb' - -# Offense count: 32 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: always, conditionals -Style/AndOr: - Exclude: - - 'app/controllers/admin/domains_controller.rb' - - 'app/controllers/epp/domains_controller.rb' - - 'app/controllers/epp/keyrelays_controller.rb' - - 'app/controllers/epp/polls_controller.rb' - - 'app/controllers/epp/sessions_controller.rb' - - 'app/controllers/epp_controller.rb' - - 'app/controllers/registrar/base_controller.rb' - - 'app/controllers/registrar/dashboard_controller.rb' - - 'app/controllers/registrar/depp_controller.rb' - - 'app/controllers/registrar/domains_controller.rb' - - 'app/controllers/registrar/sessions_controller.rb' - - 'app/models/business_registry_cache.rb' - - 'app/models/domain_cron.rb' - - 'app/models/domain_mail_model.rb' - - 'app/models/epp/domain.rb' - -# Offense count: 2 -Style/AsciiComments: - Exclude: - - 'app/validators/domain_name_validator.rb' - - 'config/initializers/money.rb' - -# Offense count: 4 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: percent_q, bare_percent -Style/BarePercentLiterals: - Exclude: - - 'app/models/contact.rb' - - 'app/models/invoice.rb' - -# Offense count: 3 -# Cop supports --auto-correct. -Style/BlockComments: - Exclude: - - 'app/models/business_registry_cache.rb' - - 'app/models/soap/arireg.rb' - - 'spec/spec_helper.rb' - -# Offense count: 83 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods. -# SupportedStyles: line_count_based, semantic, braces_for_chaining -# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object -# FunctionalMethods: let, let!, subject, watch -# IgnoredMethods: lambda, proc, it -Style/BlockDelimiters: - Enabled: false - -# Offense count: 72 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: braces, no_braces, context_dependent -Style/BracesAroundHashParameters: - Enabled: false - -# Offense count: 54 -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: nested, compact -Style/ClassAndModuleChildren: - Enabled: false - -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: is_a?, kind_of? -Style/ClassCheck: - Exclude: - - 'app/views/epp/error.xml.builder' - -# Offense count: 3 -# Cop supports --auto-correct. -Style/ColonMethodCall: - Exclude: - - 'app/controllers/admin/billing/prices_controller.rb' - - 'lib/validators/email_validator.rb' - -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerBackticks. -# SupportedStyles: backticks, percent_x, mixed -Style/CommandLiteral: - Exclude: - - 'config/initializers/pdfkit.rb' - -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: Keywords. -# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW -Style/CommentAnnotation: - Exclude: - - 'app/models/contact.rb' - - 'app/views/epp/domains/info.xml.builder' - -# Offense count: 467 -Style/Documentation: - Enabled: false - -# Offense count: 2 -Style/DoubleNegation: - Exclude: - - 'app/models/bank_link.rb' - - 'app/models/setting.rb' - -# Offense count: 1 -# Cop supports --auto-correct. -Style/EmptyLiteral: - Exclude: - - 'app/models/legal_document.rb' - -# Offense count: 8 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: compact, expanded -Style/EmptyMethod: - Exclude: - - 'app/controllers/admin/billing/prices_controller.rb' - - 'app/controllers/admin/contacts_controller.rb' - - 'app/controllers/admin/reserved_domains_controller.rb' - - 'app/controllers/registrant/sessions_controller.rb' - - 'app/controllers/registrar/invoices_controller.rb' - - 'app/controllers/registrar/xml_consoles_controller.rb' - - 'db/migrate/20151202123506_name_and_password_for_reserved_domain.rb' - - 'db/migrate/20160108135436_name_and_password_for_blocked_domain.rb' - -# Offense count: 3 -# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms. -# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS -Style/FileName: - Exclude: - - 'config/deploy-example.rb' - - 'config/environments/development-example.rb' - - 'config/environments/staging-example.rb' - -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: format, sprintf, percent -Style/FormatString: - Exclude: - - 'app/models/bank_link.rb' - -# Offense count: 13 -# Configuration parameters: MinBodyLength. -Style/GuardClause: - Exclude: - - 'app/controllers/admin/account_activities_controller.rb' - - 'app/controllers/admin/epp_logs_controller.rb' - - 'app/controllers/admin/repp_logs_controller.rb' - - 'app/controllers/registrant/whois_controller.rb' - - 'app/models/bank_link.rb' - - 'app/models/contact.rb' - - 'app/models/epp/contact.rb' - - 'app/models/epp/domain.rb' - - 'app/models/invoice.rb' - - 'app/models/keyrelay.rb' - - 'lib/validators/phone_validator.rb' - -# Offense count: 40 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols. -# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys -Style/HashSyntax: - Exclude: - - 'Gemfile' - - 'app/models/bank_link.rb' - - 'app/models/domain.rb' - - 'config/routes.rb' - - 'db/migrate/20140926081324_create_versions.rb' - - 'db/migrate/20140926082627_contact_and_version_archiving.rb' - - 'db/migrate/20140926121409_domain_related_archives.rb' - - 'db/migrate/20141015135255_create_settings.rb' - - 'db/migrate/20141111105931_create_delayed_jobs.rb' - - 'db/migrate/20141127091027_remove_defaults_from_disclosure.rb' - - 'db/migrate/20150122091556_create_version_associations.rb' - - 'db/migrate/20150611124920_add_que.rb' - - 'lib/tasks/convert.rake' - -# Offense count: 8 -Style/IdenticalConditionalBranches: - Exclude: - - 'app/controllers/admin/blocked_domains_controller.rb' - - 'app/controllers/admin/reserved_domains_controller.rb' - - 'lib/tasks/import.rake' - -# Offense count: 5 -# Cop supports --auto-correct. -# Configuration parameters: MaxLineLength. -Style/IfUnlessModifier: - Exclude: - - 'app/controllers/admin/account_activities_controller.rb' - - 'app/controllers/admin/billing/prices_controller.rb' - - 'app/models/invoice.rb' - - 'config/initializers/pdfkit.rb' - - 'lib/tasks/import.rake' - -# Offense count: 1 -Style/IfUnlessModifierOfIfUnless: - Exclude: - - 'app/models/epp/domain.rb' - -# Offense count: 5 -# Cop supports --auto-correct. -# Configuration parameters: InverseMethods, InverseBlocks. -Style/InverseMethods: - Exclude: - - 'app/controllers/admin/domains_controller.rb' - - 'app/models/contact.rb' - - 'app/models/domain.rb' - - 'app/models/epp/domain.rb' - -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: line_count_dependent, lambda, literal -Style/Lambda: - Exclude: - - 'app/models/invoice.rb' - -# Offense count: 17 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline -Style/MethodDefParentheses: - Exclude: - - 'app/models/blocked_domain.rb' - - 'app/models/contact.rb' - - 'app/models/counter.rb' - - 'app/models/directo.rb' - - 'app/models/epp/contact.rb' - - 'app/models/epp/domain.rb' - - 'app/models/nameserver.rb' - - 'app/models/reserved_domain.rb' - - 'config/initializers/array.rb' - -# Offense count: 1 -Style/MethodMissing: - Exclude: - - 'app/models/counter.rb' - -# Offense count: 18 -# Cop supports --auto-correct. -Style/MultilineIfModifier: - Exclude: - - 'Gemfile' - - 'app/controllers/admin/bank_statements_controller.rb' - - 'app/controllers/admin/billing/prices_controller.rb' - - 'app/controllers/epp_controller.rb' - - 'app/models/concerns/epp_errors.rb' - - 'app/models/depp/domain.rb' - - 'app/models/epp/domain.rb' - - 'app/views/epp/domains/info.xml.builder' - - 'app/views/epp/error.xml.builder' - - 'app/views/epp/poll/poll_req.xml.builder' - - 'config/schedule.rb' - - 'lib/tasks/import.rake' - -# Offense count: 1 -# Cop supports --auto-correct. -Style/MultilineIfThen: - Exclude: - - 'config/initializers/pdfkit.rb' - -# Offense count: 3 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: keyword, braces -Style/MultilineMemoization: - Exclude: - - 'app/models/bank_link.rb' - -# Offense count: 102 -# Cop supports --auto-correct. -Style/MutableConstant: - Enabled: false - -# Offense count: 7 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: both, prefix, postfix -Style/NegatedIf: - Exclude: - - 'app/controllers/admin/account_activities_controller.rb' - - 'app/controllers/admin/epp_logs_controller.rb' - - 'app/controllers/admin/repp_logs_controller.rb' - - 'app/models/contact.rb' - - 'app/models/depp/domain.rb' - - 'app/models/domain.rb' - - 'app/models/legal_document.rb' - -# Offense count: 1 -# Cop supports --auto-correct. -Style/NestedParenthesizedCalls: - Exclude: - - 'app/models/epp/domain.rb' - -# Offense count: 6 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles. -# SupportedStyles: skip_modifier_ifs, always -Style/Next: - Exclude: - - 'app/controllers/epp_controller.rb' - - 'app/models/domain.rb' - - 'app/models/domain_cron.rb' - - 'app/models/legal_document.rb' - - 'lib/tasks/import.rake' - -# Offense count: 15 -# Cop supports --auto-correct. -Style/NilComparison: - Exclude: - - 'spec/models/contact_spec.rb' - - 'spec/models/domain_contact_spec.rb' - - 'spec/models/domain_spec.rb' - - 'spec/models/legal_document_spec.rb' - - 'spec/models/registrar_spec.rb' - -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedOctalStyle, SupportedOctalStyles. -# SupportedOctalStyles: zero_with_o, zero_only -Style/NumericLiteralPrefix: - Exclude: - - 'app/models/legal_document.rb' - -# Offense count: 40 -# Cop supports --auto-correct. -# Configuration parameters: Strict. -Style/NumericLiterals: - MinDigits: 15 - -# Offense count: 14 -# Cop supports --auto-correct. -# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles. -# SupportedStyles: predicate, comparison -Style/NumericPredicate: - Exclude: - - 'spec/**/*' - - 'app/controllers/admin/domains_controller.rb' - - 'app/controllers/epp/domains_controller.rb' - - 'app/controllers/registrar/domains_controller.rb' - - 'app/models/bank_statement.rb' - - 'app/models/domain_transfer.rb' - - 'app/models/epp/domain.rb' - - 'app/models/legal_document.rb' - - 'db/migrate/20150429135339_add_missing_data.rb' - - 'lib/tasks/convert.rake' - - 'lib/tasks/import.rake' - -# Offense count: 12 -# Cop supports --auto-correct. -Style/ParallelAssignment: - Exclude: - - 'app/controllers/epp_controller.rb' - - 'app/controllers/registrant/sessions_controller.rb' - - 'app/models/bank_link.rb' - - 'app/models/nameserver.rb' - - 'app/validators/domain_nameserver_validator.rb' - - 'app/validators/object_count_validator.rb' - - 'lib/tasks/import.rake' - - 'spec/models/domain_cron_spec.rb' - - 'spec/models/domain_spec.rb' - -# Offense count: 79 -# Cop supports --auto-correct. -# Configuration parameters: PreferredDelimiters. -Style/PercentLiteralDelimiters: - Enabled: false - -# Offense count: 2 -# Cop supports --auto-correct. -Style/PerlBackrefs: - Exclude: - - 'app/models/concerns/versions.rb' - -# Offense count: 3 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: short, verbose -Style/PreferredHashMethods: - Exclude: - - 'app/models/directo.rb' - -# Offense count: 2 -# Cop supports --auto-correct. -Style/Proc: - Exclude: - - 'app/models/billing/price.rb' - -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: compact, exploded -Style/RaiseArgs: - Exclude: - - 'app/controllers/registrar/payments_controller.rb' - -# Offense count: 2 -# Cop supports --auto-correct. -Style/RedundantBegin: - Exclude: - - 'app/controllers/registrant/contacts_controller.rb' - - 'app/models/soap/arireg.rb' - -# Offense count: 3 -# Cop supports --auto-correct. -Style/RedundantParentheses: - Exclude: - - 'app/models/invoice.rb' - - 'lib/tasks/convert.rake' - -# Offense count: 3 -# Cop supports --auto-correct. -# Configuration parameters: AllowMultipleReturnValues. -Style/RedundantReturn: - Exclude: - - 'app/models/keyrelay.rb' - - 'app/models/setting.rb' - -# Offense count: 20 -# Cop supports --auto-correct. -Style/RedundantSelf: - Exclude: - - 'app/models/blocked_domain.rb' - - 'app/models/concerns/user_events.rb' - - 'app/models/contact.rb' - - 'app/models/dnskey.rb' - - 'app/models/domain.rb' - - 'app/models/epp/domain.rb' - - 'app/models/reserved_domain.rb' - - 'app/models/user.rb' - - 'lib/ext/xml_builder.rb' - -# Offense count: 15 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes. -# SupportedStyles: slashes, percent_r, mixed -Style/RegexpLiteral: - Exclude: - - 'app/controllers/application_controller.rb' - - 'app/controllers/epp_controller.rb' - - 'app/models/certificate.rb' - - 'app/models/registrant_user.rb' - - 'config/initializers/filter_parameter_logging.rb' - - 'config/routes.rb' - - 'db/data/20150601083516_add_cert_common_name.rb' - - 'db/data/20150601083800_add_cert_md5.rb' - -# Offense count: 3 -# Cop supports --auto-correct. -Style/RescueModifier: - Exclude: - - 'app/models/epp/contact.rb' - - 'app/models/legal_document.rb' - - 'app/models/whois_record.rb' - -# Offense count: 16 -# Cop supports --auto-correct. -# Configuration parameters: AllowAsExpressionSeparator. -Style/Semicolon: - Exclude: - - 'app/controllers/registrant/whois_controller.rb' - - 'app/controllers/registrar/invoices_controller.rb' - - 'app/controllers/registrar/polls_controller.rb' - - 'app/models/domain.rb' - - 'spec/requests/admin/billing/prices/expire_spec.rb' - - 'spec/requests/epp/domain/renew/expire_time_spec.rb' - - 'spec/requests/epp/domain/renew/price_spec.rb' - - 'spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb' - - 'spec/requests/epp/domain/update/registrant_change/verified_spec.rb' - -# Offense count: 3 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: only_raise, only_fail, semantic -Style/SignalException: - Exclude: - - 'app/controllers/epp/contacts_controller.rb' - - 'app/controllers/epp/domains_controller.rb' - -# Offense count: 1199 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline. -# SupportedStyles: single_quotes, double_quotes -Style/StringLiterals: - Enabled: false - -# Offense count: 4 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: single_quotes, double_quotes -Style/StringLiteralsInInterpolation: - Exclude: - - 'app/models/contact.rb' - - 'app/models/directo.rb' - -# Offense count: 110 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, MinSize, SupportedStyles. -# SupportedStyles: percent, brackets -Style/SymbolArray: - Enabled: false - -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: IgnoredMethods. -# IgnoredMethods: respond_to, define_method -Style/SymbolProc: - Exclude: - - 'lib/epp_constraint.rb' - - 'lib/tasks/dev.rake' - -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment. -# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex -Style/TernaryParentheses: - Exclude: - - 'app/controllers/epp/domains_controller.rb' - - 'app/models/epp/domain.rb' - -# Offense count: 14 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyleForMultiline, SupportedStylesForMultiline. -# SupportedStylesForMultiline: comma, consistent_comma, no_comma -Style/TrailingCommaInLiteral: - Exclude: - - 'app/controllers/epp/contacts_controller.rb' - - 'app/models/billing/price.rb' - - 'app/models/depp/contact.rb' - - 'app/models/depp/domain.rb' - - 'app/models/directo.rb' - - 'app/models/epp/domain.rb' - - 'app/presenters/domain_presenter.rb' - - 'lib/tasks/dev.rake' - - 'lib/tasks/import.rake' - - 'spec/models/billing/price_spec.rb' - - 'spec/presenters/domain_presenter_spec.rb' - -# Offense count: 9 -# Cop supports --auto-correct. -Style/UnneededInterpolation: - Exclude: - - 'app/controllers/registrant/sessions_controller.rb' - - 'app/controllers/registrar/sessions_controller.rb' - - 'app/models/soap/arireg.rb' - - 'lib/epp_constraint.rb' - - 'spec/models/contact_spec.rb' - -# Offense count: 4 -# Cop supports --auto-correct. -Style/UnneededPercentQ: - Exclude: - - 'app/models/contact.rb' - - 'app/models/invoice.rb' - -# Offense count: 15 -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: snake_case, camelCase -Style/VariableName: - Exclude: - - 'app/controllers/admin/contact_versions_controller.rb' - - 'app/controllers/admin/domain_versions_controller.rb' - - 'app/views/epp/contacts/info.xml.builder' - - 'app/views/epp/domains/info.xml.builder' - -# Offense count: 5 -# Configuration parameters: EnforcedStyle, SupportedStyles. -# SupportedStyles: snake_case, normalcase, non_integer -Style/VariableNumber: - Exclude: - - 'spec/models/contact_spec.rb' - - 'spec/models/nameserver_spec.rb' - -# Offense count: 59 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, MinSize, WordRegex. -# SupportedStyles: percent, brackets -Style/WordArray: - Exclude: - - 'app/controllers/admin/account_activities_controller.rb' - - 'app/controllers/admin/epp_logs_controller.rb' - - 'app/controllers/admin/repp_logs_controller.rb' - - 'app/controllers/epp_controller.rb' - - 'app/models/contact.rb' - - 'app/models/depp/contact.rb' - - 'db/migrate/20150417082723_create_versions_for_billing.rb' - - 'db/migrate/20150603141549_add_decimal_type.rb' - - 'db/migrate/20150701074344_create_blocked_domains.rb' - - 'lib/sorted_country.rb' - - 'lib/tasks/import.rake' - - 'lib/tasks/statuses.rake' - - 'spec/models/concerns/domain/force_delete_spec.rb' - - 'spec/models/contact_spec.rb' - - 'spec/models/domain_spec.rb' - -# Offense count: 1 -# Cop supports --auto-correct. -Style/YodaCondition: - Exclude: - - 'lib/tasks/import.rake' - -# Offense count: 1 -# Cop supports --auto-correct. -Style/ZeroLengthPredicate: - Exclude: - - 'app/controllers/epp/contacts_controller.rb' diff --git a/coffeelint.json b/coffeelint.json deleted file mode 100644 index 86422e323..000000000 --- a/coffeelint.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "arrow_spacing": { - "level": "ignore" - }, - "braces_spacing": { - "level": "ignore", - "spaces": 0, - "empty_object_spaces": 0 - }, - "camel_case_classes": { - "level": "error" - }, - "coffeescript_error": { - "level": "error" - }, - "colon_assignment_spacing": { - "level": "ignore", - "spacing": { - "left": 0, - "right": 0 - } - }, - "cyclomatic_complexity": { - "value": 10, - "level": "ignore" - }, - "duplicate_key": { - "level": "error" - }, - "empty_constructor_needs_parens": { - "level": "ignore" - }, - "ensure_comprehensions": { - "level": "warn" - }, - "eol_last": { - "level": "ignore" - }, - "indentation": { - "value": 2, - "level": "error" - }, - "line_endings": { - "level": "ignore", - "value": "unix" - }, - "max_line_length": { - "value": 80, - "level": "error", - "limitComments": true - }, - "missing_fat_arrows": { - "level": "ignore", - "is_strict": false - }, - "newlines_after_classes": { - "value": 3, - "level": "ignore" - }, - "no_backticks": { - "level": "error" - }, - "no_debugger": { - "level": "warn", - "console": false - }, - "no_empty_functions": { - "level": "ignore" - }, - "no_empty_param_list": { - "level": "ignore" - }, - "no_implicit_braces": { - "level": "ignore", - "strict": true - }, - "no_implicit_parens": { - "strict": true, - "level": "ignore" - }, - "no_interpolation_in_single_quotes": { - "level": "ignore" - }, - "no_plusplus": { - "level": "ignore" - }, - "no_stand_alone_at": { - "level": "ignore" - }, - "no_tabs": { - "level": "error" - }, - "no_this": { - "level": "ignore" - }, - "no_throwing_strings": { - "level": "error" - }, - "no_trailing_semicolons": { - "level": "error" - }, - "no_trailing_whitespace": { - "level": "error", - "allowed_in_comments": false, - "allowed_in_empty_lines": true - }, - "no_unnecessary_double_quotes": { - "level": "ignore" - }, - "no_unnecessary_fat_arrows": { - "level": "warn" - }, - "non_empty_constructor_needs_parens": { - "level": "ignore" - }, - "prefer_english_operator": { - "level": "ignore", - "doubleNotLevel": "ignore" - }, - "space_operators": { - "level": "ignore" - }, - "spacing_after_comma": { - "level": "ignore" - }, - "transform_messes_up_line_numbers": { - "level": "warn" - } -} From 4464121ea3053678d6f3a530adabc9b90940b242 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 4 Jun 2018 00:17:06 +0300 Subject: [PATCH 05/11] Fix invalid HTML #662 --- app/views/layouts/registrant/application.html.erb | 2 +- app/views/layouts/registrar/base.html.erb | 2 +- app/views/layouts/registrar/sessions.haml | 2 +- app/views/registrar/bulk_change/_bulk_transfer_form.html.erb | 3 +-- app/views/registrar/bulk_change/_nameserver_form.html.erb | 3 +-- app/views/registrar/bulk_change/_tech_contact_form.html.erb | 3 +-- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/views/layouts/registrant/application.html.erb b/app/views/layouts/registrant/application.html.erb index da081b05a..f38f8fcea 100644 --- a/app/views/layouts/registrant/application.html.erb +++ b/app/views/layouts/registrant/application.html.erb @@ -20,7 +20,7 @@ +
+ <%= render 'shared/flash' %> + <% if depp_controller? %> + <%= render 'registrar/shared/epp_results' %> + <% end %> + <%= yield %> +
+
+
+
+
+ <%= image_tag 'eis-logo-et.png' %> +
+
+ Version + <%= CURRENT_COMMIT_HASH %> +
+
+
+
+ + From 1af1e2a4893f122c67bc66d7fd3afe606c595445 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 4 Jun 2018 00:42:45 +0300 Subject: [PATCH 07/11] Clean up view --- app/views/layouts/registrar/sessions.html.erb | 80 ++++++++----------- 1 file changed, 34 insertions(+), 46 deletions(-) diff --git a/app/views/layouts/registrar/sessions.html.erb b/app/views/layouts/registrar/sessions.html.erb index af336271e..904388155 100644 --- a/app/views/layouts/registrar/sessions.html.erb +++ b/app/views/layouts/registrar/sessions.html.erb @@ -1,9 +1,7 @@ - + - - - + <% if content_for? :head_title %> <%= yield :head_title %> <% else %> @@ -14,53 +12,43 @@ <%= csrf_meta_tags %> <%= stylesheet_link_tag 'registrar-manifest', media: 'all' %> <%= javascript_include_tag 'registrar-manifest' %> - <%= favicon_link_tag 'favicon.ico' %> - -
- <%= render 'shared/flash' %> - <% if depp_controller? %> - <%= render 'registrar/shared/epp_results' %> - <% end %> - <%= yield %> -
-
+ +
-
-
- <%= image_tag 'eis-logo-et.png' %> -
-
- Version - <%= CURRENT_COMMIT_HASH %> + <%= render 'flash_messages' %> + <%= yield %> +
+ +
+
+
+
+ <%= image_tag 'eis-logo-et.png' %> +
+
+ Version + <%= CURRENT_COMMIT_HASH %> +
-
-
+ - + \ No newline at end of file From 8c915164c51373ad1513fa5734a75251ddf16f4f Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 4 Jun 2018 02:14:15 +0300 Subject: [PATCH 08/11] Change naming #662 --- app/api/repp/domain_contacts_v1.rb | 24 ++++++----- .../registrar/tech_contacts_controller.rb | 3 +- app/models/tech_domain_contact.rb | 6 +-- .../bulk_change/_tech_contact_form.html.erb | 8 ++-- config/locales/registrar/bulk_change.en.yml | 2 - doc/repp/v1/domain_contacts.md | 4 +- test/integration/api/domain_contacts_test.rb | 40 ++++++++++++------- .../bulk_change/tech_contact_test.rb | 2 +- 8 files changed, 51 insertions(+), 38 deletions(-) diff --git a/app/api/repp/domain_contacts_v1.rb b/app/api/repp/domain_contacts_v1.rb index 5a38897d4..a5f337139 100644 --- a/app/api/repp/domain_contacts_v1.rb +++ b/app/api/repp/domain_contacts_v1.rb @@ -5,29 +5,33 @@ module Repp resource :domains do resource :contacts do patch '/' do - predecessor = current_user.registrar.contacts.find_by(code: params[:predecessor]) - successor = current_user.registrar.contacts.find_by(code: params[:successor]) + current_contact = current_user.registrar.contacts + .find_by(code: params[:current_contact_id]) + new_contact = current_user.registrar.contacts.find_by(code: params[:new_contact_id]) - unless predecessor + unless current_contact error!({ error: { type: 'invalid_request_error', - param: 'predecessor', - message: "No such contact: #{params[:predecessor]}" } }, :bad_request) + param: 'current_contact_id', + message: "No such contact: #{params[:current_contact_id]}"} }, + :bad_request) end - unless successor + unless new_contact error!({ error: { type: 'invalid_request_error', - param: 'successor', - message: "No such contact: #{params[:successor]}" } }, :bad_request) + param: 'new_contact_id', + message: "No such contact: #{params[:new_contact_id]}" } }, + :bad_request) end - if predecessor == successor + if current_contact == new_contact error!({ error: { type: 'invalid_request_error', message: 'New contact ID must be different from current' \ ' contact ID' } }, :bad_request) end - affected_domains, skipped_domains = TechDomainContact.replace(predecessor, successor) + affected_domains, skipped_domains = TechDomainContact + .replace(current_contact, new_contact) @response = { affected_domains: affected_domains, skipped_domains: skipped_domains } end end diff --git a/app/controllers/registrar/tech_contacts_controller.rb b/app/controllers/registrar/tech_contacts_controller.rb index fccb10f78..9d4568ad6 100644 --- a/app/controllers/registrar/tech_contacts_controller.rb +++ b/app/controllers/registrar/tech_contacts_controller.rb @@ -6,7 +6,8 @@ class Registrar uri = URI.parse("#{ENV['repp_url']}domains/contacts") request = Net::HTTP::Patch.new(uri) - request.set_form_data(predecessor: params[:predecessor], successor: params[:successor]) + request.set_form_data(current_contact_id: params[:current_contact_id], + new_contact_id: params[:new_contact_id]) request.basic_auth(current_user.username, current_user.password) if Rails.env.test? diff --git a/app/models/tech_domain_contact.rb b/app/models/tech_domain_contact.rb index 55cc45aed..04f36c4e4 100644 --- a/app/models/tech_domain_contact.rb +++ b/app/models/tech_domain_contact.rb @@ -1,9 +1,9 @@ class TechDomainContact < DomainContact # Audit log is needed, therefore no raw SQL - def self.replace(predecessor, successor) + def self.replace(current_contact, new_contact) affected_domains = [] skipped_domains = [] - tech_contacts = where(contact: predecessor) + tech_contacts = where(contact: current_contact) transaction do tech_contacts.each do |tech_contact| @@ -12,7 +12,7 @@ class TechDomainContact < DomainContact next end - tech_contact.contact = successor + tech_contact.contact = new_contact tech_contact.save! affected_domains << tech_contact.domain.name end diff --git a/app/views/registrar/bulk_change/_tech_contact_form.html.erb b/app/views/registrar/bulk_change/_tech_contact_form.html.erb index f8e0a29d3..f759177b2 100644 --- a/app/views/registrar/bulk_change/_tech_contact_form.html.erb +++ b/app/views/registrar/bulk_change/_tech_contact_form.html.erb @@ -7,11 +7,11 @@
- <%= label_tag :predecessor, t('.predecessor') %> + <%= label_tag :current_contact_id %>
- <%= text_field_tag :predecessor, params[:predecessor], + <%= text_field_tag :current_contact_id, params[:current_contact_id], list: :contacts, required: true, autofocus: true, @@ -21,11 +21,11 @@
- <%= label_tag :successor, t('.successor') %> + <%= label_tag :new_contact_id %>
- <%= text_field_tag :successor, params[:successor], + <%= text_field_tag :new_contact_id, params[:new_contact_id], list: :contacts, required: true, class: 'form-control' %> diff --git a/config/locales/registrar/bulk_change.en.yml b/config/locales/registrar/bulk_change.en.yml index 0bbd222bd..29a69b0a9 100644 --- a/config/locales/registrar/bulk_change.en.yml +++ b/config/locales/registrar/bulk_change.en.yml @@ -8,8 +8,6 @@ en: bulk_transfer: Bulk transfer tech_contact_form: - predecessor: Current contact ID - successor: New contact ID submit_btn: Replace technical contacts help_btn: Toggle help help: >- diff --git a/doc/repp/v1/domain_contacts.md b/doc/repp/v1/domain_contacts.md index 8a024e763..b412e9f73 100644 --- a/doc/repp/v1/domain_contacts.md +++ b/doc/repp/v1/domain_contacts.md @@ -8,8 +8,8 @@ Replaces all domain contacts of the current registrar. $ curl https://repp.internet.ee/v1/domains/contacts \ -X PATCH \ -u username:password \ - -d predecessor=foo \ - -d successor=bar + -d current_contact_id=foo \ + -d new_contact_id=bar ``` ### Example response ``` diff --git a/test/integration/api/domain_contacts_test.rb b/test/integration/api/domain_contacts_test.rb index b9d405219..8d619f969 100644 --- a/test/integration/api/domain_contacts_test.rb +++ b/test/integration/api/domain_contacts_test.rb @@ -2,7 +2,8 @@ require 'test_helper' class APIDomainContactsTest < ActionDispatch::IntegrationTest def test_replace_all_tech_contacts_of_the_current_registrar - patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'john-001' }, + patch '/repp/v1/domains/contacts', { current_contact_id: 'william-001', + new_contact_id: 'john-001' }, { 'HTTP_AUTHORIZATION' => http_auth_key } assert_nil domains(:shop).tech_contacts.find_by(code: 'william-001') @@ -13,14 +14,16 @@ class APIDomainContactsTest < ActionDispatch::IntegrationTest def test_skip_discarded_domains domains(:airport).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) - patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'john-001' }, + patch '/repp/v1/domains/contacts', { current_contact_id: 'william-001', + new_contact_id: 'john-001' }, { 'HTTP_AUTHORIZATION' => http_auth_key } assert domains(:airport).tech_contacts.find_by(code: 'william-001') end def test_return_affected_domains_in_alphabetical_order - patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'john-001' }, + patch '/repp/v1/domains/contacts', { current_contact_id: 'william-001', + new_contact_id: 'john-001' }, { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :ok @@ -33,7 +36,8 @@ class APIDomainContactsTest < ActionDispatch::IntegrationTest domains(:shop).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) domains(:airport).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) - patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'john-001' }, + patch '/repp/v1/domains/contacts', { current_contact_id: 'william-001', + new_contact_id: 'john-001' }, { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :ok @@ -42,52 +46,58 @@ class APIDomainContactsTest < ActionDispatch::IntegrationTest end def test_keep_other_tech_contacts_intact - patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'john-001' }, + patch '/repp/v1/domains/contacts', { current_contact_id: 'william-001', + new_contact_id: 'john-001' }, { 'HTTP_AUTHORIZATION' => http_auth_key } assert domains(:shop).tech_contacts.find_by(code: 'acme-ltd-001') end def test_keep_admin_contacts_intact - patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'john-001' }, + patch '/repp/v1/domains/contacts', { current_contact_id: 'william-001', + new_contact_id: 'john-001' }, { 'HTTP_AUTHORIZATION' => http_auth_key } assert domains(:airport).admin_contacts.find_by(code: 'william-001') end def test_restrict_contacts_to_the_current_registrar - patch '/repp/v1/domains/contacts', { predecessor: 'jack-001', successor: 'william-002' }, + patch '/repp/v1/domains/contacts', { current_contact_id: 'jack-001', + new_contact_id: 'william-002' }, { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :bad_request assert_equal ({ error: { type: 'invalid_request_error', - param: 'predecessor', + param: 'current_contact_id', message: 'No such contact: jack-001' } }), JSON.parse(response.body, symbolize_names: true) end - def test_non_existent_predecessor - patch '/repp/v1/domains/contacts', { predecessor: 'non-existent', successor: 'john-001' }, + def test_non_existent_current_contact + patch '/repp/v1/domains/contacts', { current_contact_id: 'non-existent', + new_contact_id: 'john-001' }, { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :bad_request assert_equal ({ error: { type: 'invalid_request_error', - param: 'predecessor', + param: 'current_contact_id', message: 'No such contact: non-existent' } }), JSON.parse(response.body, symbolize_names: true) end - def test_non_existent_successor - patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'non-existent' }, + def test_non_existent_new_contact + patch '/repp/v1/domains/contacts', { current_contact_id: 'william-001', + new_contact_id: 'non-existent' }, { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :bad_request assert_equal ({ error: { type: 'invalid_request_error', - param: 'successor', + param: 'new_contact_id', message: 'No such contact: non-existent' } }), JSON.parse(response.body, symbolize_names: true) end def test_disallow_self_replacement - patch '/repp/v1/domains/contacts', { predecessor: 'william-001', successor: 'william-001' }, + patch '/repp/v1/domains/contacts', { current_contact_id: 'william-001', + new_contact_id: 'william-001' }, { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :bad_request assert_equal ({ error: { type: 'invalid_request_error', diff --git a/test/integration/registrar/bulk_change/tech_contact_test.rb b/test/integration/registrar/bulk_change/tech_contact_test.rb index 2999a8853..993f166a0 100644 --- a/test/integration/registrar/bulk_change/tech_contact_test.rb +++ b/test/integration/registrar/bulk_change/tech_contact_test.rb @@ -7,7 +7,7 @@ class RegistrarAreaTechContactBulkChangeTest < ActionDispatch::IntegrationTest def test_replace_domain_contacts_of_current_registrar request_stub = stub_request(:patch, /domains\/contacts/) - .with(body: { predecessor: 'william-001', successor: 'john-001' }, + .with(body: { current_contact_id: 'william-001', new_contact_id: 'john-001' }, basic_auth: ['test_bestnames', 'testtest']) .to_return(body: { affected_domains: %w[foo.test bar.test], skipped_domains: %w[baz.test qux.test] }.to_json, From 125bb4bb4ad093817317760b1d5e08e7e5edeb40 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 4 Jun 2018 02:18:08 +0300 Subject: [PATCH 09/11] Revert translations #662 --- app/views/registrar/bulk_change/_tech_contact_form.html.erb | 4 ++-- config/locales/registrar/bulk_change.en.yml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/registrar/bulk_change/_tech_contact_form.html.erb b/app/views/registrar/bulk_change/_tech_contact_form.html.erb index f759177b2..dc0693599 100644 --- a/app/views/registrar/bulk_change/_tech_contact_form.html.erb +++ b/app/views/registrar/bulk_change/_tech_contact_form.html.erb @@ -7,7 +7,7 @@
- <%= label_tag :current_contact_id %> + <%= label_tag :current_contact_id, t('.current_contact_id') %>
@@ -21,7 +21,7 @@
- <%= label_tag :new_contact_id %> + <%= label_tag :new_contact_id, t('.new_contact_id') %>
diff --git a/config/locales/registrar/bulk_change.en.yml b/config/locales/registrar/bulk_change.en.yml index 29a69b0a9..7c1f11da9 100644 --- a/config/locales/registrar/bulk_change.en.yml +++ b/config/locales/registrar/bulk_change.en.yml @@ -8,6 +8,8 @@ en: bulk_transfer: Bulk transfer tech_contact_form: + current_contact_id: Current contact ID + new_contact_id: New contact ID submit_btn: Replace technical contacts help_btn: Toggle help help: >- From 263cb2e123ae5b8217ef16c94e5ffa23f7d8b456 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 4 Jun 2018 03:06:29 +0300 Subject: [PATCH 10/11] Require new contact to be valid #662 --- app/api/repp/domain_contacts_v1.rb | 7 +++++++ test/fixtures/contacts.yml | 2 +- test/integration/api/domain_contacts_test.rb | 11 +++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/api/repp/domain_contacts_v1.rb b/app/api/repp/domain_contacts_v1.rb index a5f337139..7f3e323ac 100644 --- a/app/api/repp/domain_contacts_v1.rb +++ b/app/api/repp/domain_contacts_v1.rb @@ -23,6 +23,13 @@ module Repp :bad_request) end + if new_contact.invalid? + error!({ error: { type: 'invalid_request_error', + param: 'new_contact_id', + message: 'New contact must be valid' } }, + :bad_request) + end + if current_contact == new_contact error!({ error: { type: 'invalid_request_error', message: 'New contact ID must be different from current' \ diff --git a/test/fixtures/contacts.yml b/test/fixtures/contacts.yml index 50befdcf8..b64dce039 100644 --- a/test/fixtures/contacts.yml +++ b/test/fixtures/contacts.yml @@ -76,7 +76,7 @@ not_in_use: invalid: name: any - code: any + code: invalid email: invalid@invalid.test auth_info: any registrar: bestnames diff --git a/test/integration/api/domain_contacts_test.rb b/test/integration/api/domain_contacts_test.rb index 8d619f969..a6d6376f7 100644 --- a/test/integration/api/domain_contacts_test.rb +++ b/test/integration/api/domain_contacts_test.rb @@ -95,6 +95,17 @@ class APIDomainContactsTest < ActionDispatch::IntegrationTest JSON.parse(response.body, symbolize_names: true) end + def test_disallow_invalid_new_contact + patch '/repp/v1/domains/contacts', { current_contact_id: 'william-001', + new_contact_id: 'invalid' }, + { 'HTTP_AUTHORIZATION' => http_auth_key } + assert_response :bad_request + assert_equal ({ error: { type: 'invalid_request_error', + param: 'new_contact_id', + message: 'New contact must be valid' } }), + JSON.parse(response.body, symbolize_names: true) + end + def test_disallow_self_replacement patch '/repp/v1/domains/contacts', { current_contact_id: 'william-001', new_contact_id: 'william-001' }, From 472038825aaa2c88f4da0a5f5154d998575104f6 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 4 Jun 2018 03:19:51 +0300 Subject: [PATCH 11/11] Fix test #662 --- test/integration/registrar/domains_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/registrar/domains_test.rb b/test/integration/registrar/domains_test.rb index 35411815f..e98212297 100644 --- a/test/integration/registrar/domains_test.rb +++ b/test/integration/registrar/domains_test.rb @@ -9,7 +9,7 @@ class RegistrarDomainsTest < ActionDispatch::IntegrationTest Domain,Transfer code,Registrant name,Registrant code,Date of expiry library.test,45118f5,Acme Ltd,acme-ltd-001,2010-07-05 shop.test,65078d5,John,john-001,2010-07-05 - invalid.test,1438d6,any,any,2010-07-05 + invalid.test,1438d6,any,invalid,2010-07-05 airport.test,55438j5,John,john-001,2010-07-05 CSV