Merge branch 'main' of https://github.com/coder/coder into bq/upgrade…

…-msw
coder · BrunoQuaresma · Mar 19, 2024 · Mar 8, 2024 · Mar 8, 2024 · Mar 14, 2024
commit b64169172fe7d0eac4d13bfbc3563d5efb4492a4
diff --git a/site/src/contexts/auth/RequireAuth.test.tsx b/site/src/contexts/auth/RequireAuth.test.tsx
@@ -1,6 +1,12 @@
-import { screen } from "@testing-library/react";
+import { screen, renderHook } from "@testing-library/react";
 import { http, HttpResponse } from "msw";
-import { renderWithAuth } from "testHelpers/renderHelpers";
+import type { FC, PropsWithChildren } from "react";
+import { QueryClientProvider } from "react-query";
+import { MockPermissions, MockUser } from "testHelpers/entities";
+import {
+  renderWithAuth,
+  createTestQueryClient,
+} from "testHelpers/renderHelpers";
 import { server } from "testHelpers/server";
 import { AuthContext, type AuthContextValue } from "./AuthProvider";
 import { useAuthenticated } from "./RequireAuth";

diff --git a/site/src/modules/resources/PortForwardButton.tsx b/site/src/modules/resources/PortForwardButton.tsx
@@ -205,9 +205,7 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
   const canSharePortsPublic =
     canSharePorts && template.max_port_share_level === "public";
 
-  const publicMenuItem = canSharePortsPublic ? (
-    <MenuItem value="public">Public</MenuItem>
-  ) : (
+  const disabledPublicMenuItem = (
     <Tooltip title="This workspace template does not allow sharing ports with unauthenticated users.">
       {/* Tooltips don't work directly on disabled MenuItem components so you must wrap in div. */}
       <div>

diff --git a/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.test.tsx b/site/src/pages/TemplatePage/TemplateFilesPage/TemplateFilesPage.test.tsx
@@ -17,7 +17,7 @@ jest.mock("components/SyntaxHighlighter/SyntaxHighlighter", () => ({
 test("displays the template files even when there is no previous version", async () => {
   server.use(
     http.get(
-      "/api/v2/organizations/:orgId/templates/:template/versions/:version/previous",
+      "/api/v2/organizations/:organizationId/templates/:template/versions/:version/previous",
       () => {
         new HttpResponse(null, { status: 404 });
       },