start workspace with ephemerals

mtojek · mtojek · commit 0b8d6d8c5444 · 2023-08-25T11:49:14.000+02:00
diff --git a/site/e2e/helpers.ts b/site/e2e/helpers.ts
@@ -216,11 +216,31 @@ export const sshIntoWorkspace = async (
   })
 }
 
-export const restartWorkspace = async (
+export const stopWorkspace = async (
+  page: Page,
+  workspaceName: string,
+) => {
+  await page.goto("/@admin/" + workspaceName, {
+    waitUntil: "domcontentloaded",
+  })
+  await expect(page).toHaveURL("/@admin/" + workspaceName)
+
+  await page.getByTestId("workspace-stop-button").click()
+
+  await page.waitForSelector(
+    "span[data-testid='build-status'] >> text=Stopped",
+    {
+      state: "visible",
+    },
+  )
+}
+
+export const buildWorkspaceWithParameters = async (
   page: Page,
   workspaceName: string,
   richParameters: RichParameter[] = [],
   buildParameters: WorkspaceBuildParameter[] = [],
+  confirm: boolean = false,
 ) => {
   await page.goto("/@admin/" + workspaceName, {
     waitUntil: "domcontentloaded",
@@ -270,7 +290,10 @@ export const restartWorkspace = async (
   }
 
   await page.getByTestId("build-parameters-submit").click()
-  await page.getByTestId("confirm-button").click()
+
+  if (confirm) {
+    await page.getByTestId("confirm-button").click()
+  }
 
   await page.waitForSelector(
     "span[data-testid='build-status'] >> text=Running",
diff --git a/site/e2e/tests/restartWorkspace.spec.ts b/site/e2e/tests/restartWorkspace.spec.ts
@@ -1,9 +1,9 @@
 import { test } from "@playwright/test"
 import {
+  buildWorkspaceWithParameters,
   createTemplate,
   createWorkspace,
   echoResponsesWithParameters,
-  restartWorkspace,
   verifyParameters,
 } from "../helpers"
 
@@ -29,9 +29,10 @@ test("restart workspace with ephemeral parameters", async ({ page }) => {
     { name: firstBuildOption.name, value: "AAAAA" },
     { name: secondBuildOption.name, value: "true" },
   ]
-  await restartWorkspace(page, workspaceName, richParameters, buildParameters)
+  await buildWorkspaceWithParameters(page, workspaceName, richParameters, buildParameters, true)
 
-  // Verify that build options are default (not selected).
+  // FIXME: verify that build options are default (not selected).
+  // It is the opposite now until the site logic is corrected.
   await verifyParameters(page, workspaceName, richParameters, [
     { name: firstBuildOption.name, value: buildParameters[0].value },
     { name: secondBuildOption.name, value: buildParameters[1].value },
diff --git a/site/e2e/tests/startWorkspace.spec.ts b/site/e2e/tests/startWorkspace.spec.ts
@@ -0,0 +1,45 @@
+import { test } from "@playwright/test"
+import {
+  buildWorkspaceWithParameters,
+  createTemplate,
+  createWorkspace,
+  echoResponsesWithParameters,
+  stopWorkspace,
+  verifyParameters,
+} from "../helpers"
+
+import { firstBuildOption, secondBuildOption } from "../parameters"
+import { RichParameter } from "../provisionerGenerated"
+
+test("start workspace with ephemeral parameters", async ({ page }) => {
+  const richParameters: RichParameter[] = [firstBuildOption, secondBuildOption]
+  const template = await createTemplate(
+    page,
+    echoResponsesWithParameters(richParameters),
+  )
+  const workspaceName = await createWorkspace(page, template)
+
+  // Verify that build options are default (not selected).
+  await verifyParameters(page, workspaceName, richParameters, [
+    { name: firstBuildOption.name, value: firstBuildOption.defaultValue },
+    { name: secondBuildOption.name, value: secondBuildOption.defaultValue },
+  ])
+
+  // Stop the workspace
+  await stopWorkspace(page, workspaceName)
+
+  // Now, start the workspace with ephemeral parameters selected.
+  const buildParameters = [
+    { name: firstBuildOption.name, value: "AAAAA" },
+    { name: secondBuildOption.name, value: "true" },
+  ]
+
+  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.
+  await verifyParameters(page, workspaceName, richParameters, [
+    { name: firstBuildOption.name, value: buildParameters[0].value },
+    { name: secondBuildOption.name, value: buildParameters[1].value },
+  ])
+})
diff --git a/site/src/components/WorkspaceActions/Buttons.tsx b/site/src/components/WorkspaceActions/Buttons.tsx
@@ -94,6 +94,7 @@ export const StopButton: FC<WorkspaceAction> = ({ handleAction, loading }) => {
       loadingPosition="start"
       startIcon={<CropSquareIcon />}
       onClick={handleAction}
+      data-testid="workspace-stop-button"
     >
       Stop
     </LoadingButton>

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ export const StopButton: FC<WorkspaceAction> = ({ handleAction, loading }) => {`
`94`	`94`	`loadingPosition="start"`
`95`	`95`	`startIcon={<CropSquareIcon />}`
`96`	`96`	`onClick={handleAction}`
	`97`	`+ data-testid="workspace-stop-button"`
`97`	`98`	`>`
`98`	`99`	`Stop`
`99`	`100`	`</LoadingButton>`