fix(field): remove bold prefix for error/caution/success validation

canonical · Apr 5, 2024 · ef320d9 · ef320d9
1 parent 1f0ae65
commit ef320d9
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 31 deletions.
diff --git a/src/components/Field/Field.test.tsx b/src/components/Field/Field.test.tsx
@@ -27,7 +27,7 @@ describe("Field ", () => {
       </Field>
     );
     expect(screen.getByRole("textbox")).toHaveAccessibleErrorMessage(
-      "Caution: Are you sure?"
+      "Are you sure?"
     );
     expect(screen.getByTestId("field")).toHaveClass("is-caution");
   });
@@ -43,7 +43,7 @@ describe("Field ", () => {
       </Field>
     );
     expect(screen.getByRole("textbox")).toHaveAccessibleErrorMessage(
-      "Caution: Are you sure?"
+      "Are you sure?"
     );
     expect(screen.getByTestId("field")).toHaveClass("is-caution");
   });
@@ -55,7 +55,7 @@ describe("Field ", () => {
       </Field>
     );
     expect(screen.getByRole("textbox")).toHaveAccessibleErrorMessage(
-      "Error: You can't do that"
+      "You can't do that"
     );
     expect(screen.getByTestId("field")).toHaveClass("is-error");
   });
@@ -71,7 +71,7 @@ describe("Field ", () => {
       </Field>
     );
     expect(screen.getByRole("textbox")).toHaveAccessibleErrorMessage(
-      "Error: You can't do that"
+      "You can't do that"
     );
     expect(screen.getByTestId("field")).toHaveClass("is-error");
   });
@@ -83,7 +83,7 @@ describe("Field ", () => {
       </Field>
     );
     expect(screen.getByRole("textbox")).toHaveAccessibleDescription(
-      "Success: You did it!"
+      "You did it!"
     );
     expect(screen.getByTestId("field")).toHaveClass("is-success");
   });
@@ -99,7 +99,7 @@ describe("Field ", () => {
       </Field>
     );
     expect(screen.getByRole("textbox")).toHaveAccessibleDescription(
-      "Success: You did it!"
+      "You did it!"
     );
     expect(screen.getByTestId("field")).toHaveClass("is-success");
   });

diff --git a/src/components/Field/Field.tsx b/src/components/Field/Field.tsx
@@ -107,11 +107,9 @@ const generateError = (
   if (!error && !caution && !success) {
     return null;
   }
-  const messageType =
-    (error && "Error") || (caution && "Caution") || (success && "Success");
   return (
     <p className="p-form-validation__message" id={validationId}>
-      <strong>{messageType}:</strong> {error || caution || success}
+      {error || caution || success}
     </p>
   );
 };

diff --git a/src/components/FormikField/FormikField.test.tsx b/src/components/FormikField/FormikField.test.tsx
@@ -29,9 +29,7 @@ describe("FormikField", () => {
       </Formik>
     );
 
-    expect(screen.getByRole("textbox")).toHaveAccessibleErrorMessage(
-      "Error: Uh oh!"
-    );
+    expect(screen.getByRole("textbox")).toHaveAccessibleErrorMessage("Uh oh!");
   });
 
   it("can hide the errors", () => {

diff --git a/src/components/Input/Input.test.tsx b/src/components/Input/Input.test.tsx
@@ -103,23 +103,17 @@ describe("Input", () => {
 
   it("can display an error for a text input", async () => {
     render(<Input error="Uh oh!" type="text" />);
-    expect(screen.getByRole("textbox")).toHaveAccessibleErrorMessage(
-      "Error: Uh oh!"
-    );
+    expect(screen.getByRole("textbox")).toHaveAccessibleErrorMessage("Uh oh!");
   });
 
   it("can display an error for a radiobutton", async () => {
     render(<Input error="Uh oh!" type="radio" />);
-    expect(screen.getByRole("radio")).toHaveAccessibleErrorMessage(
-      "Error: Uh oh!"
-    );
+    expect(screen.getByRole("radio")).toHaveAccessibleErrorMessage("Uh oh!");
   });
 
   it("can display an error for a checkbox", async () => {
     render(<Input error="Uh oh!" type="checkbox" />);
-    expect(screen.getByRole("checkbox")).toHaveAccessibleErrorMessage(
-      "Error: Uh oh!"
-    );
+    expect(screen.getByRole("checkbox")).toHaveAccessibleErrorMessage("Uh oh!");
   });
 
   it("can display help for a text input", async () => {

diff --git a/src/components/PasswordToggle/PasswordToggle.test.tsx b/src/components/PasswordToggle/PasswordToggle.test.tsx
@@ -50,7 +50,7 @@ describe("PasswordToggle", () => {
   it("can display an error", async () => {
     render(<PasswordToggle error="Uh oh!" id="test-id" label="password" />);
     expect(screen.getByLabelText("password")).toHaveAccessibleErrorMessage(
-      "Error: Uh oh!"
+      "Uh oh!"
     );
   });
 

diff --git a/src/components/Select/Select.test.tsx b/src/components/Select/Select.test.tsx
@@ -55,9 +55,7 @@ describe("Select", () => {
 
   it("can display an error", async () => {
     render(<Select error="Uh oh!" />);
-    expect(screen.getByRole("combobox")).toHaveAccessibleErrorMessage(
-      "Error: Uh oh!"
-    );
+    expect(screen.getByRole("combobox")).toHaveAccessibleErrorMessage("Uh oh!");
   });
 
   it("can display help", async () => {

diff --git a/src/components/Slider/Slider.test.tsx b/src/components/Slider/Slider.test.tsx
@@ -35,9 +35,7 @@ describe("Slider", () => {
         error="Uh oh!"
       />
     );
-    expect(screen.getByRole("slider")).toHaveAccessibleErrorMessage(
-      "Error: Uh oh!"
-    );
+    expect(screen.getByRole("slider")).toHaveAccessibleErrorMessage("Uh oh!");
   });
 
   it("can display help", async () => {

diff --git a/src/components/Textarea/Textarea.test.tsx b/src/components/Textarea/Textarea.test.tsx
@@ -32,9 +32,7 @@ describe("Textarea ", () => {
 
   it("can display an error for a text input", async () => {
     render(<Textarea error="Uh oh!" />);
-    expect(screen.getByRole("textbox")).toHaveAccessibleErrorMessage(
-      "Error: Uh oh!"
-    );
+    expect(screen.getByRole("textbox")).toHaveAccessibleErrorMessage("Uh oh!");
   });
 
   it("can display help for a text input", async () => {