diff --git a/app/models/epp/response/result/code.rb b/app/models/epp/response/result/code.rb
index 2a65f6747..e2af0823d 100644
--- a/app/models/epp/response/result/code.rb
+++ b/app/models/epp/response/result/code.rb
@@ -7,6 +7,7 @@ module Epp
KEY_TO_VALUE = {
completed_successfully: 1000,
completed_successfully_action_pending: 1001,
+ completed_without_address: 1100,
completed_successfully_no_messages: 1300,
completed_successfully_ack_to_dequeue: 1301,
completed_successfully_ending_session: 1500,
diff --git a/test/integration/epp/contact/create/base_test.rb b/test/integration/epp/contact/create/base_test.rb
index e9a59b8d2..262487a1e 100644
--- a/test/integration/epp/contact/create/base_test.rb
+++ b/test/integration/epp/contact/create/base_test.rb
@@ -140,4 +140,115 @@ class EppContactCreateBaseTest < EppTestCase
end
assert_epp_response :required_parameter_missing
end
+
+ def test_does_not_save_address_when_address_processing_turned_off
+ name = 'new'
+ email = 'new@registrar.test'
+ phone = '+1.2'
+
+ request_xml = <<-XML
+
+
+
+
+
+
+ #{name}
+
+ 123 Example
+ Tallinn
+ FFF
+ 123456
+ EE
+
+
+ #{phone}
+ #{email}
+
+
+
+
+ 123
+
+
+
+
+ XML
+
+ assert_difference 'Contact.count' do
+ post epp_create_path, params: { frame: request_xml },
+ headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
+ end
+
+ assert_epp_response :completed_without_address
+ contact = Contact.find_by(name: name)
+ assert_equal name, contact.name
+ assert_equal email, contact.email
+ assert_equal phone, contact.phone
+ assert_not_empty contact.code
+ assert_nil contact.city
+ assert_nil contact.street
+ assert_nil contact.zip
+ assert_nil contact.country_code
+ assert_nil contact.state
+ end
+
+ def test_saves_address_when_address_processing_turned_on
+ Setting.address_processing = true
+
+ name = 'new'
+ email = 'new@registrar.test'
+ phone = '+1.2'
+ street = '123 Example'
+ city = 'Tallinn'
+ state = 'Harjumaa'
+ zip = '123456'
+ country_code = 'EE'
+
+ request_xml = <<-XML
+
+
+
+
+
+
+ #{name}
+
+ #{street}
+ #{city}
+ #{state}
+ #{zip}
+ #{country_code}
+
+
+ #{phone}
+ #{email}
+
+
+
+
+ 123
+
+
+
+
+ XML
+
+ assert_difference 'Contact.count' do
+ post epp_create_path, params: { frame: request_xml },
+ headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
+ end
+
+ assert_epp_response :completed_successfully
+ contact = Contact.find_by(name: name)
+ assert_equal name, contact.name
+ assert_equal email, contact.email
+ assert_equal phone, contact.phone
+ assert_not_empty contact.code
+ assert_equal city, contact.city
+ assert_equal street, contact.street
+ assert_equal zip, contact.zip
+ assert_equal country_code, contact.country_code
+ assert_equal state, contact.state
+ end
end
diff --git a/test/integration/epp/contact/update/base_test.rb b/test/integration/epp/contact/update/base_test.rb
index 3d332711f..98c0e4462 100644
--- a/test/integration/epp/contact/update/base_test.rb
+++ b/test/integration/epp/contact/update/base_test.rb
@@ -232,6 +232,99 @@ class EppContactUpdateBaseTest < EppTestCase
assert_epp_response :completed_successfully
end
+ def test_updates_address_when_address_processing_turned_on
+ @contact.update_columns(code: @contact.code.upcase)
+ Setting.address_processing = true
+
+ street = '123 Example'
+ city = 'Tallinn'
+ state = 'Harjumaa'
+ zip = '123456'
+ country_code = 'EE'
+
+ request_xml = <<-XML
+
+
+
+
+
+ #{@contact.code}
+
+
+
+ #{street}
+ #{city}
+ #{state}
+ #{zip}
+ #{country_code}
+
+
+
+
+
+
+
+ XML
+
+ post epp_update_path, params: { frame: request_xml },
+ headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
+
+ assert_epp_response :completed_successfully
+ @contact.reload
+
+ assert_equal city, @contact.city
+ assert_equal street, @contact.street
+ assert_equal zip, @contact.zip
+ assert_equal country_code, @contact.country_code
+ assert_equal state, @contact.state
+ end
+
+ def test_does_not_update_address_when_address_processing_turned_off
+ @contact.update_columns(code: @contact.code.upcase)
+
+ street = '123 Example'
+ city = 'Tallinn'
+ state = 'Harjumaa'
+ zip = '123456'
+ country_code = 'EE'
+
+ request_xml = <<-XML
+
+
+
+
+
+ #{@contact.code}
+
+
+
+ #{street}
+ #{city}
+ #{state}
+ #{zip}
+ #{country_code}
+
+
+
+
+
+
+
+ XML
+
+ post epp_update_path, params: { frame: request_xml },
+ headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
+
+ assert_epp_response :completed_without_address
+ @contact.reload
+
+ assert_nil @contact.city
+ assert_nil @contact.street
+ assert_nil @contact.zip
+ assert_nil @contact.country_code
+ assert_nil @contact.state
+ end
+
private
def make_contact_free_of_domains_where_it_acts_as_a_registrant(contact)