Merge pull request #127 from funidata/fix-e2e-date

Fix flawed logic in date navigation test
funidata · Aug 7, 2024 · 04b86c6 · 04b86c6
2 parents f68afac + e4ac8aa
commit 04b86c6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/e2e/tests/controls.mobile.spec.ts b/e2e/tests/controls.mobile.spec.ts
@@ -9,15 +9,17 @@ test.describe("Browse week mobile", () => {
 
   test("Should browse weeks forward", async ({ page, t }) => {
     const jump = 3;
-    for (let i = 0; i < jump; i++)
+    for (let i = 0; i < jump; i++) {
       await page.getByRole("button", { name: t("controls.aria.nextWeek") }).click();
+    }
     await expect(page).toHaveURL(`/entries/week/${startingWeek + jump}`);
   });
 
   test("Should browse weeks backward", async ({ page, t }) => {
     const jump = 3;
-    for (let i = 0; i < jump; i++)
+    for (let i = 0; i < jump; i++) {
       await page.getByRole("button", { name: t("controls.aria.prevWeek") }).click();
+    }
     await expect(page).toHaveURL(`/entries/week/${startingWeek - jump}`);
   });
 
@@ -29,8 +31,10 @@ test.describe("Browse week mobile", () => {
     await expect(page).toHaveURL(`/entries/week/${currentWeek}`);
   });
 
-  test("Should go to specific week", async ({ page }) => {
+  test("Should go to specific week", async ({ page, dayjs }) => {
     const jump = 4;
+    const startingWeek = dayjs().week();
+    await page.goto(`/entries/week/${startingWeek}`);
     await page.getByRole("combobox", { name: String(startingWeek) }).click();
     await page.getByRole("option", { name: String(startingWeek + jump) }).click();
     await expect(page).toHaveURL(`/entries/week/${startingWeek + jump}`);

diff --git a/e2e/tests/controls.spec.ts b/e2e/tests/controls.spec.ts
@@ -9,15 +9,17 @@ test.describe("Browse week", () => {
 
   test("Should browse weeks forward", async ({ page, t }) => {
     const jump = 3;
-    for (let i = 0; i < jump; i++)
+    for (let i = 0; i < jump; i++) {
       await page.getByRole("button", { name: t("controls.aria.nextWeek") }).click();
+    }
     await expect(page).toHaveURL(`/entries/week/${startingWeek + jump}`);
   });
 
   test("Should browse weeks backward", async ({ page, t }) => {
     const jump = 3;
-    for (let i = 0; i < jump; i++)
+    for (let i = 0; i < jump; i++) {
       await page.getByRole("button", { name: t("controls.aria.prevWeek") }).click();
+    }
     await expect(page).toHaveURL(`/entries/week/${startingWeek - jump}`);
   });
 
@@ -29,8 +31,10 @@ test.describe("Browse week", () => {
     await expect(page).toHaveURL(`/entries/week/${currentWeek}`);
   });
 
-  test("Should go to specific week", async ({ page }) => {
+  test("Should go to specific week", async ({ page, dayjs }) => {
     const jump = 4;
+    const startingWeek = dayjs().week();
+    await page.goto(`/entries/week/${startingWeek}`);
     await page.getByRole("combobox", { name: String(startingWeek) }).click();
     await page.getByRole("option", { name: String(startingWeek + jump) }).click();
     await expect(page).toHaveURL(`/entries/week/${startingWeek + jump}`);