Skip to content

fix: fix flaky IDP e2e tests #16331

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jan 29, 2025
Merged

fix: fix flaky IDP e2e tests #16331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c91f48
fix: fix flaky tests
jaaydenh Jan 29, 2025
6bd24be
fix: format
jaaydenh Jan 29, 2025
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
13 changes: 11 additions & 2 deletions site/e2e/tests/deployment/idpOrgSync.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ test.beforeEach(async ({ page }) => {
});

test.describe("IdpOrgSyncPage", () => {
test.describe.configure({ retries: 1 });

test("show empty table when no org mappings are present", async ({
page,
}) => {
Expand Down Expand Up @@ -149,7 +151,6 @@ test.describe("IdpOrgSyncPage", () => {
});

const idpOrgInput = page.getByLabel("IdP organization name");
const orgSelector = page.getByPlaceholder("Select organization");
const addButton = page.getByRole("button", {
name: /Add IdP organization/i,
});
Expand All @@ -159,8 +160,16 @@ test.describe("IdpOrgSyncPage", () => {
await idpOrgInput.fill("new-idp-org");

// Select Coder organization from combobox
const orgSelector = page.getByPlaceholder("Select organization");
await expect(orgSelector).toBeAttached();
await expect(orgSelector).toBeVisible();
await orgSelector.click();
await page.getByRole("option", { name: orgName }).click();
await page.waitForTimeout(1000);

const option = await page.getByRole("option", { name: orgName });
await expect(option).toBeAttached({ timeout: 30000 });
await expect(option).toBeVisible();
await option.click();

// Add button should now be enabled
await expect(addButton).toBeEnabled();
Expand Down
15 changes: 12 additions & 3 deletions site/e2e/tests/organizations/idpGroupSync.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ test.beforeEach(async ({ page }) => {
});

test.describe("IdpGroupSyncPage", () => {
test.describe.configure({ retries: 1 });

test("show empty table when no group mappings are present", async ({
page,
}) => {
Expand Down Expand Up @@ -149,7 +151,6 @@ test.describe("IdpGroupSyncPage", () => {
});

const idpOrgInput = page.getByLabel("IdP group name");
const orgSelector = page.getByPlaceholder("Select group");
const addButton = page.getByRole("button", {
name: /Add IdP group/i,
});
Expand All @@ -159,8 +160,16 @@ test.describe("IdpGroupSyncPage", () => {
await idpOrgInput.fill("new-idp-group");

// Select Coder organization from combobox
await orgSelector.click();
await page.getByRole("option", { name: /Everyone/i }).click();
const groupSelector = page.getByPlaceholder("Select group");
await expect(groupSelector).toBeAttached();
await expect(groupSelector).toBeVisible();
await groupSelector.click();
await page.waitForTimeout(1000);

const option = await page.getByRole("option", { name: /Everyone/i });
await expect(option).toBeAttached({ timeout: 30000 });
await expect(option).toBeVisible();
await option.click();

// Add button should now be enabled
await expect(addButton).toBeEnabled();
Expand Down
34 changes: 21 additions & 13 deletions site/e2e/tests/organizations/idpRoleSync.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,18 @@ import { login } from "../../helpers";
import { beforeCoderTest } from "../../hooks";

test.beforeEach(async ({ page }) => {
requiresLicense();
beforeCoderTest(page);
await login(page);
await setupApiCalls(page);
});

test.describe("IdpRoleSyncPage", () => {
test.describe.configure({ retries: 1 });

test("show empty table when no role mappings are present", async ({
page,
}) => {
requiresLicense();
const org = await createOrganizationWithName(randomName());
await page.goto(`/organizations/${org.name}/idp-sync?tab=roles`, {
waitUntil: "domcontentloaded",
Expand All @@ -36,7 +38,6 @@ test.describe("IdpRoleSyncPage", () => {
});

test("add new IdP role mapping with API", async ({ page }) => {
requiresLicense();
const org = await createOrganizationWithName(randomName());
await createRoleSyncSettings(org.id);

Expand All @@ -58,7 +59,6 @@ test.describe("IdpRoleSyncPage", () => {
});

test("delete a IdP role to coder role mapping row", async ({ page }) => {
requiresLicense();
const org = await createOrganizationWithName(randomName());
await createRoleSyncSettings(org.id);

Expand All @@ -79,7 +79,6 @@ test.describe("IdpRoleSyncPage", () => {
});

test("update sync field", async ({ page }) => {
requiresLicense();
const org = await createOrganizationWithName(randomName());
await page.goto(`/organizations/${org.name}/idp-sync?tab=roles`, {
waitUntil: "domcontentloaded",
Expand Down Expand Up @@ -107,7 +106,6 @@ test.describe("IdpRoleSyncPage", () => {
test("export policy button is enabled when sync settings are present", async ({
page,
}) => {
requiresLicense();
const org = await createOrganizationWithName(randomName());
await page.goto(`/organizations/${org.name}/idp-sync?tab=roles`, {
waitUntil: "domcontentloaded",
Expand All @@ -121,7 +119,6 @@ test.describe("IdpRoleSyncPage", () => {
});

test("add new IdP role mapping with UI", async ({ page }) => {
requiresLicense();
const orgName = randomName();
await createOrganizationWithName(orgName);

Expand All @@ -130,30 +127,41 @@ test.describe("IdpRoleSyncPage", () => {
});

const idpOrgInput = page.getByLabel("IdP role name");
const roleSelector = page.getByPlaceholder("Select role");
const addButton = page.getByRole("button", {
name: /Add IdP role/i,
});

await expect(addButton).toBeDisabled();

await idpOrgInput.fill("new-idp-role");
const idpRoleName = randomName();
await idpOrgInput.fill(idpRoleName);

// Select Coder role from combobox
const roleSelector = page.getByPlaceholder("Select role");
await expect(roleSelector).toBeAttached();
await expect(roleSelector).toBeVisible();
await roleSelector.click();
await page.getByRole("option", { name: /Organization Admin/i }).click();

await page.getByRole("combobox").click();
await page.waitForTimeout(1000);

const option = await page.getByRole("option", {
name: /Organization Admin/i,
});

await expect(option).toBeAttached({ timeout: 30000 });
await expect(option).toBeVisible();
await option.click();

// Add button should now be enabled
await expect(addButton).toBeEnabled();

await addButton.click();

// Verify new mapping appears in table
const newRow = page.getByTestId("role-new-idp-role");
const newRow = page.getByTestId(`role-${idpRoleName}`);
await expect(newRow).toBeVisible();
await expect(
newRow.getByRole("cell", { name: "new-idp-role" }),
).toBeVisible();
await expect(newRow.getByRole("cell", { name: idpRoleName })).toBeVisible();
await expect(
newRow.getByRole("cell", { name: "organization-admin" }),
).toBeVisible();
Expand Down
Loading