Merge pull request #780 from internetee/registry-662

Enable domain contact replacement

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

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

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

test/integration/api/domain_contacts_test.rb

@@ -0,0 +1,124 @@
+require 'test_helper'
+
+class APIDomainContactsTest < ActionDispatch::IntegrationTest
+  def test_replace_all_tech_contacts_of_the_current_registrar
+    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')
+    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', { 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', { current_contact_id: 'william-001',
+                                         new_contact_id: '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', { current_contact_id: 'william-001',
+                                         new_contact_id: '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', { 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', { 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', { 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: 'current_contact_id',
+                             message: 'No such contact: jack-001' } }),
+                 JSON.parse(response.body, symbolize_names: true)
+  end
+
+  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: 'current_contact_id',
+                             message: 'No such contact: non-existent' } }),
+                 JSON.parse(response.body, symbolize_names: true)
+  end
+
+  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: 'new_contact_id',
+                             message: 'No such contact: non-existent' } }),
+                 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' },
+          { 'HTTP_AUTHORIZATION' => http_auth_key }
+    assert_response :bad_request
+    assert_equal ({ error: { type: 'invalid_request_error',
+                             message: 'New contact ID must be different from current contact ID' } }),
+                 JSON.parse(response.body, symbolize_names: true)
+  end
+
+  private
+
+  def http_auth_key
+    ActionController::HttpAuthentication::Basic.encode_credentials('test_bestnames', 'testtest')
+  end
+end

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

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

test/integration/registrar/bulk_change/bulk_transfer_test.rb

@@ -1,12 +1,11 @@
 require 'test_helper'
 
-class RegistrarDomainTransfersTest < ActionDispatch::IntegrationTest
+class RegistrarAreaBulkTransferTest < ActionDispatch::IntegrationTest
   setup do
-    WebMock.reset!
     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,
@@ -17,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

test/integration/registrar/bulk_change/nameserver_test.rb

@@ -1,8 +1,7 @@
 require 'test_helper'
 
-class RegistrarNameserverReplacementTest < ActionDispatch::IntegrationTest
+class RegistrarAreaNameserverBulkChangeTest < ActionDispatch::IntegrationTest
   setup do
-    WebMock.reset!
     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'

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: { 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,
+                                status: 200)
+
+    visit registrar_domains_url
+    click_link 'Bulk change'
+
+    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
+    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 '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 'Current contact ID', with: 'william-001'
+    assert_field 'New contact ID', with: 'john-001'
+  end
+end

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
 

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
 

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