reverted e2e changes

src/app/functions/server/getRelevantGuidedSteps.ts

@@ -70,7 +70,6 @@ export type StepLinkWithStatus = (typeof stepLinks)[number] & {
 };
 
 export function isGuidedResolutionInProgress(stepId: StepLink["id"]) {
-  if (stepId === "Scan" || stepId === "Done") return false; //this fixes a lint check
   const inProgressStepIds = stepLinks
     .filter((step) => step.id !== "Scan" && step.id !== "Done")
     .map(({ id }) => id);

src/e2e/pages/purchasePage.ts

@@ -78,8 +78,8 @@
     expect(pwdToUse).not.toBeUndefined();
 
     //away from mozilla
     const pagePromise = context.waitForEvent("page");
     await this.paypalButton.click();
     const newPage = await pagePromise;
     await newPage.waitForLoadState();
     await newPage.waitForURL(/.*paypal\.com.*checkout.*/);
@@ -121,7 +121,7 @@
       (await this.planDetails.textContent()) as string,
     );
     expect(planDetails).toContain(
-      `${process.env.E2E_TEST_ENV!.match(/prod|local/) ? "yearly" : "every 2 months"}`,
+      `${process.env.E2E_TEST_ENV === "prod" ? "yearly" : "every 2 months"}`,
     );
   }
 

src/e2e/specs/dashboard.spec.ts

@@ -10,6 +10,7 @@
   removeUnicodeChars,
   clickOnATagCheckDomain,
   escapeRegExp,
+  forceLoginAs,
 } from "../utils/helpers.js";
 
 // bypass login
@@ -375,7 +376,7 @@
 test.describe(`${process.env.E2E_TEST_ENV} - Breaches Dashboard - Breaches Scan, Continuous Protection, Data Profile Actions`, () => {
   test.use({ storageState: { cookies: [], origins: [] } });
 
   test.beforeEach(async ({ landingPage, page, authPage, welcomePage }) => {
     test.slow(
       true,
       "this test runs through the welcome scan flow, increasing timeout to address it",
@@ -425,6 +426,7 @@
       const count = await dashboardPage.allExposures.count();
       // Fix first exposure
       await dashboardPage.markAsFixed.click();
+
       for (let i = 1; i < count; i++) {
         const exposure = dashboardPage.allExposures.nth(i);
         await exposure.click();
@@ -718,14 +720,13 @@
 });
 
 test.describe(`${process.env.E2E_TEST_ENV} - Breaches Dashboard - Data Breaches`, () => {
-  test.beforeEach(async ({ dashboardPage, page }) => {
-    await dashboardPage.open();
-
-    try {
-      await checkAuthState(page);
-    } catch {
-      console.log("[E2E_LOG] - No fxa auth required, proceeding...");
-    }
+  test.beforeEach(async ({ landingPage, page, authPage }) => {
+    const emailToUse = process.env
+      .E2E_TEST_ACCOUNT_EMAIL_EXPOSURES_STARTED as string;
+    const pwdToUse = process.env.E2E_TEST_ACCOUNT_PASSWORD as string;
+    expect(emailToUse).not.toBeUndefined();
+    expect(pwdToUse).not.toBeUndefined();
+    await forceLoginAs(emailToUse, pwdToUse, page, landingPage, authPage);
   });
 
   test("Verify that the High risk data breaches step is displayed correctly", async ({

src/e2e/specs/landing.spec.ts

@@ -309,8 +309,14 @@ test.describe(`${process.env.E2E_TEST_ENV} - Verify the Landing Page Functionali
     await authPage.enterPassword();
 
     // verify dashboard redirect
-    const successUrl = process.env.E2E_TEST_BASE_URL + "/user/dashboard";
-    expect(page.url()).toContain(successUrl);
+    const successUrl =
+      process.env.E2E_TEST_BASE_URL +
+      `${
+        process.env.E2E_TEST_ENV === "local"
+          ? "/user/welcome"
+          : "/user/dashboard"
+      }`;
+    expect(page.url()).toBe(successUrl);
   });
 
   test('Verify the "Start free monitoring" button UI and functionality with existing account', async ({
@@ -330,7 +336,13 @@ test.describe(`${process.env.E2E_TEST_ENV} - Verify the Landing Page Functionali
     await authPage.enterPassword();
 
     // verify dashboard redirect
-    const successUrl = process.env.E2E_TEST_BASE_URL + "/user/dashboard";
-    expect(page.url()).toContain(successUrl);
+    const successUrl =
+      process.env.E2E_TEST_BASE_URL +
+      `${
+        process.env.E2E_TEST_ENV === "local"
+          ? "/user/welcome"
+          : "/user/dashboard"
+      }`;
+    expect(page.url()).toBe(successUrl);
   });
 });

src/e2e/utils/helpers.ts

@@ -170,9 +170,7 @@ export const clickOnATagCheckDomain = async (
   page: Page,
 ) => {
   if (typeof host === "string")
-    host = new RegExp(
-      escapeRegExp(host.replace(/^(https?:\/\/)/, "").replace(/:\d+$/, "")),
-    );
+    host = new RegExp(escapeRegExp(host.replace(/^(https?:\/\/)/, "")));
   if (typeof path === "string") path = new RegExp(".*" + path + ".*");
 
   const href = await aTag.getAttribute("href");