🤪

aslilac · aslilac · commit 3b4c28f42171 · 2024-04-11T19:02:54.000Z
diff --git a/site/e2e/global.setup.ts b/site/e2e/global.setup.ts
@@ -2,6 +2,7 @@ import { expect, test } from "@playwright/test";
 import { Language } from "pages/CreateUserPage/CreateUserForm";
 import * as constants from "./constants";
 import { storageState } from "./playwright.config";
+import { expectUrl } from "./expectUrl";
 
 test("setup deployment", async ({ page }) => {
   await page.goto("/", { waitUntil: "domcontentloaded" });
@@ -12,7 +13,7 @@ test("setup deployment", async ({ page }) => {
   await page.getByLabel(Language.passwordLabel).fill(constants.password);
   await page.getByTestId("create").click();
 
-  await expect(page).toHaveURL(/\/workspaces.*/);
+  await expectUrl(page).toHavePathName("/workspaces");
   await page.context().storageState({ path: storageState });
 
   await page.getByTestId("button-select-template").isVisible();
diff --git a/site/e2e/tests/updateTemplate.spec.ts b/site/e2e/tests/updateTemplate.spec.ts
@@ -5,6 +5,7 @@ import {
   requiresEnterpriseLicense,
   updateTemplateSettings,
 } from "../helpers";
+import { expectUrl } from "../expectUrl";
 
 test("template update with new name redirects on successful submit", async ({
   page,
@@ -25,7 +26,7 @@ test("add and remove a group", async ({ page }) => {
   await page.goto(`/templates/${templateName}/settings/permissions`, {
     waitUntil: "domcontentloaded",
   });
-  await expect(page).toHaveURL(
+  await expectUrl(page).toHavePathName(
     `/templates/${templateName}/settings/permissions`,
   );
 
@@ -55,7 +56,7 @@ test("require latest version", async ({ page }) => {
   await page.goto(`/templates/${templateName}/settings`, {
     waitUntil: "domcontentloaded",
   });
-  await expect(page).toHaveURL(`/templates/${templateName}/settings`);
+  await expectUrl(page).toHavePathName(`/templates/${templateName}/settings`);
   let checkbox = await page.waitForSelector("#require_active_version");
   await checkbox.click();
   await page.getByTestId("form-submit").click();
diff --git a/site/src/pages/CreateTokenPage/CreateTokenForm.tsx b/site/src/pages/CreateTokenPage/CreateTokenForm.tsx
@@ -116,6 +116,7 @@ export const CreateTokenForm: FC<CreateTokenFormProps> = ({
 
             {lifetimeDays === "custom" && (
               <TextField
+                data-chromatic="ignore"
                 type="date"
                 label="Expires on"
                 defaultValue={dayjs().add(expDays, "day").format("YYYY-MM-DD")}
