Skip to content

test(site): e2e: update workspace with parameters #9338

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 23 commits into from
Aug 29, 2023
Merged

test(site): e2e: update workspace with parameters #9338

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
47bbc4d
Restart ephemeral parameters
mtojek Aug 24, 2023
055d65f
Merge branch 'main' into 8789-ephemeral
mtojek Aug 25, 2023
0b8d6d8
start workspace with ephemerals
mtojek Aug 25, 2023
ca7feaa
refactor
mtojek Aug 25, 2023
0ddbac3
Merge branch 'main' into 8789-ephemeral
mtojek Aug 25, 2023
135b1e4
FIXMEs
mtojek Aug 25, 2023
679e205
WIP
mtojek Aug 25, 2023
f9237f8
WIP
mtojek Aug 25, 2023
6398402
Merge branch 'main' into 8789-update-params
mtojek Aug 28, 2023
d436155
Update
mtojek Aug 28, 2023
fc306f5
Merge branch 'main' into 8789-update-params
mtojek Aug 28, 2023
bd4ac82
Merge branch 'main' into 8789-update-params
mtojek Aug 29, 2023
b7fe39d
Update tests
mtojek Aug 29, 2023
5a141fb
expect
mtojek Aug 29, 2023
2973893
WIP
mtojek Aug 29, 2023
5f06496
WIP: console
mtojek Aug 29, 2023
ae71f23
WIP: console
mtojek Aug 29, 2023
b77cd9b
Console fix
mtojek Aug 29, 2023
55ed687
api-rate-limit
mtojek Aug 29, 2023
d833e9e
fix
mtojek Aug 29, 2023
5128187
dangerous-disable-rate-limits
mtojek Aug 29, 2023
63cb145
lint fix
mtojek Aug 29, 2023
55e7b8f
fix
mtojek Aug 29, 2023
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
Prev Previous commit
Next Next commit
refactor
  • Loading branch information
@mtojek
mtojek committed Aug 25, 2023
commit ca7feaa6104960e3d0863405dbabff4bcffbd573
134 changes: 49 additions & 85 deletions site/e2e/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,46 +34,7 @@ export const createWorkspace = async (
const name = randomName()
await page.getByLabel("name").fill(name)

for (const buildParameter of buildParameters) {
const richParameter = richParameters.find(
(richParam) => richParam.name === buildParameter.name,
)
if (!richParameter) {
throw new Error(
"build parameter is expected to be present in rich parameter schema",
)
}

const parameterLabel = await page.waitForSelector(
"[data-testid='parameter-field-" + richParameter.name + "']",
{ state: "visible" },
)

if (richParameter.type === "bool") {
const parameterField = await parameterLabel.waitForSelector(
"[data-testid='parameter-field-bool'] .MuiRadio-root input[value='" +
buildParameter.value +
"']",
)
await parameterField.check()
} else if (richParameter.options.length > 0) {
const parameterField = await parameterLabel.waitForSelector(
"[data-testid='parameter-field-options'] .MuiRadio-root input[value='" +
buildParameter.value +
"']",
)
await parameterField.check()
} else if (richParameter.type === "list(string)") {
throw new Error("not implemented yet") // FIXME
} else {
// text or number
const parameterField = await parameterLabel.waitForSelector(
"[data-testid='parameter-field-text'] input",
)
await parameterField.fill(buildParameter.value)
}
}

await fillParameters(page, richParameters, buildParameters)
await page.getByTestId("form-submit").click()

await expect(page).toHaveURL("/@admin/" + name)
Expand Down Expand Up @@ -216,10 +177,7 @@ export const sshIntoWorkspace = async (
})
}

