Update org member tests

code-asher · code-asher · commit 8760d0b03b64 · 2024-08-01T11:33:06.000-08:00
- Was not using the right layout.
- Add feature and permissions responses.
- Must use beforeEach, I guess routes get reset somewhere.
- A bit unrelated, but change the useQuery to match the format of the
  others (avoiding the spread).
diff --git a/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx b/site/src/pages/ManagementSettingsPage/ManagementSettingsLayout.tsx
@@ -37,14 +37,13 @@ export const ManagementSettingsLayout: FC = () => {
   const { permissions } = useAuthenticated();
   const { experiments } = useDashboard();
   const feats = useFeatureVisibility();
-  const deploymentConfigQuery = useQuery({
-    ...deploymentConfig(),
+  const deploymentConfigQuery = useQuery(
     // TODO: This is probably normally fine because we will not show links to
     //       pages that need this data, but if you manually visit the page you
     //       will see an endless loader when maybe we should show a "permission
     //       denied" error or at least a 404 instead.
-    enabled: permissions.viewDeploymentValues,
-  });
+    permissions.viewDeploymentValues ? deploymentConfig() : { enabled: false },
+  );
   const organizationsQuery = useQuery(organizations());
 
   const canViewOrganizations =
diff --git a/site/src/pages/ManagementSettingsPage/OrganizationMembersPage.test.tsx b/site/src/pages/ManagementSettingsPage/OrganizationMembersPage.test.tsx
@@ -2,27 +2,42 @@ import { fireEvent, screen, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { HttpResponse, http } from "msw";
 import type { SlimRole } from "api/typesGenerated";
-import { MockUser, MockOrganizationAuditorRole } from "testHelpers/entities";
 import {
-  renderWithTemplateSettingsLayout,
+  MockEntitlementsWithMultiOrg,
+  MockUser,
+  MockOrganization,
+  MockOrganizationAuditorRole,
+} from "testHelpers/entities";
+import {
+  renderWithManagementSettingsLayout,
   waitForLoaderToBeRemoved,
 } from "testHelpers/renderHelpers";
 import { server } from "testHelpers/server";
 import OrganizationMembersPage from "./OrganizationMembersPage";
 
 jest.spyOn(console, "error").mockImplementation(() => {});
 
-beforeAll(() => {
+beforeEach(() => {
   server.use(
     http.get("/api/v2/experiments", () => {
       return HttpResponse.json(["multi-organization"]);
     }),
+    http.get("/api/v2/entitlements", () => {
+      return HttpResponse.json(MockEntitlementsWithMultiOrg);
+    }),
+    http.post("/api/v2/authcheck", async () => {
+      return HttpResponse.json({
+        editMembers: true,
+        viewMembers: true,
+        viewDeploymentValues: true,
+      });
+    }),
   );
 });
 
 const renderPage = async () => {
-  renderWithTemplateSettingsLayout(<OrganizationMembersPage />, {
-    route: `/organizations/my-organization/members`,
+  renderWithManagementSettingsLayout(<OrganizationMembersPage />, {
+    route: `/organizations/${MockOrganization.name}/members`,
     path: `/organizations/:organization/members`,
   });
   await waitForLoaderToBeRemoved();
@@ -69,7 +84,7 @@ describe("OrganizationMembersPage", () => {
       it("shows a success message", async () => {
         await renderPage();
         await removeMember();
-        await screen.findByText("Member removed.");
+        await screen.findByText("Member removed successfully.");
       });
     });
   });
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -2209,6 +2209,17 @@ export const MockEntitlementsWithUserLimit: TypesGen.Entitlements = {
   }),
 };
 
+export const MockEntitlementsWithMultiOrg: TypesGen.Entitlements = {
+  ...MockEntitlements,
+  has_license: true,
+  features: withDefaultFeatures({
+    multiple_organizations: {
+      enabled: true,
+      entitlement: "entitled",
+    },
+  }),
+};
+
 export const MockExperiments: TypesGen.Experiment[] = [];
 
 /**
