🧹

coder · aslilac · Mar 28, 2024 · Mar 21, 2024 · Mar 27, 2024 · Mar 27, 2024
commit a5b7635a9ceb40eb27e03fd0922ca0aea2af518d
@@ -1,3 +1,7 @@
+import * as path from "path";
+
+export const coderMain = path.join(__dirname, "../../enterprise/cmd/coder");
+
 // Default port from the server
 export const coderPort = process.env.CODER_E2E_PORT
   ? Number(process.env.CODER_E2E_PORT)
@@ -28,3 +32,6 @@ export const gitAuth = {
   validatePath: "/validate",
   installationsPath: "/installations",
 };
+
+export const enterpriseLicense = process.env.CODER_E2E_ENTERPRISE_LICENSE ?? "";
+export const skipEnterpriseTests = Boolean(enterpriseLicense);
diff --git a/site/e2e/enterprise.setup.ts b/site/e2e/enterprise.setup.ts
@@ -1,12 +1,13 @@
 import { test } from "@playwright/test";
-
-const license = process.env.CODER_E2E_ENTERPRISE_LICENSE!;
+import { enterpriseLicense, skipEnterpriseTests } from "./constants";
 
 test("setup license", async ({ page }) => {
+  test.skip(skipEnterpriseTests);
+
   await page.goto("/deployment/licenses", { waitUntil: "domcontentloaded" });
 
   await page.getByText("Add a license").click();
-  await page.getByRole("textbox").fill(license);
+  await page.getByRole("textbox").fill(enterpriseLicense);
   await page.getByText("Upload License").click();
 
   await page.getByText("You have successfully added a license").isVisible();

@@ -12,7 +12,12 @@ import type {
   UpdateTemplateMeta,
 } from "api/typesGenerated";
 import { TarWriter } from "utils/tar";
-import { agentPProfPort, coderPort, prometheusPort } from "./constants";
+import {
+  agentPProfPort,
+  coderMain,
+  coderPort,
+  prometheusPort,
+} from "./constants";
 import {
   Agent,
   type App,
@@ -147,7 +152,7 @@ export const sshIntoWorkspace = async (
   binaryArgs: string[] = [],
 ): Promise<ssh.Client> => {
   if (binaryPath === "go") {
-    binaryArgs = ["run", coderMainPath()];
+    binaryArgs = ["run", coderMain];
   }
   const sessionToken = await findSessionToken(page);
   return new Promise<ssh.Client>((resolve, reject) => {
@@ -229,7 +234,7 @@ export const startAgent = async (
   page: Page,
   token: string,
 ): Promise<ChildProcess> => {
-  return startAgentWithCommand(page, token, "go", "run", coderMainPath());
+  return startAgentWithCommand(page, token, "go", "run", coderMain);
 };
 
 // downloadCoderVersion downloads the version provided into a temporary dir and
@@ -358,18 +363,6 @@ const waitUntilUrlIsNotResponding = async (url: string) => {
   );
 };
 
-const coderMainPath = (): string => {
-  return path.join(
-    __dirname,
-    "..",
-    "..",
-    "enterprise",
-    "cmd",
-    "coder",
-    "main.go",
-  );
-};
-
 // Allows users to more easily define properties they want for agents and resources!
 type RecursivePartial<T> = {
   [P in keyof T]?: T[P] extends (infer U)[]
@@ -686,7 +679,7 @@ export const updateTemplate = async (
     "go",
     [
       "run",
-      coderMainPath(),
+      coderMain,
       "templates",
       "push",
       "--test.provisioner",

@@ -1,11 +1,9 @@
 import { defineConfig } from "@playwright/test";
-import path from "path";
-import { coderPort, coderdPProfPort, gitAuth } from "./constants";
+import * as path from "path";
+import { coderMain, coderPort, coderdPProfPort, gitAuth } from "./constants";
 
 export const wsEndpoint = process.env.CODER_E2E_WS_ENDPOINT;
 
-const coderMain = path.join(__dirname, "../../enterprise/cmd/coder");
-
 // This is where auth cookies are stored!
 export const storageState = path.join(__dirname, ".auth.json");
 

diff --git a/site/e2e/tests/updateTemplate.enterpriseSpec.ts b/site/e2e/tests/updateTemplate.enterpriseSpec.ts
@@ -1,7 +1,9 @@
 import { expect, test } from "@playwright/test";
+import { skipEnterpriseTests } from "../constants";
 import { createTemplate } from "../helpers";
 
 test("require latest version", async ({ page }) => {
+  test.skip(skipEnterpriseTests);
   const templateName = await createTemplate(page);
 
   await page.goto(`/templates/${templateName}/settings`, {

@@ -1,7 +1,7 @@
 import { test } from "@playwright/test";
 import { createTemplate, updateTemplateSettings } from "../helpers";
 
-test("template update with new name redirects on successful submit", async ({
+test.only("template update with new name redirects on successful submit", async ({
   page,
 }) => {
   const templateName = await createTemplate(page);