Merge branch 'master' of github.com:internetee/registry

Conflicts:
	app/models/contact.rb

spec/epp/domain_spec.rb

@@ -7,6 +7,7 @@ describe 'EPP Domain', epp: true do
     before(:each) do
       Fabricate(:epp_user)
       Fabricate(:domain_validation_setting_group)
+      Fabricate(:domain_statuses_setting_group)
     end
 
     it 'returns error if contact does not exists' do
@@ -244,13 +245,51 @@ describe 'EPP Domain', epp: true do
         expect(response[:results][0][:msg]).to eq('Domain not found')
       end
 
-      it 'updates domain', pending: true do
-        response = epp_request('domains/update.xml')
+      it 'updates domain and adds objects' do
+        response = epp_request('domains/update_add_objects.xml')
+        expect(response[:results][0][:result_code]).to eq('2303')
+        expect(response[:results][0][:msg]).to eq('Contact was not found')
+
+        Fabricate(:contact, code: 'mak21')
+
+        response = epp_request('domains/update_add_objects.xml')
         expect(response[:results][0][:result_code]).to eq('1000')
 
         d = Domain.first
-        new_ns = d.nameservers.find_by(hostname: 'ns2.example.com')
+
+        new_ns_count = d.nameservers.where(hostname: ['ns1.example.com', 'ns2.example.com']).count
+        expect(new_ns_count).to eq(2)
+
+        new_contact = d.tech_contacts.find_by(code: 'mak21')
+        expect(new_contact).to be_truthy
+
+        expect(d.domain_statuses.count).to eq(2)
+        expect(d.domain_statuses.first.description).to eq('Payment overdue.')
+        expect(d.domain_statuses.first.value).to eq('clientHold')
+        expect(d.domain_statuses.first.code).to eq('client_hold')
+
+        expect(d.domain_statuses.last.value).to eq('clientUpdateProhibited')
+
+        response = epp_request('domains/update_add_objects.xml')
+
+        expect(response[:results][0][:result_code]).to eq('2302')
+        expect(response[:results][0][:msg]).to eq('Status already exists on this domain')
+        expect(d.domain_statuses.count).to eq(2)
+      end
+
+      it 'updates a domain and removes objects' do
+        Fabricate(:contact, code: 'mak21')
+        epp_request('domains/update_add_objects.xml')
+
+        d = Domain.last
+
+        new_ns = d.nameservers.find_by(hostname: 'ns1.example.com')
         expect(new_ns).to be_truthy
+
+        response = epp_request('domains/update_remove_objects.xml')
+
+        rem_ns = d.nameservers.find_by(hostname: 'ns1.example.com')
+        expect(rem_ns).to be_falsey
       end
     end
 
@@ -272,7 +311,7 @@ describe 'EPP Domain', epp: true do
 
       expect(name.text).to eq('example.ee')
       expect(name[:avail]).to eq('0')
-      expect(reason.text).to eq('in use') #confirm this with current API
+      expect(reason.text).to eq('in use')
     end
 
     it 'checks multiple domains' do

spec/epp/requests/domains/update.xml

@@ -7,6 +7,7 @@
         <domain:name>example.ee</domain:name>
         <domain:add>
           <domain:ns>
+            <domain:hostObj>ns1.example.com</domain:hostObj>
             <domain:hostObj>ns2.example.com</domain:hostObj>
           </domain:ns>
           <domain:contact type="tech">mak21</domain:contact>

spec/epp/requests/domains/update_add_objects.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <update>
+      <domain:update
+       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:name>example.ee</domain:name>
+        <domain:add>
+          <domain:ns>
+            <domain:hostObj>ns1.example.com</domain:hostObj>
+            <domain:hostObj>ns2.example.com</domain:hostObj>
+          </domain:ns>
+          <domain:contact type="tech">mak21</domain:contact>
+          <domain:status s="clientHold"
+           lang="en">Payment overdue.</domain:status>
+          <domain:status s="clientUpdateProhibited"/>
+        </domain:add>
+      </domain:update>
+    </update>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>

spec/epp/requests/domains/update_remove_objects.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <update>
+      <domain:update
+       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:name>example.ee</domain:name>
+        <domain:rem>
+          <domain:ns>
+            <domain:hostObj>ns1.example.com</domain:hostObj>
+          </domain:ns>
+          <domain:contact type="tech">sh8013</domain:contact>
+          <domain:status s="clientHold"/>
+        </domain:rem>
+      </domain:update>
+    </update>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>