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

app/controllers/epp/contacts_controller.rb

@@ -94,12 +94,26 @@ class Epp::ContactsController < EppController
       'postalInfo > addr > pc', 'postalInfo > addr > cc', 'voice', 'email'
     )
     ident = params[:parsed_frame].css('ident')
+
+    if ident.present? && ident.attr('type').blank?
+      epp_errors << {
+        code: '2003',
+        msg: I18n.t('errors.messages.required_ident_attribute_missing', key: 'type')
+      }
+    end
+
     if ident.present? && ident.text != 'birthday' && ident.attr('cc').blank?
       epp_errors << {
         code: '2003',
-        msg: I18n.t('errors.messages.required_attribute_missing', key: 'ident country code missing')
+        msg: I18n.t('errors.messages.required_ident_attribute_missing', key: 'cc')
       }
     end
+    # if ident.present? && ident.attr('cc').blank?
+      # epp_errors << {
+        # code: '2003',
+        # msg: I18n.t('errors.messages.required_ident_attribute_missing', key: 'cc')
+      # }
+    # end
     contact_org_disabled
     fax_disabled
     status_editing_disabled

app/views/admin/domain_versions/_version.haml

@@ -1,3 +1,4 @@
+- if version.present? && domain.present?
   - children = HashWithIndifferentAccess.new(version.children)
   - nameservers    = children[:nameservers] || []
   - tech_contacts  = children[:tech_contacts] || []

config/locales/en.yml

@@ -256,7 +256,7 @@ en:
       invalid_type: 'PostalInfo type is invalid'
       unimplemented_command: 'Unimplemented command'
       domain_exists_but_belongs_to_other_registrar: 'Domain exists but belongs to other registrar'
-      required_attribute_missing: Required attributes missing
+      required_ident_attribute_missing: "Required ident attribute missing: %{key}"
 
   code: 'Code'
   value: 'Value'

spec/epp/contact_spec.rb

@@ -170,12 +170,26 @@ describe 'EPP Contact', epp: true do
         Contact.last.code.should == 'FIRST0:ABC:ABC:12345'
       end
 
+      it 'should add registrar prefix for code when missing' do
+        response = create_request({ id: { value: 'abc:ABC:12345' } })
+        response[:msg].should == 'Command completed successfully'
+        response[:result_code].should == '1000'
+
+        Contact.last.code.should == 'FIRST0:ABC:ABC:12345'
+      end
+
       it 'should not allow spaces in custom code' do
         response = create_request({ id: { value: 'abc 123' } })
         response[:msg].should == 'is invalid [code]'
         response[:result_code].should == '2005'
       end
 
+      fit 'should not allow spaces in custom code' do
+        response = create_request({ id: { value: '1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111' } })
+        response[:msg].should == 'is invalid [code]'
+        response[:result_code].should == '2005'
+      end
+
       it 'should not saves ident type with wrong country code' do
         extension = {
           ident: {
@@ -189,6 +203,31 @@ describe 'EPP Contact', epp: true do
         response[:result_code].should == '2005'
       end
 
+      it 'should return country missing' do
+        extension = {
+          ident: {
+            value: '1990-22-12',
+            attrs: { type: 'birthday' }
+          }
+        }
+        response = create_request({}, extension, validate_input: false)
+        response[:msg].should ==
+          'Required ident attribute missing: cc'
+        response[:result_code].should == '2003'
+      end
+
+      it 'should return country missing' do
+        extension = {
+          ident: {
+            value: '1990-22-12'
+          }
+        }
+        response = create_request({}, extension, validate_input: false)
+        response[:msg].should ==
+          'Required ident attribute missing: type'
+        response[:result_code].should == '2003'
+      end
+
       it 'should add registrar prefix for code when legacy prefix present' do
         response = create_request({ id: { value: 'CID:FIRST0:abc:ABC:NEW:12345' } })
         response[:msg].should == 'Command completed successfully'