diff --git a/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java b/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java index 1f1753437..022125e60 100644 --- a/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java +++ b/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java @@ -269,8 +269,7 @@ public class RegistrarSettingsAction implements Runnable, JsonActionRunner.JsonA throw new ContactRequirementException(t); } } - ensurePhoneNumberNotRemovedForContactTypes( - oldContactsByType, newContactsByType, Type.ABUSE, Type.TECH); + ensurePhoneNumberNotRemovedForContactTypes(oldContactsByType, newContactsByType, Type.TECH); } /** diff --git a/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java b/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java index 2c6f1dc0e..0112b77d8 100644 --- a/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java +++ b/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java @@ -128,28 +128,4 @@ public class ContactSettingsTest extends RegistrarSettingsActionTestCase { assertThat(response).containsEntry("message", "Please provide a phone number for at least one " + RegistrarContact.Type.TECH.getDisplayName() + " contact"); } - - @Test - public void testPost_updateContacts_requireAbusePhone_error() throws Exception { - // First make the contact a abuse contact as well. - Registrar registrar = Registrar.loadByClientId(CLIENT_ID); - RegistrarContact rc = AppEngineRule.makeRegistrarContact2() - .asBuilder() - .setTypes(ImmutableSet.of(RegistrarContact.Type.ADMIN, RegistrarContact.Type.ABUSE)) - .build(); - // Lest we anger the timestamp inversion bug. - persistResource(registrar); - persistSimpleResource(rc); - - // Now try to remove the phone number. - rc = rc.asBuilder().setPhoneNumber(null).build(); - Map reqJson = registrar.toJsonMap(); - reqJson.put("contacts", ImmutableList.of(rc.toJsonMap())); - Map response = action.handleJsonRequest(ImmutableMap.of( - "op", "update", - "args", reqJson)); - assertThat(response).containsEntry("status", "ERROR"); - assertThat(response).containsEntry("message", "Please provide a phone number for at least one " - + RegistrarContact.Type.ABUSE.getDisplayName() + " contact"); - } }