fix: e2e test fixes

jaaydenh · jaaydenh · commit 3b4d3d0eb4e9 · 2024-12-19T17:13:41.000Z
diff --git a/site/e2e/tests/organizationGroups.spec.ts b/site/e2e/tests/organizationGroups.spec.ts
@@ -22,7 +22,7 @@ test("create group", async ({ page }) => {
 	await page.goto(`/organizations/${org.name}`);
 
 	// Navigate to groups page
-	await page.getByText("Groups").click();
+	await page.getByRole("link", { name: "Groups" }).click();
 	await expect(page).toHaveTitle(`Groups - Org ${org.name} - Coder`);
 
 	// Create a new group
diff --git a/site/e2e/tests/organizationMembers.spec.ts b/site/e2e/tests/organizationMembers.spec.ts
@@ -15,7 +15,7 @@ test("add and remove organization member", async ({ page }) => {
 	const { displayName } = await createOrganization(page);
 
 	// Navigate to members page
-	await page.getByText("Members").click();
+	await page.getByRole("link", { name: "Members" }).click();
 	await expect(page).toHaveTitle(`Members - ${displayName} - Coder`);
 
 	// Add a user to the org
diff --git a/site/e2e/tests/organizations.spec.ts b/site/e2e/tests/organizations.spec.ts
@@ -28,14 +28,21 @@ test("create and delete organization", async ({ page }) => {
 	await expectUrl(page).toHavePathName(`/organizations/${name}`);
 	await expect(page.getByText("Organization created.")).toBeVisible();
 
+	await page.goto(`/organizations/${name}/settings`, {
+		waitUntil: "domcontentloaded",
+	});
+
 	const newName = randomName();
 	await page.getByLabel("Slug").fill(newName);
 	await page.getByLabel("Description").fill(`Org description ${newName}`);
 	await page.getByRole("button", { name: "Submit" }).click();
+	await expect(page.getByText("Organization settings updated.")).toBeVisible();
 
+	await page.goto(`/organizations/${newName}/settings`, {
+		waitUntil: "domcontentloaded",
+	});
 	// Expect to be redirected when renaming the organization
-	await expectUrl(page).toHavePathName(`/organizations/${newName}`);
-	await expect(page.getByText("Organization settings updated.")).toBeVisible();
+	await expectUrl(page).toHavePathName(`/organizations/${newName}/settings`);
 
 	await page.getByRole("button", { name: "Delete this organization" }).click();
 	const dialog = page.getByTestId("dialog");
diff --git a/site/src/modules/management/OrganizationSidebarView.tsx b/site/src/modules/management/OrganizationSidebarView.tsx
@@ -196,11 +196,6 @@ const OrganizationSettingsNavigation: FC<
 		<>
 			{active && (
 				<div className="flex flex-col gap-1 my-2">
-					{organization.permissions.editOrganization && (
-						<SidebarNavSubItem end href={urlForSubpage(organization.name)}>
-							Settings
-						</SidebarNavSubItem>
-					)}
 					{organization.permissions.editMembers && (
 						<SidebarNavSubItem end href={urlForSubpage(organization.name)}>
 							Members
diff --git a/site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx b/site/src/pages/ManagementSettingsPage/OrganizationSettingsPage.tsx
@@ -89,7 +89,7 @@ const OrganizationSettingsPage: FC = () => {
 						organizationId: organization.id,
 						req: values,
 					});
-				navigate(`/organizations/${updatedOrganization.name}`);
+				navigate(`/organizations/${updatedOrganization.name}/settings`);
 				displaySuccess("Organization settings updated.");
 			}}
 			onDeleteOrganization={() => {
