From fb25b625f3d000e521b5d5c51df6f75cdff544e7 Mon Sep 17 00:00:00 2001 From: jianglai Date: Fri, 14 Apr 2017 11:58:21 -0700 Subject: [PATCH] Provide better error message for abuse contact phone number Make it clear that all the user need to do to rectify is to provide a phone number ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=153191178 --- .../ui/server/registrar/RegistrarSettingsAction.java | 3 ++- .../registry/ui/server/registrar/ContactSettingsTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java b/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java index 5f311ce52..1f1753437 100644 --- a/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java +++ b/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java @@ -286,7 +286,8 @@ public class RegistrarSettingsAction implements Runnable, JsonActionRunner.JsonA && !any(newContactsByType.get(type), HAS_PHONE)) { throw new ContactRequirementException( String.format( - "At least one %s contact must have a phone number", type.getDisplayName())); + "Please provide a phone number for at least one %s contact", + type.getDisplayName())); } } } diff --git a/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java b/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java index 839892243..52f0cf203 100644 --- a/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java +++ b/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java @@ -125,8 +125,8 @@ public class ContactSettingsTest extends RegistrarSettingsActionTestCase { "op", "update", "args", reqJson)); assertThat(response).containsEntry("status", "ERROR"); - assertThat(response).containsEntry("message", "At least one " - + RegistrarContact.Type.TECH.getDisplayName() + " contact must have a phone number"); + assertThat(response).containsEntry("message", "Please provide a phone number for at least one " + + RegistrarContact.Type.TECH.getDisplayName() + " contact"); } @Test @@ -149,7 +149,7 @@ public class ContactSettingsTest extends RegistrarSettingsActionTestCase { "op", "update", "args", reqJson)); assertThat(response).containsEntry("status", "ERROR"); - assertThat(response).containsEntry("message", "At least one " - + RegistrarContact.Type.ABUSE.getDisplayName() + " contact must have a phone number"); + assertThat(response).containsEntry("message", "Please provide a phone number for at least one " + + RegistrarContact.Type.ABUSE.getDisplayName() + " contact"); } }