Skip to content

Commit

Permalink
Try to fix tests - they're flaky locally so not sure
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter York committed Dec 4, 2024
1 parent 6c462cf commit c1f1b45
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions tests/edits.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ test("edit an area, then cancel", async ({ page }) => {
await clickMap(page, 500, 500);
await clickMap(page, 400, 500);
await clickMap(page, 400, 600);
await page.getByRole("button", { name: "Finish" }).click();
await page.getByRole("button", { name: "Finish" }).first().click();

await page.getByRole("link", { name: "Untitled area" }).click();
await clickMap(page, 430, 530);
Expand All @@ -29,7 +29,7 @@ test("edit a route, then cancel", async ({ page }) => {
await page.getByRole("button", { name: "New route" }).click();
await clickMap(page, 500, 500);
await clickMap(page, 400, 500);
await page.getByRole("button", { name: "Finish" }).click();
await page.getByRole("button", { name: "Finish" }).first().click();

await page
.getByRole("link", { name: "Route from ??? and Beach Green to ???" })
Expand All @@ -48,7 +48,7 @@ test("the viewport changes only once when opening a form", async ({ page }) => {
// Create a point, and make sure the viewport hasn't changed
await page.getByRole("button", { name: "New point" }).click();
await clickMap(page, 500, 500);
await page.getByRole("button", { name: "Finish" }).click();
await page.getByRole("button", { name: "Finish" }).first().click();
await expect.soft(new URL(page.url()).hash).toEqual(defaultViewport);

// Open the form from the sidebar. The viewport should change
Expand Down
2 changes: 1 addition & 1 deletion tests/errors.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ test.skip("other tools work when route tool doesn't load", async ({ page }) => {
await page.getByRole("button", { name: "New point" }).click();
await page.getByLabel("Name").fill("Pointless");
await clickMap(page, 500, 500);
await page.getByRole("button", { name: "Finish" }).click();
await page.getByRole("button", { name: "Finish" }).first().click();

await expect(page.getByRole("link", { name: "Pointless" })).toBeVisible();
});
Expand Down
18 changes: 9 additions & 9 deletions tests/modes.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ test("creating a new point opens a form", async ({ page }) => {
await clickMap(page, 500, 500);
await page.getByLabel("Name").fill("Point name");
await page.getByLabel("Description").click();
await page.getByRole("button", { name: "Finish" }).click();
await page.getByRole("button", { name: "Finish" }).first().click();

await page.getByRole("link", { name: "Point name" }).click();
});
Expand All @@ -23,7 +23,7 @@ test("creating a new area opens a form", async ({ page }) => {
await clickMap(page, 500, 500);
await clickMap(page, 400, 500);
await clickMap(page, 400, 600);
await page.getByRole("button", { name: "Finish" }).click();
await page.getByRole("button", { name: "Finish" }).first().click();

await page.getByRole("link", { name: "Area name" }).click();
});
Expand All @@ -36,7 +36,7 @@ test("creating a new area and canceling doesn't save anything", async ({
await clickMap(page, 400, 500);
await clickMap(page, 400, 600);

await page.getByRole("button", { name: "Cancel" }).click();
await page.getByRole("button", { name: "Cancel" }).first().click();
await expect(
page.getByRole("link", { name: "Untitled area" }),
).not.toBeVisible();
Expand All @@ -50,7 +50,7 @@ test("creating a new route opens a form, and auto-fill sets its name", async ({
await page.getByRole("button", { name: "New route" }).click();
await clickMap(page, 500, 500);
await clickMap(page, 400, 500);
await page.getByRole("button", { name: "Finish" }).click();
await page.getByRole("button", { name: "Finish" }).first().click();

// The route immediately has a name
await page
Expand All @@ -59,12 +59,12 @@ test("creating a new route opens a form, and auto-fill sets its name", async ({

// Change it
await page.getByLabel("Name").fill("New route name");
await page.getByRole("button", { name: "Finish" }).click();
await page.getByRole("button", { name: "Finish" }).first().click();
await page.getByRole("link", { name: "New route name" }).click();

// Then auto-fill to change it back
await page.getByText("Auto-fill").click();
await page.getByRole("button", { name: "Finish" }).click();
await page.getByRole("button", { name: "Finish" }).first().click();
await expect(
page.getByRole("link", { name: "Route from ??? and Beach Green to ???" }),
).toBeVisible();
Expand All @@ -76,7 +76,7 @@ test("editing geometry of an area works", async ({ page }) => {
await clickMap(page, 241, 509);
await clickMap(page, 235, 431);
await clickMap(page, 465, 459);
await page.getByRole("button", { name: "Finish" }).click();
await page.getByRole("button", { name: "Finish" }).first().click();

// Make sure the form is closed, back in list mode
await expect(page.getByRole("link", { name: "Untitled area" })).toBeVisible();
Expand All @@ -91,7 +91,7 @@ test("adding interventions, then deleting one, then adding another", async ({
await page.getByRole("button", { name: "New route" }).click();
await clickMap(page, 522, 468);
await clickMap(page, 192, 513);
await page.getByRole("button", { name: "Finish" }).click();
await page.getByRole("button", { name: "Finish" }).first().click();

await page
.getByRole("link", {
Expand All @@ -103,7 +103,7 @@ test("adding interventions, then deleting one, then adding another", async ({
await page.getByRole("button", { name: "New route" }).click();
await clickMap(page, 196, 375);
await clickMap(page, 481, 399);
await page.getByRole("button", { name: "Finish" }).click();
await page.getByRole("button", { name: "Finish" }).first().click();

await expect(
page.getByRole("link", {
Expand Down

0 comments on commit c1f1b45

Please sign in to comment.