From 671f338ce2a80863f16393375670e9f13fc7c031 Mon Sep 17 00:00:00 2001
From: Alec M <alec.mattu@nih.gov>
Date: Tue, 28 Jan 2025 11:50:14 -0500
Subject: [PATCH] Reverse validation order Fixes the test coverage because
 isValidEmail fails first

---
 src/components/Footer/NewsletterForm.test.tsx | 12 ++++++++++++
 src/components/Footer/NewsletterForm.tsx      |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/Footer/NewsletterForm.test.tsx b/src/components/Footer/NewsletterForm.test.tsx
index 610b637e..d1ca3c61 100644
--- a/src/components/Footer/NewsletterForm.test.tsx
+++ b/src/components/Footer/NewsletterForm.test.tsx
@@ -89,6 +89,18 @@ describe("Implementation Requirements", () => {
     }
   );
 
+  it("should not submit the newsletter form if the email is invalid (empty)", async () => {
+    const { getByTestId } = render(<NewsletterForm data-testid="newsletter-form" />);
+
+    userEvent.click(
+      within(getByTestId("newsletter-form")).getByRole("button", {
+        name: "Sign up",
+      })
+    );
+
+    expect(mockWindowOpen).not.toHaveBeenCalled();
+  });
+
   it("should submit the form to the correct URL", async () => {
     const { getByTestId } = render(<NewsletterForm data-testid="newsletter-form" />);
 
diff --git a/src/components/Footer/NewsletterForm.tsx b/src/components/Footer/NewsletterForm.tsx
index 66984c6e..9519a287 100644
--- a/src/components/Footer/NewsletterForm.tsx
+++ b/src/components/Footer/NewsletterForm.tsx
@@ -77,8 +77,8 @@ const NewsletterForm: FC<NewsletterFormProps> = forwardRef<
             className="signUpInputBox"
             {...register("email", {
               validate: {
-                validEmail: isValidEmail,
                 notEmpty: isNotEmpty,
+                validEmail: isValidEmail,
               },
               required: "This field is required.",
             })}