Fix tests

presleyp · presleyp · commit 62dad5e89849 · 2022-04-28T00:52:27.000Z
IRL is broken bc I need to send org id
diff --git a/site/src/api/index.ts b/site/src/api/index.ts
@@ -86,9 +86,8 @@ export const getUsers = async (): Promise<Types.PagedUsers> => {
 }
 
 export const createUser = async (user: TypesGen.CreateUserRequest): Promise<TypesGen.User> => {
-  // const response = await axios.post<TypesGen.User>("/api/v2/users", user)
-  // return response.data
-  return Promise.resolve(MockUser)
+  const response = await axios.post<TypesGen.User>("/api/v2/users", user)
+  return response.data
 }
 
 export const getBuildInfo = async (): Promise<Types.BuildInfoResponse> => {
diff --git a/site/src/components/CreateUserForm/CreateUserForm.stories.tsx b/site/src/components/CreateUserForm/CreateUserForm.stories.tsx
@@ -31,7 +31,7 @@ FormError.args = {
   onSubmit: action("submit"),
   isLoading: false,
   formErrors: {
-    email: "Bad email address",
+    username: "Username taken",
   },
 }
 
diff --git a/site/src/pages/UsersPage/CreateUserPage/CreateUserPage.test.tsx b/site/src/pages/UsersPage/CreateUserPage/CreateUserPage.test.tsx
@@ -1,4 +1,4 @@
-import { act, screen } from "@testing-library/react"
+import { screen } from "@testing-library/react"
 import userEvent from "@testing-library/user-event"
 import { rest } from "msw"
 import React from "react"
@@ -8,10 +8,11 @@ import { history, render } from "../../../testHelpers"
 import { server } from "../../../testHelpers/server"
 import { Language as UserLanguage } from "../../../xServices/users/usersXService"
 import { CreateUserPage, Language } from "./CreateUserPage"
+import * as API from "../../../api"
 
 const fillForm = async ({
-  username = "testuser",
-  email = "test@coder.com",
+  username = "someuser",
+  email = "someone@coder.com",
   password = "password",
 }: {
   username?: string
@@ -25,7 +26,7 @@ const fillForm = async ({
   await userEvent.type(emailField, email)
   await userEvent.type(passwordField, password)
   const submitButton = await screen.findByText(FooterLanguage.defaultSubmitLabel)
-  act(() => submitButton.click())
+  submitButton.click()
 }
 
 describe("Create User Page", () => {
@@ -40,11 +41,9 @@ describe("Create User Page", () => {
     expect(errorMessage).toBeDefined()
   })
   it("shows generic error message", async () => {
-    server.use(
-      rest.post("/api/v2/users", () => {
-        Promise.reject("something went wrong")
-      }),
-    )
+    jest.spyOn(API, "createUser").mockRejectedValueOnce({
+      data: "unknown error",
+    })
     render(<CreateUserPage />)
     await fillForm({})
     const errorMessage = await screen.findByText(Language.unknownError)
@@ -53,7 +52,7 @@ describe("Create User Page", () => {
   it("shows API error message", async () => {
     const fieldErrorMessage = "username already in use"
     server.use(
-      rest.post("/api/v2/users", (req, res, ctx) => {
+      rest.post("/api/v2/users", async (req, res, ctx) => {
         return res(
           ctx.status(400),
           ctx.json({
@@ -82,13 +81,13 @@ describe("Create User Page", () => {
   it("redirects to users page on cancel", async () => {
     render(<CreateUserPage />)
     const cancelButton = await screen.findByText(FooterLanguage.cancelLabel)
-    act(() => cancelButton.click())
+    cancelButton.click()
     expect(history.location.pathname).toEqual("/users")
   })
   it("redirects to users page on close", async () => {
     render(<CreateUserPage />)
     const closeButton = await screen.findByText("ESC")
-    act(() => closeButton.click())
+    closeButton.click()
     expect(history.location.pathname).toEqual("/users")
   })
 })

Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,8 @@ export const getUsers = async (): Promise<Types.PagedUsers> => {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`export const createUser = async (user: TypesGen.CreateUserRequest): Promise<TypesGen.User> => {`
`89`		`- // const response = await axios.post<TypesGen.User>("/api/v2/users", user)`
`90`		`- // return response.data`
`91`		`- return Promise.resolve(MockUser)`
	`89`	`+ const response = await axios.post<TypesGen.User>("/api/v2/users", user)`
	`90`	`+ return response.data`
`92`	`91`	`}`
`93`	`92`
`94`	`93`	`export const getBuildInfo = async (): Promise<Types.BuildInfoResponse> => {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ FormError.args = {`
`31`	`31`	`onSubmit: action("submit"),`
`32`	`32`	`isLoading: false,`
`33`	`33`	`formErrors: {`
`34`		`- email: "Bad email address",`
	`34`	`+ username: "Username taken",`
`35`	`35`	`},`
`36`	`36`	`}`
`37`	`37`