Skip to content

Commit 918a7f3

Browse files
aslilacaslilac
committed
chore: turn e2e enterprise tests into e2e premium tests
1 parent 7d281c3 commit 918a7f3

16 files changed

+41
-45
lines changed

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ jobs:
510510
- enterprise: false
511511
name: test-e2e
512512
- enterprise: true
513-
name: test-e2e-enterprise
513+
name: test-e2e-licensed
514514
name: ${{ matrix.variant.name }}
515515
steps:
516516
- name: Checkout

‎site/e2e/constants.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ export const gitAuth = {
3434
installationsPath: "/installations",
3535
};
3636

37-
export const requireEnterpriseTests = Boolean(
38-
process.env.CODER_E2E_REQUIRE_ENTERPRISE_TESTS,
37+
export const requirePremiumTests = Boolean(
38+
process.env.CODER_E2E_REQUIRE_PREMIUM_TESTS,
3939
);
40-
export const enterpriseLicense = process.env.CODER_E2E_ENTERPRISE_LICENSE ?? "";
40+
export const license = process.env.CODER_E2E_LICENSE ?? "";
4141

4242
// Disabling terraform tests is optional for environments without Docker + Terraform.
4343
// By default, we opt into these tests.

‎site/e2e/helpers.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import {
1616
agentPProfPort,
1717
coderMain,
1818
coderPort,
19-
enterpriseLicense,
19+
license,
2020
prometheusPort,
21-
requireEnterpriseTests,
21+
requirePremiumTests,
2222
requireTerraformTests,
2323
} from "./constants";
2424
import { expectUrl } from "./expectUrl";
@@ -35,13 +35,13 @@ import {
3535
type RichParameter,
3636
} from "./provisionerGenerated";
3737

38-
// requiresEnterpriseLicense will skip the test if we're not running with an enterprise license
39-
export function requiresEnterpriseLicense() {
40-
if (requireEnterpriseTests) {
38+
// requiresLicense will skip the test if we're not running with a license added
39+
export function requiresLicense() {
40+
if (requirePremiumTests) {
4141
return;
4242
}
4343

44-
test.skip(!enterpriseLicense);
44+
test.skip(!license);
4545
}
4646

4747
// requireTerraformProvisioner by default is enabled.

‎site/e2e/reporter.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type {
1010
TestResult,
1111
} from "@playwright/test/reporter";
1212
import { API } from "api/api";
13-
import { coderdPProfPort, enterpriseLicense } from "./constants";
13+
import { coderdPProfPort, license } from "./constants";
1414

1515
class CoderReporter implements Reporter {
1616
config: FullConfig | null = null;
@@ -108,9 +108,9 @@ class CoderReporter implements Reporter {
108108

109109
onEnd(result: FullResult) {
110110
console.info(`==> Tests ${result.status}`);
111-
if (!enterpriseLicense) {
111+
if (!license) {
112112
console.info(
113-
"==> Enterprise tests were skipped, because no license was provided",
113+
"==> Premium tests were skipped, because no license was provided",
114114
);
115115
}
116116
console.info(`${this.passedCount} passed`);

‎site/e2e/tests/auditLogs.spec.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
import { expect, test } from "@playwright/test";
2-
import {
3-
createTemplate,
4-
createWorkspace,
5-
requiresEnterpriseLicense,
6-
} from "../helpers";
2+
import { createTemplate, createWorkspace, requiresLicense } from "../helpers";
73
import { beforeCoderTest } from "../hooks";
84

95
test.beforeEach(({ page }) => beforeCoderTest(page));
106

117
test("inspecting and filtering audit logs", async ({ page }) => {
12-
requiresEnterpriseLicense();
8+
requiresLicense();
139

1410
const userName = "admin";
1511
// Do some stuff that should show up in the audit logs

‎site/e2e/tests/deployment/appearance.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { chromium, expect, test } from "@playwright/test";
22
import { expectUrl } from "../../expectUrl";
3-
import { randomName, requiresEnterpriseLicense } from "../../helpers";
3+
import { randomName, requiresLicense } from "../../helpers";
44

55
test("set application name", async ({ page }) => {
6-
requiresEnterpriseLicense();
6+
requiresLicense();
77

88
await page.goto("/deployment/appearance", { waitUntil: "domcontentloaded" });
99

@@ -33,7 +33,7 @@ test("set application name", async ({ page }) => {
3333
});
3434

3535
test("set application logo", async ({ page }) => {
36-
requiresEnterpriseLicense();
36+
requiresLicense();
3737

3838
await page.goto("/deployment/appearance", { waitUntil: "domcontentloaded" });
3939

@@ -61,7 +61,7 @@ test("set application logo", async ({ page }) => {
6161
});
6262

6363
test("set service banner", async ({ page }) => {
64-
requiresEnterpriseLicense();
64+
requiresLicense();
6565

6666
await page.goto("/deployment/appearance", { waitUntil: "domcontentloaded" });
6767

‎site/e2e/tests/deployment/licenses.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { expect, test } from "@playwright/test";
2-
import { requiresEnterpriseLicense } from "../../helpers";
2+
import { requiresLicense } from "../../helpers";
33

44
test("license was added successfully", async ({ page }) => {
5-
requiresEnterpriseLicense();
5+
requiresLicense();
66

77
await page.goto("/deployment/licenses", { waitUntil: "domcontentloaded" });
88
const firstLicense = page.locator(".licenses > .license-card", {

‎site/e2e/tests/deployment/workspaceProxies.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { type Page, expect, test } from "@playwright/test";
22
import { API } from "api/api";
33
import { setupApiCalls } from "../../api";
44
import { coderPort, workspaceProxyPort } from "../../constants";
5-
import { randomName, requiresEnterpriseLicense } from "../../helpers";
5+
import { randomName, requiresLicense } from "../../helpers";
66
import { startWorkspaceProxy, stopWorkspaceProxy } from "../../proxy";
77

88
test("default proxy is online", async ({ page }) => {
9-
requiresEnterpriseLicense();
9+
requiresLicense();
1010
await setupApiCalls(page);
1111

1212
await page.goto("/deployment/workspace-proxies", {
@@ -28,7 +28,7 @@ test("default proxy is online", async ({ page }) => {
2828
});
2929

3030
test("custom proxy is online", async ({ page }) => {
31-
requiresEnterpriseLicense();
31+
requiresLicense();
3232
await setupApiCalls(page);
3333

3434
const proxyName = randomName();

‎site/e2e/tests/groups/addMembers.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import {
55
getCurrentOrgId,
66
setupApiCalls,
77
} from "../../api";
8-
import { requiresEnterpriseLicense } from "../../helpers";
8+
import { requiresLicense } from "../../helpers";
99
import { beforeCoderTest } from "../../hooks";
1010

1111
test.beforeEach(async ({ page }) => await beforeCoderTest(page));
1212

1313
test("add members", async ({ page, baseURL }) => {
14-
requiresEnterpriseLicense();
14+
requiresLicense();
1515
await setupApiCalls(page);
1616
const orgId = await getCurrentOrgId();
1717
const group = await createGroup(orgId);

‎site/e2e/tests/groups/addUsersToDefaultGroup.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { expect, test } from "@playwright/test";
22
import { createUser, getCurrentOrgId, setupApiCalls } from "../../api";
3-
import { requiresEnterpriseLicense } from "../../helpers";
3+
import { requiresLicense } from "../../helpers";
44
import { beforeCoderTest } from "../../hooks";
55

66
test.beforeEach(async ({ page }) => await beforeCoderTest(page));
@@ -11,7 +11,7 @@ test(`Every user should be automatically added to the default '${DEFAULT_GROUP_N
1111
page,
1212
baseURL,
1313
}) => {
14-
requiresEnterpriseLicense();
14+
requiresLicense();
1515
await setupApiCalls(page);
1616
const orgId = await getCurrentOrgId();
1717
const numberOfMembers = 3;

‎site/e2e/tests/groups/createGroup.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { expect, test } from "@playwright/test";
2-
import { randomName, requiresEnterpriseLicense } from "../../helpers";
2+
import { randomName, requiresLicense } from "../../helpers";
33
import { beforeCoderTest } from "../../hooks";
44

55
test.beforeEach(async ({ page }) => await beforeCoderTest(page));
66

77
test("create group", async ({ page, baseURL }) => {
8-
requiresEnterpriseLicense();
8+
requiresLicense();
99
await page.goto(`${baseURL}/groups`, { waitUntil: "domcontentloaded" });
1010
await expect(page).toHaveTitle("Groups - Coder");
1111

‎site/e2e/tests/groups/navigateToGroupPage.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { expect, test } from "@playwright/test";
22
import { createGroup, getCurrentOrgId, setupApiCalls } from "../../api";
3-
import { requiresEnterpriseLicense } from "../../helpers";
3+
import { requiresLicense } from "../../helpers";
44
import { beforeCoderTest } from "../../hooks";
55

66
test.beforeEach(async ({ page }) => await beforeCoderTest(page));
77

88
test("navigate to group page", async ({ page, baseURL }) => {
9-
requiresEnterpriseLicense();
9+
requiresLicense();
1010
await setupApiCalls(page);
1111
const orgId = await getCurrentOrgId();
1212
const group = await createGroup(orgId);

‎site/e2e/tests/groups/removeGroup.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { expect, test } from "@playwright/test";
22
import { createGroup, getCurrentOrgId, setupApiCalls } from "../../api";
3-
import { requiresEnterpriseLicense } from "../../helpers";
3+
import { requiresLicense } from "../../helpers";
44
import { beforeCoderTest } from "../../hooks";
55

66
test.beforeEach(async ({ page }) => await beforeCoderTest(page));
77

88
test("remove group", async ({ page, baseURL }) => {
9-
requiresEnterpriseLicense();
9+
requiresLicense();
1010
await setupApiCalls(page);
1111
const orgId = await getCurrentOrgId();
1212
const group = await createGroup(orgId);

‎site/e2e/tests/groups/removeMember.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import {
66
getCurrentOrgId,
77
setupApiCalls,
88
} from "../../api";
9-
import { requiresEnterpriseLicense } from "../../helpers";
9+
import { requiresLicense } from "../../helpers";
1010
import { beforeCoderTest } from "../../hooks";
1111

1212
test.beforeEach(async ({ page }) => await beforeCoderTest(page));
1313

1414
test("remove member", async ({ page, baseURL }) => {
15-
requiresEnterpriseLicense();
15+
requiresLicense();
1616
await setupApiCalls(page);
1717
const orgId = await getCurrentOrgId();
1818
const [group, member] = await Promise.all([

‎site/e2e/tests/organizations.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect, test } from "@playwright/test";
22
import { setupApiCalls } from "../api";
33
import { expectUrl } from "../expectUrl";
4-
import { requiresEnterpriseLicense } from "../helpers";
4+
import { requiresLicense } from "../helpers";
55
import { beforeCoderTest } from "../hooks";
66

77
test.beforeEach(async ({ page }) => {
@@ -10,7 +10,7 @@ test.beforeEach(async ({ page }) => {
1010
});
1111

1212
test("create and delete organization", async ({ page, baseURL }) => {
13-
requiresEnterpriseLicense();
13+
requiresLicense();
1414

1515
// Create an organization
1616
await page.goto(`${baseURL}/organizations/new`, {

‎site/e2e/tests/updateTemplate.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { expectUrl } from "../expectUrl";
33
import {
44
createGroup,
55
createTemplate,
6-
requiresEnterpriseLicense,
6+
requiresLicense,
77
updateTemplateSettings,
88
} from "../helpers";
99
import { beforeCoderTest } from "../hooks";
@@ -21,7 +21,7 @@ test("template update with new name redirects on successful submit", async ({
2121
});
2222

2323
test("add and remove a group", async ({ page }) => {
24-
requiresEnterpriseLicense();
24+
requiresLicense();
2525

2626
const templateName = await createTemplate(page);
2727
const groupName = await createGroup(page);
@@ -52,7 +52,7 @@ test("add and remove a group", async ({ page }) => {
5252
});
5353

5454
test("require latest version", async ({ page }) => {
55-
requiresEnterpriseLicense();
55+
requiresLicense();
5656

5757
const templateName = await createTemplate(page);
5858

0 commit comments

Comments
 (0)