Merge branch 'main' into MNTOR-5107-test

Author: Vinnl

.env

@@ -139,7 +139,6 @@ MOZILLA_VPN_LANDING_URL=https://www-dev.allizom.org/products/vpn
 # have seen data breach results before, will be able to see their known breaches
 # first:
 BROKER_SCAN_RELEASE_DATE=2024-02-06
-BROKER_SCAN_SHUTDOWN_DATE=2025-12-17
 
 MONTHLY_SUBSCRIBERS_QUOTA=
 MONTHLY_SCANS_QUOTA=

.github/dependabot.yml

@@ -24,6 +24,7 @@ updates:
           - "eslint-*"
         exclude-patterns:
           - "eslint-config-next"
+          - "eslint-plugin-storybook"
       jest:
         patterns:
           - "babel-jest"
@@ -49,6 +50,7 @@ updates:
         patterns:
           - "storybook"
           - "@storybook/*"
+          - "eslint-plugin-storybook"
         exclude-patterns:
           - "eslint-config-next"
       fluent:

functional-tests/fixtures/baseTest.ts

@@ -13,11 +13,11 @@ export const defaultLocalForcedFeatureFlags: FeatureFlagName[] = [
   "AutomaticRemovalCsatSurvey",
   "AdditionalRemovalStatuses",
   "DataBrokerRemovalTimeEstimateLabel",
-  "LandingPageRedesign",
   "DataBrokerRemovalAttempts",
   "SidebarNavigationRedesign",
   "EditScanProfileDetails",
   "SubPlat3",
+  "FreeOnly",
 ];
 
 const test = baseTest.extend<{

functional-tests/tests/auth.spec.ts

@@ -43,8 +43,8 @@ test.describe(`Verify authentication [${process.env.E2E_TEST_ENV}]`, () => {
     async ({ page }, testInfo) => {
       if (testInfo.project.use.countryCode === "us") {
         // shows the onboarding flow
-        const heading = page.locator("h1", {
-          hasText: "Welcome to ⁨Monitor⁩. Let’s find your exposed information.",
+        const heading = page.locator("h2", {
+          hasText: "View all sites where your info is exposed",
         });
         expect(heading).toBeVisible();
       } else {

functional-tests/tests/global-teardown.ts

@@ -31,7 +31,7 @@ async function deleteTestUserAccounts(browser: Browser) {
     await page.goto(`${getBaseTestEnvUrl()}/user/settings/manage-account`);
 
     await page.getByRole("button", { name: "Open user menu" }).click();
-    const manageAccountLink = page.getByRole("link", {
+    const manageAccountLink = page.getByRole("menuitem", {
       name: "Manage your ⁨Mozilla account⁩",
       exact: false,
     });

functional-tests/tests/landing.spec.ts

@@ -18,16 +18,15 @@ test.describe(`Verify landing page [${process.env.E2E_TEST_ENV}]`, () => {
 
   test("landing page loads", async ({ page }, testInfo) => {
     if (
-      process.env.E2E_TEST_ENV !== "local" &&
       testInfo.project.use.countryCode === "nl"
     ) {
-      const heading = page.locator("h1", {
-        hasText: "Ontdek waar uw privégegevens zijn gelekt – en neem ze terug",
+      const heading = page.getByRole("heading", {
+        name: "Ontdek waar uw privégegevens zijn gelekt – en neem ze terug",
       });
       await expect(heading).toBeVisible();
     } else {
-      const heading = page.locator("h2", {
-        hasText: "Find where your personal info is exposed — and take it back",
+      const heading = page.getByRole("heading", {
+        name: "Find where your private info is exposed — and take it back",
       });
       await expect(heading).toBeVisible();
     }

functional-tests/tests/subscriptions.spec.ts

@@ -15,24 +15,12 @@ async function goToFxA(
   page: Page,
   {
     countryCode,
-    isMobile,
   }: {
     countryCode?: string;
     isMobile?: boolean;
   },
 ) {
   await page.goto(`${getBaseTestEnvUrl()}/`);
-  if (
-    isMobile &&
-    (process.env.E2E_TEST_ENV === "local" || countryCode === "us")
-  ) {
-    const mobileMenuButtonLabel =
-      countryCode === "nl" ? "Menu uitvouwen" : "Expand menu";
-    const mobileMenuButton = page.getByRole("button", {
-      name: mobileMenuButtonLabel,
-    });
-    await mobileMenuButton.click();
-  }
 
   const signInButtonLabel = countryCode === "nl" ? "Aanmelden" : "Sign In";
   await page.getByRole("button", { name: signInButtonLabel }).first().click();

functional-tests/utils/fxa.ts

@@ -4,7 +4,7 @@
 
 plus-shutdown-banner-button-learn-more = Learn more
 plus-shutdown-banner-button-close = Close
-plus-shutdown-banner-free-runup-heading = Update: { -brand-monitor } data broker scan results will be deleted in 30 days
+plus-shutdown-banner-free-runup-heading = { -brand-monitor } data broker scan results will be deleted on December 17
 plus-shutdown-banner-free-runup-subheading = View your results ahead of the the { -brand-monitor-plus } shutdown.
 plus-shutdown-banner-free-shutdown-heading = Data broker scan results have been deleted, but { -brand-monitor } lives on
 plus-shutdown-banner-free-shutdown-subheading = You can still continue to access data breach monitoring to help keep your info safe online.

locales-pending/plus-shutdown.ftl

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 public-nav-name = { -brand-mozilla-monitor }
-landing-all-hero-title = Canfod lle mae'ch manylion preifat yn cael eu hamlygu — a'u cipio nôl
+landing-all-hero-title = Gweld lle mae'ch manylion preifat wedi'u datgelu — a'u cael yn nôl
 landing-all-hero-lead = Rydym yn sganio tor-data i weld a yw'ch data wedi'u datgelu ac yn cynnig camau i chi i'w drwsio.
 landing-all-hero-emailform-input-placeholder = [email protected]
 landing-all-hero-emailform-input-label = Rhowch eich cyfeiriad e-bost i wirio am ddatguddiadau tor-data.