[Hexlet#260] fix workspace email validation message interpolation wit…

…h test
d1z3d · Jun 15, 2024 · 4cdfb60 · 4cdfb60
1 parent c5ccfa6
commit 4cdfb60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/io/hexlet/typoreporter/web/model/WorkspaceUserModel.java b/src/main/java/io/hexlet/typoreporter/web/model/WorkspaceUserModel.java
@@ -12,6 +12,7 @@
 @NoArgsConstructor
 public class WorkspaceUserModel {
 
-    @Email(regexp = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$", message = "The email \"{0}\" is not valid")
+    @Email(regexp = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$",
+        message = "The email \"${validatedValue}\" is not valid")
     private String email;
 }
diff --git a/src/test/java/io/hexlet/typoreporter/web/WorkspaceControllerIT.java b/src/test/java/io/hexlet/typoreporter/web/WorkspaceControllerIT.java
@@ -403,7 +403,7 @@ void addUserNonValidEmailTest() throws Exception {
                     .with(csrf()))
             .andReturn();
         var body = response.getResponse().getContentAsString();
-        assertThat(body).contains("The email %s is not valid", ACCOUNT_INCORRECT_EMAIL);
+        assertThat(body).contains(String.format("The email &quot;%s&quot; is not valid", ACCOUNT_INCORRECT_EMAIL));
     }
 }