Update

mtojek · mtojek · commit d43615534e2f · 2023-08-28T14:12:35.000+02:00
diff --git a/site/e2e/helpers.ts b/site/e2e/helpers.ts
@@ -19,7 +19,6 @@ import { port } from "./playwright.config"
 import * as ssh from "ssh2"
 import { Duplex } from "stream"
 import { WorkspaceBuildParameter } from "api/typesGenerated"
-import { createTemplateVersion, uploadTemplateFile } from "api/api"
 
 // createWorkspace creates a workspace for a template.
 // It does not wait for it to be running, but it does navigate to the page.
@@ -117,6 +116,7 @@ export const createTemplate = async (
   await page.addInitScript({
     content: "window.playwright = true",
   })
+
   await page.goto("/templates/new", { waitUntil: "networkidle" })
   await page.getByTestId("file-upload").setInputFiles({
     buffer: await createTemplateVersionTar(responses),
@@ -617,23 +617,74 @@ export const fillParameters = async (
   }
 }
 
-export const uploadTemplateVersion = async (
+export const updateTemplate = async (
+  page: Page,
   templateName: string,
   responses?: EchoProvisionerResponses,
-): Promise<string> => {
+) => {
   const tarball = await createTemplateVersionTar(responses)
-  const file = new File([tarball], "version.tar", { type: "application/x-tar" })
-  const uploadResponse = await uploadTemplateFile(file)
-
-  // FIXME find:
-  const organizationId = ""
-  const templateId = ""
-  const templateVersion = await createTemplateVersion(organizationId, {
-    template_id: templateId,
-    storage_method: "file",
-    file_id: uploadResponse.hash,
-    provisioner: "echo",
-    tags: {},
+
+  const sessionToken = await findSessionToken(page)
+  const child = spawn(
+    "go",
+    [
+      "run",
+      coderMainPath(),
+      "templates",
+      "push",
+      "--test.provisioner",
+      "echo",
+      "-y",
+      "-d",
+      "-",
+      templateName,
+    ],
+    {
+      env: {
+        ...process.env,
+        CODER_SESSION_TOKEN: sessionToken,
+        CODER_URL: "http://localhost:3000",
+      },
+    },
+  )
+
+  const uploaded = new Awaiter()
+  child.on("exit", (code) => {
+    if (code === 0) {
+      uploaded.done()
+      return
+    }
+
+    throw new Error(`coder templates push failed with code ${code}`)
+  })
+
+  child.stdin.write(tarball)
+  child.stdin.end()
+
+  await uploaded.wait()
+}
+
+export const updateWorkspace = async (
+  page: Page,
+  workspaceName: string,
+  richParameters: RichParameter[] = [],
+  buildParameters: WorkspaceBuildParameter[] = [],
+) => {
+  await page.goto("/@admin/" + workspaceName, {
+    waitUntil: "domcontentloaded",
   })
-  return templateVersion.id
+  await expect(page).toHaveURL("/@admin/" + workspaceName)
+
+  await page.getByTestId("workspace-update-button").click()
+  await page.getByTestId("confirm-button").click()
+
+  await fillParameters(page, richParameters, buildParameters)
+  await page.getByTestId("form-submit").click()
+
+  await page.waitForSelector(
+    "span[data-testid='build-status'] >> text=Running",
+    {
+      state: "visible",
+    },
+  )
 }
diff --git a/site/e2e/tests/updateWorkspace.spec.ts b/site/e2e/tests/updateWorkspace.spec.ts
@@ -3,14 +3,15 @@ import {
   createTemplate,
   createWorkspace,
   echoResponsesWithParameters,
-  uploadTemplateVersion,
+  updateTemplate,
+  updateWorkspace,
   verifyParameters,
 } from "../helpers"
 
 import { fifthParameter, firstParameter, secondParameter } from "../parameters"
 import { RichParameter } from "../provisionerGenerated"
 
-test("update workspace, new optional, mutable parameter added", async ({
+test("update workspace, new optional, immutable parameter added", async ({
   page,
 }) => {
   const richParameters: RichParameter[] = [firstParameter, secondParameter]
@@ -27,23 +28,23 @@ test("update workspace, new optional, mutable parameter added", async ({
     { name: secondParameter.name, value: secondParameter.defaultValue },
   ])
 
-  // Upload new template version with extra parameter.
+  // Push updated template.
   const updatedRichParameters = [...richParameters, fifthParameter]
-  const templateVersion = await uploadTemplateVersion(
+  await updateTemplate(
+    page,
     template,
     echoResponsesWithParameters(updatedRichParameters),
   )
 
-  // TODO Activate the template version
-  // Go to Versions -> Promote version
-
-  // Now, update the workspace.
-  // TODO Update workspace
+  // Now, update the workspace, and select the value for immutable parameter.
+  await updateWorkspace(page, workspaceName, updatedRichParameters, [
+    { name: fifthParameter.name, value: fifthParameter.options[0].value },
+  ])
 
   // Verify that parameter values are default.
   await verifyParameters(page, workspaceName, updatedRichParameters, [
     { name: firstParameter.name, value: firstParameter.defaultValue },
     { name: secondParameter.name, value: secondParameter.defaultValue },
-    { name: fifthParameter.name, value: fifthParameter.defaultValue },
+    { name: fifthParameter.name, value: fifthParameter.options[0].value },
   ])
 })
diff --git a/site/src/pages/WorkspacePage/UpdateBuildParametersDialog.tsx b/site/src/pages/WorkspacePage/UpdateBuildParametersDialog.tsx
@@ -111,7 +111,13 @@ export const UpdateBuildParametersDialog: FC<
         <Button fullWidth type="button" onClick={dialogProps.onClose}>
           Cancel
         </Button>
-        <Button color="primary" fullWidth type="submit" form="updateParameters">
+        <Button
+          color="primary"
+          fullWidth
+          type="submit"
+          form="updateParameters"
+          data-testid="form-submit"
+        >
           Update
         </Button>
       </DialogActions>
