Skip to content

feat: unify organization and deployment management settings #13602

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 17 commits into from
Jul 1, 2024
Merged

feat: unify organization and deployment management settings #13602

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e3da0a4
something
aslilac Jun 18, 2024
0d55592
yes
aslilac Jun 18, 2024
fe275f6
Merge branch 'main' into management-settings
aslilac Jun 18, 2024
6443abc
🧹
aslilac Jun 18, 2024
d532a2b
yay
aslilac Jun 20, 2024
73773bf
🧹
aslilac Jun 20, 2024
32cbc68
🧹
aslilac Jun 20, 2024
e768bcd
use the old sidebar outside of the experiment
aslilac Jun 20, 2024
bda6d75
🧹
aslilac Jun 24, 2024
aadff9a
delete notification
aslilac Jun 24, 2024
09dae97
Merge branch 'main' into management-settings
aslilac Jun 27, 2024
bb49eb6
🧼
aslilac Jun 27, 2024
94a8338
🧹
aslilac Jun 28, 2024
4246349
e2e test
aslilac Jun 28, 2024
f86b129
🧼
aslilac Jul 1, 2024
6d7dea9
Merge branch 'main' into management-settings
aslilac Jul 1, 2024
04d9cc8
typo
aslilac Jul 1, 2024
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
e2e test
  • Loading branch information
@aslilac
aslilac committed Jun 28, 2024
commit 42463492f357233211b5734cb89363889bc36e3b
11 changes: 11 additions & 0 deletions site/e2e/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@ export const createGroup = async (orgId: string) => {
return group;
};

export const createOrganization = async () => {
const name = randomName();
const org = await API.createOrganization({
name,
display_name: `Org ${name}`,
description: `Org description ${name}`,
icon: "/emojis/1f957.png",
});
return org;
};

export async function verifyConfigFlagBoolean(
page: Page,
config: DeploymentConfig,
Expand Down
2 changes: 1 addition & 1 deletion site/e2e/playwright.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export default defineConfig({
gitAuth.validatePath,
),
CODER_PPROF_ADDRESS: "127.0.0.1:" + coderdPProfPort,
CODER_EXPERIMENTS: e2eFakeExperiment1 + "," + e2eFakeExperiment2,
CODER_EXPERIMENTS: `multi-organization,${e2eFakeExperiment1},${e2eFakeExperiment2}`,

// Tests for Deployment / User Authentication / OIDC
CODER_OIDC_ISSUER_URL: "https://accounts.google.com",
Expand Down
39 changes: 39 additions & 0 deletions site/e2e/tests/organizations.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { test, expect } from "@playwright/test";
import {
createGroup,

Check failure on line 3 in site/e2e/tests/organizations.spec.ts

View workflow job for this annotation

GitHub Actions / fmt 

'createGroup' is defined but never used. Allowed unused vars must match /^_/u
createOrganization,

Check failure on line 4 in site/e2e/tests/organizations.spec.ts

View workflow job for this annotation

GitHub Actions / fmt 

'createOrganization' is defined but never used. Allowed unused vars must match /^_/u
getCurrentOrgId,

Check failure on line 5 in site/e2e/tests/organizations.spec.ts

View workflow job for this annotation

GitHub Actions / fmt 

'getCurrentOrgId' is defined but never used. Allowed unused vars must match /^_/u
setupApiCalls,
} from "../api";
import { requiresEnterpriseLicense } from "../helpers";
import { beforeCoderTest } from "../hooks";
import { expectUrl } from "../expectUrl";

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

test("create and delete organization", async ({ page, baseURL }) => {
requiresEnterpriseLicense();
await setupApiCalls(page);

// Create an organzation

Check warning on line 18 in site/e2e/tests/organizations.spec.ts

View workflow job for this annotation

GitHub Actions / lint 

"organzation" should be "organization".
await page.goto(`${baseURL}/organizations/new`, {
waitUntil: "domcontentloaded",
});

await page.getByLabel("Name", { exact: true }).fill("floop");
await page.getByLabel("Display name").fill("Floop");
await page.getByLabel("Description").fill("Org description floop");
await page.getByLabel("Icon", { exact: true }).fill("/emojis/1f957.png");

await page.getByRole("button", { name: "Submit" }).click();

// Expect to be redirected to the new organization
await expectUrl(page).toHavePathName("/organizations/floop");
await expect(page.getByText("Organization created.")).toBeVisible();

await page.getByRole("button", { name: "Delete this organization" }).click();
const dialog = page.getByTestId("dialog");
await dialog.getByLabel("Name").fill("floop");
await dialog.getByRole("button", { name: "Delete" }).click();
await expect(page.getByText("Organization deleted.")).toBeVisible();
});
Loading