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

Conflicts:
	spec/epp/contact_spec.rb

spec/epp/contact_spec.rb

@@ -7,6 +7,7 @@ describe 'EPP Contact', epp: true do
     before(:each) { Fabricate(:epp_user) }
 
     context 'create command' do
+
       it "fails if request is invalid" do
         response = epp_request(contact_create_xml( { authInfo: [false], addr: { cc: false, city: false } }  ), :xml)
 
@@ -14,9 +15,9 @@ describe 'EPP Contact', epp: true do
         expect(response[:results][1][:result_code]).to eq('2003')
         expect(response[:results][2][:result_code]).to eq('2003')
 
-        expect(response[:results][0][:msg]).to eq('Required parameter missing: city')
-        expect(response[:results][1][:msg]).to eq('Required parameter missing: cc')
-        expect(response[:results][2][:msg]).to eq('Required parameter missing: authInfo')
+        expect(response[:results][0][:msg]).to eq('Required parameter missing: pw')
+        expect(response[:results][1][:msg]).to eq('Required parameter missing: city')
+        expect(response[:results][2][:msg]).to eq('Required parameter missing: cc')
         expect(response[:results].count).to eq 3
       end
 
@@ -37,7 +38,6 @@ describe 'EPP Contact', epp: true do
         expect(Contact.first.address.street).to eq('123 Example Dr.')
         expect(Contact.first.address.street2).to eq('Suite 100')
         expect(Contact.first.address.street3).to eq nil
-
       end
 
       it 'returns result data upon success' do
@@ -78,6 +78,16 @@ describe 'EPP Contact', epp: true do
         expect(response[:results].count).to eq 1
       end
 
+
+      it 'fails with wrong authentication info' do
+        Fabricate(:contact, code: 'sh8013', auth_info: 'secure_password')
+
+        response = epp_request('contacts/update.xml')
+
+        expect(response[:msg]).to eq('Authorization error')
+        expect(response[:result_code]).to eq('2201')
+      end
+
       it 'stamps updated_by succesfully' do
         Fabricate(:contact, code: 'sh8013')
 
@@ -89,7 +99,7 @@ describe 'EPP Contact', epp: true do
       end
 
       it 'is succesful' do
-        Fabricate(:contact, created_by_id: 1, email: 'not_updated@test.test', code: 'sh8013')
+        Fabricate(:contact, created_by_id: 1, email: 'not_updated@test.test', code: 'sh8013', auth_info: '2fooBAR')
         #response = epp_request(contact_update_xml( { chg: { email: 'fred@bloggers.ee', postalInfo: { name: 'Fred Bloggers' } } } ), :xml)
         response = epp_request('contacts/update.xml')
 
@@ -101,7 +111,7 @@ describe 'EPP Contact', epp: true do
       end
 
       it 'returns phone and email error' do
-        Fabricate(:contact, created_by_id: 1, email: 'not_updated@test.test', code: 'sh8013')
+        Fabricate(:contact, created_by_id: 1, email: 'not_updated@test.test', code: 'sh8013', auth_info: '2fooBAR')
         #response = epp_request(contact_update_xml( { chg: { email: "qwe", phone: "123qweasd" } }), :xml)
         response = epp_request('contacts/update_with_errors.xml')
 
@@ -123,7 +133,7 @@ describe 'EPP Contact', epp: true do
       end
 
       it 'deletes contact' do
-        Fabricate(:contact, code: "dwa1234")
+        Fabricate(:contact, code: "dwa1234", auth_info: '2fooBAR')
         response = epp_request('contacts/delete.xml')
         expect(response[:result_code]).to eq('1000')
         expect(response[:msg]).to eq('Command completed successfully')
@@ -149,7 +159,7 @@ describe 'EPP Contact', epp: true do
         expect(response[:results].count).to eq 1
       end
 
-      it 'returns info about contact' do
+      it 'returns info about contact availability' do
         Fabricate(:contact, code: 'check-1234')
 
         response = epp_request(contact_check_xml( ids: [{ id: 'check-1234'}, { id: 'check-4321' }]  ), :xml)
@@ -183,7 +193,7 @@ describe 'EPP Contact', epp: true do
       end
 
       it 'returns info about contact' do
-        Fabricate(:contact, name: "Johnny Awesome", created_by_id: '1', code: 'info-4444')
+        Fabricate(:contact, name: "Johnny Awesome", created_by_id: '1', code: 'info-4444', auth_info: '2fooBAR')
         Fabricate(:address)
 
         response = epp_request('contacts/info.xml')
@@ -195,10 +205,8 @@ describe 'EPP Contact', epp: true do
 
       end
 
-      it 'doesn\'t display unassociated object', pending: true do
-        pending 'until new contact rights systems is implemented'
-        Fabricate(:contact, name:"Johnny Awesome", created_by_id: '240', code: 'info-4444')
-        Fabricate(:epp_user, id: 240)
+      it 'doesn\'t display unassociated object' do
+        Fabricate(:contact, name:"Johnny Awesome", code: 'info-4444')
 
         response = epp_request('contacts/info.xml')
         expect(response[:result_code]).to eq('2201')

spec/epp/requests/contacts/update_with_errors.xml

@@ -8,6 +8,9 @@
           <contact:chg>
             <contact:voice x="1234">123456798</contact:voice>
             <contact:email>faulty</contact:email>
+            <contact:authInfo>
+              <contact:pw>2fooBAR</contact:pw>
+            </contact:authInfo>
          </contact:chg>
        </contact:update>
       </update>