export const stopWorkspace = async (
page: Page,
workspaceName: string,
) => {
export const stopWorkspace = async (page: Page, workspaceName: string) => {
await page.goto("/@admin/" + workspaceName, {
waitUntil: "domcontentloaded",
})
Expand Down Expand Up @@ -249,48 +207,8 @@ export const buildWorkspaceWithParameters = async (

await page.getByTestId("build-parameters-button").click()

for (const buildParameter of buildParameters) {
const richParameter = richParameters.find(
(richParam) => richParam.name === buildParameter.name,
)
if (!richParameter) {
throw new Error(
"build parameter is expected to be present in rich parameter schema",
)
}

const parameterLabel = await page.waitForSelector(
"[data-testid='parameter-field-" + richParameter.name + "']",
{ state: "visible" },
)

if (richParameter.type === "bool") {
const parameterField = await parameterLabel.waitForSelector(
"[data-testid='parameter-field-bool'] .MuiRadio-root input[value='" +
buildParameter.value +
"']",
)
await parameterField.check()
} else if (richParameter.options.length > 0) {
const parameterField = await parameterLabel.waitForSelector(
"[data-testid='parameter-field-options'] .MuiRadio-root input[value='" +
buildParameter.value +
"']",
)
await parameterField.check()
} else if (richParameter.type === "list(string)") {
throw new Error("not implemented yet") // FIXME
} else {
// text or number
const parameterField = await parameterLabel.waitForSelector(
"[data-testid='parameter-field-text'] input",
)
await parameterField.fill(buildParameter.value)
}
}

await fillParameters(page, richParameters, buildParameters)
await page.getByTestId("build-parameters-submit").click()

if (confirm) {
await page.getByTestId("confirm-button").click()
}
Expand Down Expand Up @@ -651,3 +569,49 @@ export const echoResponsesWithParameters = (
],
}
}

export const fillParameters = async (
page: Page,
richParameters: RichParameter[] = [],
buildParameters: WorkspaceBuildParameter[] = [],
) => {
for (const buildParameter of buildParameters) {
const richParameter = richParameters.find(
(richParam) => richParam.name === buildParameter.name,
)
if (!richParameter) {
throw new Error(
"build parameter is expected to be present in rich parameter schema",
)
}

const parameterLabel = await page.waitForSelector(
"[data-testid='parameter-field-" + richParameter.name + "']",
{ state: "visible" },
)

if (richParameter.type === "bool") {
const parameterField = await parameterLabel.waitForSelector(
"[data-testid='parameter-field-bool'] .MuiRadio-root input[value='" +
buildParameter.value +
"']",
)
await parameterField.check()
} else if (richParameter.options.length > 0) {
const parameterField = await parameterLabel.waitForSelector(
"[data-testid='parameter-field-options'] .MuiRadio-root input[value='" +
buildParameter.value +
"']",
)
await parameterField.check()
} else if (richParameter.type === "list(string)") {
throw new Error("not implemented yet") // FIXME
} else {
// text or number
const parameterField = await parameterLabel.waitForSelector(
"[data-testid='parameter-field-text'] input",
)
await parameterField.fill(buildParameter.value)
}
}
}
8 changes: 7 additions & 1 deletion site/e2e/tests/restartWorkspace.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ test("restart workspace with ephemeral parameters", async ({ page }) => {
{ name: firstBuildOption.name, value: "AAAAA" },
{ name: secondBuildOption.name, value: "true" },
]
await buildWorkspaceWithParameters(page, workspaceName, richParameters, buildParameters, true)
await buildWorkspaceWithParameters(
page,
workspaceName,
richParameters,
buildParameters,
true,
)

// FIXME: verify that build options are default (not selected).
// It is the opposite now until the site logic is corrected.
Expand Down
7 changes: 6 additions & 1 deletion site/e2e/tests/startWorkspace.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@ test("start workspace with ephemeral parameters", async ({ page }) => {
{ name: secondBuildOption.name, value: "true" },
]

await buildWorkspaceWithParameters(page, workspaceName, richParameters, buildParameters)
await buildWorkspaceWithParameters(
page,
workspaceName,
richParameters,
buildParameters,
)

// FIXME: verify that build options are default (not selected).
// It is the opposite now until the site logic is corrected.
Expand Down