Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✅ - test: attempt to make the tests less flaky #113

Merged
merged 1 commit into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/components/dropdown/dropdown.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,6 @@ export const ActivateOnFocus: Story = {
await waitFor(() => expect(canvas.queryByRole("dialog")).toBeNull());
await userEvent.tab({ shift: true, delay: 10 });

await waitFor(() =>
expect(document.activeElement?.textContent).not.toBe("Hover me!"),
);

await userEvent.tab({ delay: 10 });
await waitFor(() =>
expect(document.activeElement?.textContent).toBe("Zaaktypen"),
Expand Down
75 changes: 44 additions & 31 deletions src/components/form/form/form.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Meta, StoryObj } from "@storybook/react";
import { expect, userEvent, within } from "@storybook/test";
import { expect, userEvent, waitFor, within } from "@storybook/test";
import { Formik } from "formik";
import * as React from "react";

Expand Down Expand Up @@ -30,18 +30,23 @@ const getParameterFromPre = (pre: HTMLElement, parameter: string) => {
console.error("Error parsing JSON", error);
}
};
const getLogFromCanvas = (canvasElement: HTMLElement) => {
const getLogFromCanvas = async (canvasElement: HTMLElement) => {
const canvas = within(canvasElement);
return canvas.getByRole("log");
return await canvas.findByRole("log");
};

const expectLogToBe = (
const expectLogToBe = async (
canvasElement: HTMLElement,
parameter: string,
value: unknown,
) => {
const pre = getLogFromCanvas(canvasElement);
expect(getParameterFromPre(pre, parameter)).toEqual(value);
await waitFor(
async () => {
const pre = await getLogFromCanvas(canvasElement);
return expect(getParameterFromPre(pre, parameter)).toEqual(value);
},
{ timeout: 3000 },
);
};

const playFormComponent = async ({
Expand Down Expand Up @@ -71,37 +76,41 @@ const playFormComponent = async ({

await userEvent.clear(firstName);
await userEvent.type(firstName, "John", { delay: 10 });
expect(firstName).toHaveValue("John");
expectLogToBe(canvasElement, "first_name", typedResults ? "John" : "John");
await expect(firstName).toHaveValue("John");
await expectLogToBe(
canvasElement,
"first_name",
typedResults ? "John" : "John",
);

await userEvent.clear(lastName);
await userEvent.type(lastName, "Doe", { delay: 10 });
expect(lastName).toHaveValue("Doe");
expectLogToBe(canvasElement, "last_name", typedResults ? "Doe" : "Doe");
await expect(lastName).toHaveValue("Doe");
await expectLogToBe(canvasElement, "last_name", typedResults ? "Doe" : "Doe");

await userEvent.clear(age);
await userEvent.type(age, "33", { delay: 10 });
expect(age).toHaveValue(33);
expectLogToBe(canvasElement, "age", typedResults ? 33 : "33");
await expect(age).toHaveValue(33);
await expectLogToBe(canvasElement, "age", typedResults ? 33 : "33");

await userEvent.click(schoolYear, { delay: 10 });
const junior = await canvas.findByText("Junior");
await userEvent.click(junior, { delay: 10 });
expect(schoolYear).toHaveTextContent("Junior");
expectLogToBe(
await expect(schoolYear).toHaveTextContent("Junior");
await expectLogToBe(
canvasElement,
"school_year",
typedResults ? "Junior" : "Junior",
);

await userEvent.clear(address);
await userEvent.type(address, "Keizersgracht 117", { delay: 10 });
expect(address).toHaveValue("Keizersgracht 117");
await expect(address).toHaveValue("Keizersgracht 117");

await userEvent.clear(address_addition);
await userEvent.type(address_addition, "2", { delay: 10 });
expect(address_addition).toHaveValue(2);
expectLogToBe(
await expect(address_addition).toHaveValue(2);
await expectLogToBe(
canvasElement,
"address",
typedResults ? ["Keizersgracht 117", 2] : ["Keizersgracht 117", "2"],
Expand All @@ -110,8 +119,8 @@ const playFormComponent = async ({
await userEvent.clear(dateOfBirth);
await userEvent.type(dateOfBirth, "2023-09-15", { delay: 10 });
await userEvent.type(dateOfBirth, "{enter}");
expect(dateOfBirth).toHaveValue("09/15/2023");
expectLogToBe(
await expect(dateOfBirth).toHaveValue("09/15/2023");
await expectLogToBe(
canvasElement,
"date_of_birth",
typedResults ? "2023-09-15" : "2023-09-15",
Expand All @@ -120,28 +129,32 @@ const playFormComponent = async ({
await userEvent.click(schoolYear);
const senior = await canvas.findByText("Senior");
await userEvent.click(senior);
expect(schoolYear).toHaveTextContent("Senior");
expectLogToBe(canvasElement, "school_year", "Senior");
await expect(schoolYear).toHaveTextContent("Senior");
await expectLogToBe(canvasElement, "school_year", "Senior");

await userEvent.click(english);
expect(english).toBeChecked();
await expect(english).toBeChecked();
await userEvent.click(math);
expect(math).toBeChecked();
expectLogToBe(canvasElement, "courses", ["english", "math"]);
await expect(math).toBeChecked();
await expectLogToBe(canvasElement, "courses", ["english", "math"]);

await userEvent.click(yes);
expect(yes).toBeChecked();
expectLogToBe(canvasElement, "subscribe_newsletter", "yes");
await expect(yes).toBeChecked();
await expectLogToBe(canvasElement, "subscribe_newsletter", "yes");
await userEvent.click(no);
expect(no).toBeChecked();
expectLogToBe(canvasElement, "subscribe_newsletter", "no");
await expect(no).toBeChecked();
await expectLogToBe(canvasElement, "subscribe_newsletter", "no");

await userEvent.click(acceptTos);
expect(acceptTos).toBeChecked();
await expect(acceptTos).toBeChecked();
if (formik) {
expectLogToBe(canvasElement, "accept_tos", ["on"]);
await expectLogToBe(canvasElement, "accept_tos", ["on"]);
} else {
expectLogToBe(canvasElement, "accept_tos", typedResults ? true : "on");
await expectLogToBe(
canvasElement,
"accept_tos",
typedResults ? true : "on",
);
}
};

Expand Down