From c8844cde788fa2995396eb7e7658ac65d40f4e9d Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Thu, 18 Jul 2024 22:43:21 +0000 Subject: [PATCH] 00000000-0000-0000-0000-000000000000 no --- .../modules/dashboard/DashboardProvider.tsx | 4 +-- .../CreateTemplatePage.test.tsx | 26 ++++++++++--------- .../CreateWorkspacePage.test.tsx | 11 ++++---- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/site/src/modules/dashboard/DashboardProvider.tsx b/site/src/modules/dashboard/DashboardProvider.tsx index 2f3f16252887d..7cc85e92ebb99 100644 --- a/site/src/modules/dashboard/DashboardProvider.tsx +++ b/site/src/modules/dashboard/DashboardProvider.tsx @@ -9,7 +9,6 @@ import type { Experiments, } from "api/typesGenerated"; import { Loader } from "components/Loader/Loader"; -import { useAuthenticated } from "contexts/auth/RequireAuth"; import { useEmbeddedMetadata } from "hooks/useEmbeddedMetadata"; export interface DashboardValue { @@ -29,7 +28,6 @@ export const DashboardContext = createContext( export const DashboardProvider: FC = ({ children }) => { const { metadata } = useEmbeddedMetadata(); - const { user } = useAuthenticated(); const entitlementsQuery = useQuery(entitlements(metadata.entitlements)); const experimentsQuery = useQuery(experiments(metadata.experiments)); const appearanceQuery = useQuery(appearance(metadata.appearance)); @@ -44,7 +42,7 @@ export const DashboardProvider: FC = ({ children }) => { return ( { expect(router.state.location.pathname).toEqual( `/templates/${MockTemplate.name}/files`, ); - expect(API.createTemplateVersion).toHaveBeenCalledWith(MockOrganization.id, { - example_id: "aws-windows", - provisioner: "terraform", - storage_method: "file", - tags: {}, - user_variable_values: [ - { name: "first_variable", value: "First value" }, - { name: "second_variable", value: "2" }, - { name: "third_variable", value: "true" }, - ], - }); + expect(API.createTemplateVersion).toHaveBeenCalledWith( + "00000000-0000-0000-0000-000000000000", + { + example_id: "aws-windows", + provisioner: "terraform", + storage_method: "file", + tags: {}, + user_variable_values: [ + { name: "first_variable", value: "First value" }, + { name: "second_variable", value: "2" }, + { name: "third_variable", value: "true" }, + ], + }, + ); }); test("Create template from duplicating a template", async () => { diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.test.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.test.tsx index 02bde4b7134cf..4f0bcd5d71aea 100644 --- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.test.tsx +++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.test.tsx @@ -12,7 +12,6 @@ import { MockTemplateVersionParameter2, MockTemplateVersionParameter3, MockTemplateVersionExternalAuthGithub, - MockOrganization, MockTemplateVersionExternalAuthGithubAuthenticated, } from "testHelpers/entities"; import { @@ -60,7 +59,7 @@ describe("CreateWorkspacePage", () => { await waitFor(() => expect(API.createWorkspace).toBeCalledWith( - MockUser.organization_ids[0], + "00000000-0000-0000-0000-000000000000", MockUser.id, expect.objectContaining({ ...MockWorkspaceRichParametersRequest, @@ -224,7 +223,7 @@ describe("CreateWorkspacePage", () => { await waitFor(() => expect(API.createWorkspace).toBeCalledWith( - MockUser.organization_ids[0], + "00000000-0000-0000-0000-000000000000", MockUser.id, expect.objectContaining({ ...MockWorkspaceRequest, @@ -264,7 +263,7 @@ describe("CreateWorkspacePage", () => { await waitFor(() => expect(API.createWorkspace).toBeCalledWith( - MockUser.organization_ids[0], + "00000000-0000-0000-0000-000000000000", MockUser.id, expect.objectContaining({ ...MockWorkspaceRequest, @@ -288,7 +287,7 @@ describe("CreateWorkspacePage", () => { await waitFor(() => { expect(createWorkspaceSpy).toBeCalledWith( - MockOrganization.id, + "00000000-0000-0000-0000-000000000000", "me", expect.objectContaining({ template_version_id: MockTemplate.active_version_id, @@ -348,7 +347,7 @@ describe("CreateWorkspacePage", () => { await waitFor(() => { expect(createWorkspaceSpy).toBeCalledWith( - MockOrganization.id, + "00000000-0000-0000-0000-000000000000", "me", expect.objectContaining({ template_version_id: MockTemplate.active_version_id,