Jun 15, 2023 · Jun 9, 2023 · Jun 15, 2023 · Jun 15, 2023 · Jun 15, 2023
diff --git a/site/.storybook/preview.jsx b/site/.storybook/preview.jsx
 import CssBaseline from "@mui/material/CssBaseline"
 import { StyledEngineProvider, ThemeProvider } from "@mui/material/styles"
 import { createMemoryHistory } from "history"
 import {unstable_HistoryRouter as HistoryRouter } from "react-router-dom"

 import {MemoryRouter } from "react-router-dom"
 import { HelmetProvider } from "react-helmet-async"
 import { dark } from "../src/theme"
 import "../src/theme/globalFonts"
 import "../src/i18n"

 const history = createMemoryHistory()

 export const decorators = [
  (Story) => (
    <StyledEngineProvider injectFirst>
  ),
  (Story) => {
    return (
      <HistoryRouter history={history}>
      <MemoryRouter>
        <Story />
      </HistoryRouter>
      </MemoryRouter>
    )
  },
  (Story) => {
diff --git a/site/package.json b/site/package.json
    "eventsourcemock": "2.0.0",
    "formik": "2.4.1",
    "front-matter": "4.0.2",
    "history": "5.3.0",
    "i18next": "22.5.0",
    "jest-environment-jsdom": "29.5.0",
    "jest-location-mock": "1.0.9",
    "react-helmet-async": "1.3.0",
    "react-i18next": "12.2.2",
    "react-markdown": "8.0.3",
    "react-router-dom": "6.4.1",
    "react-router-dom": "6.13.0",
    "react-syntax-highlighter": "15.5.0",
    "react-use": "17.4.0",
    "react-virtualized-auto-sizer": "1.0.7",
diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
                />
              </Route>

              <Route path="/@:username">
              <Route path="/:username">
                <Route path=":workspace">
                  <Route index element={<WorkspacePage />} />
                  <Route

            {/* Terminal and CLI auth pages don't have the dashboard layout */}
            <Route
              path="/@:username/:workspace/terminal"
              path="/:username/:workspace/terminal"
              element={<TerminalPage />}
            />
            <Route path="cli-auth" element={<CliAuthenticationPage />} />
diff --git a/site/src/components/Dialogs/ConfirmDialog/ConfirmDialog.test.tsx b/site/src/components/Dialogs/ConfirmDialog/ConfirmDialog.test.tsx
 import { fireEvent, render, screen } from "@testing-library/react"
 import { FC } from "react"
 import { WrapperComponent } from "../../../testHelpers/renderHelpers"
 import { fireEvent, screen } from "@testing-library/react"
 import { ConfirmDialog, ConfirmDialogProps } from "./ConfirmDialog"

 namespace Helpers {
  export const Component: FC<React.PropsWithChildren<ConfirmDialogProps>> = (
    props: ConfirmDialogProps,
  ) => {
    return (
      <WrapperComponent>
        <ConfirmDialog {...props} />
      </WrapperComponent>
    )
  }
 }
 import { render } from "testHelpers/renderHelpers"

 describe("ConfirmDialog", () => {
  it("renders", () => {
    }

    // When
    render(<Helpers.Component {...props} />)
    render(<ConfirmDialog {...props} />)

    // Then
    expect(screen.getByRole("dialog")).toBeDefined()
    }

    // When
    render(<Helpers.Component {...props} />)
    render(<ConfirmDialog {...props} />)

    // Then
    expect(screen.queryByText("CANCEL")).toBeNull()
    }

    // When
    render(<Helpers.Component {...props} />)
    render(<ConfirmDialog {...props} />)

    // Then
    expect(screen.getByText("CANCEL")).toBeDefined()
    }

    // When
    render(<Helpers.Component {...props} />)
    render(<ConfirmDialog {...props} />)

    // Then
    expect(screen.getByText("CANCEL")).toBeDefined()
    }

    // When
    render(<Helpers.Component {...props} />)
    render(<ConfirmDialog {...props} />)

    // Then
    expect(screen.queryByText("CANCEL")).toBeNull()
    }

    // When
    render(<Helpers.Component {...props} />)
    render(<ConfirmDialog {...props} />)
    fireEvent.click(screen.getByText("CANCEL"))

    // Then
    }

    // When
    render(<Helpers.Component {...props} />)
    render(<ConfirmDialog {...props} />)
    fireEvent.click(screen.getByText("CONFIRM"))

    // Then
diff --git a/site/src/components/UserCell/UserCell.stories.tsx b/site/src/components/UserCell/UserCell.stories.tsx
diff --git a/site/src/components/UserCell/UserCell.test.tsx b/site/src/components/UserCell/UserCell.test.tsx
diff --git a/site/src/components/UserCell/UserCell.tsx b/site/src/components/UserCell/UserCell.tsx
diff --git a/site/src/pages/LoginPage/LoginPage.test.tsx b/site/src/pages/LoginPage/LoginPage.test.tsx
 import { fireEvent, screen } from "@testing-library/react"
 import userEvent from "@testing-library/user-event"
 import { rest } from "msw"
 import {Route, Routes } from "react-router-dom"
 import {createMemoryRouter } from "react-router-dom"
 import { Language } from "../../components/SignInForm/SignInForm"
 import {
  history,
  render,
  renderWithRouter,
  waitForLoaderToBeRemoved,
 } from "../../testHelpers/renderHelpers"
 import { server } from "../../testHelpers/server"

 describe("LoginPage", () => {
  beforeEach(() => {
    history.replace("/login")
    // appear logged out
    server.use(
      rest.get("/api/v2/users/me", (req, res, ctx) => {
    // Then
    const errorMessage = await screen.findByText(apiErrorMessage)
    expect(errorMessage).toBeDefined()
    expect(history.location.pathname).toEqual("/login")
  })

  it("shows github authentication when enabled", async () => {
    )

    // When
    render(
      <Routes>
        <Route path="/login" element={<LoginPage />}></Route>
        <Route path="/setup" element={<h1>Setup</h1>}></Route>
      </Routes>,
    renderWithRouter(
      createMemoryRouter(
        [
          {
            path: "/login",
            element: <LoginPage />,
          },
          {
            path: "/setup",
            element: <h1>Setup</h1>,
          },
        ],
        { initialEntries: ["/login"] },
      ),
    )

    // Then
Original file line number	Diff line number	Diff line change
		@@ -1,14 +1,12 @@
		import CssBaseline from "@mui/material/CssBaseline"
		import { StyledEngineProvider, ThemeProvider } from "@mui/material/styles"
		import { createMemoryHistory } from "history"
		import {unstable_HistoryRouter as HistoryRouter } from "react-router-dom"

		import {MemoryRouter } from "react-router-dom"
		import { HelmetProvider } from "react-helmet-async"
		import { dark } from "../src/theme"
		import "../src/theme/globalFonts"
		import "../src/i18n"

		const history = createMemoryHistory()

		export const decorators = [
		(Story) => (
		<StyledEngineProvider injectFirst>
Expand All		@@ -20,9 +18,9 @@ export const decorators = [
		),
		(Story) => {
		return (
		<HistoryRouter history={history}>
		<MemoryRouter>
		<Story />
		</HistoryRouter>
		</MemoryRouter>
		)
		},
		(Story) => {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,7 +64,6 @@
		"eventsourcemock": "2.0.0",
		"formik": "2.4.1",
		"front-matter": "4.0.2",
		"history": "5.3.0",
		"i18next": "22.5.0",
		"jest-environment-jsdom": "29.5.0",
		"jest-location-mock": "1.0.9",
Expand All		@@ -80,7 +79,7 @@
		"react-helmet-async": "1.3.0",
		"react-i18next": "12.2.2",
		"react-markdown": "8.0.3",
		"react-router-dom": "6.4.1",
		"react-router-dom": "6.13.0",
		"react-syntax-highlighter": "15.5.0",
		"react-use": "17.4.0",
		"react-virtualized-auto-sizer": "1.0.7",
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -292,7 +292,7 @@ export const AppRouter: FC = () => {
		/>
		</Route>

		<Route path="/@:username">
		<Route path="/:username">
		<Route path=":workspace">
		<Route index element={<WorkspacePage />} />
		<Route
Expand All		@@ -316,7 +316,7 @@ export const AppRouter: FC = () => {

		{/* Terminal and CLI auth pages don't have the dashboard layout */}
		<Route
		path="/@:username/:workspace/terminal"
		path="/:username/:workspace/terminal"
		element={<TerminalPage />}
		/>
		<Route path="cli-auth" element={<CliAuthenticationPage />} />
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,19 +1,6 @@
		import { fireEvent, render, screen } from "@testing-library/react"
		import { FC } from "react"
		import { WrapperComponent } from "../../../testHelpers/renderHelpers"
		import { fireEvent, screen } from "@testing-library/react"
		import { ConfirmDialog, ConfirmDialogProps } from "./ConfirmDialog"

		namespace Helpers {
		export const Component: FC<React.PropsWithChildren<ConfirmDialogProps>> = (
		props: ConfirmDialogProps,
		) => {
		return (
		<WrapperComponent>
		<ConfirmDialog {...props} />
		</WrapperComponent>
		)
		}
		}
		import { render } from "testHelpers/renderHelpers"

		describe("ConfirmDialog", () => {
		it("renders", () => {
Expand All		@@ -26,7 +13,7 @@ describe("ConfirmDialog", () => {
		}

		// When
		render(<Helpers.Component {...props} />)
		render(<ConfirmDialog {...props} />)

		// Then
		expect(screen.getByRole("dialog")).toBeDefined()
Expand All		@@ -43,7 +30,7 @@ describe("ConfirmDialog", () => {
		}

		// When
		render(<Helpers.Component {...props} />)
		render(<ConfirmDialog {...props} />)

		// Then
		expect(screen.queryByText("CANCEL")).toBeNull()
Expand All		@@ -61,7 +48,7 @@ describe("ConfirmDialog", () => {
		}

		// When
		render(<Helpers.Component {...props} />)
		render(<ConfirmDialog {...props} />)

		// Then
		expect(screen.getByText("CANCEL")).toBeDefined()
Expand All		@@ -79,7 +66,7 @@ describe("ConfirmDialog", () => {
		}

		// When
		render(<Helpers.Component {...props} />)
		render(<ConfirmDialog {...props} />)

		// Then
		expect(screen.getByText("CANCEL")).toBeDefined()
Expand All		@@ -98,7 +85,7 @@ describe("ConfirmDialog", () => {
		}

		// When
		render(<Helpers.Component {...props} />)
		render(<ConfirmDialog {...props} />)

		// Then
		expect(screen.queryByText("CANCEL")).toBeNull()
Expand All		@@ -116,7 +103,7 @@ describe("ConfirmDialog", () => {
		}

		// When
		render(<Helpers.Component {...props} />)
		render(<ConfirmDialog {...props} />)
		fireEvent.click(screen.getByText("CANCEL"))

		// Then
Expand All		@@ -138,7 +125,7 @@ describe("ConfirmDialog", () => {
		}

		// When
		render(<Helpers.Component {...props} />)
		render(<ConfirmDialog {...props} />)
		fireEvent.click(screen.getByText("CONFIRM"))

		// Then
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,11 +1,11 @@
		import { fireEvent, screen } from "@testing-library/react"
		import userEvent from "@testing-library/user-event"
		import { rest } from "msw"
		import {Route, Routes } from "react-router-dom"
		import {createMemoryRouter } from "react-router-dom"
		import { Language } from "../../components/SignInForm/SignInForm"
		import {
		history,
		render,
		renderWithRouter,
		waitForLoaderToBeRemoved,
		} from "../../testHelpers/renderHelpers"
		import { server } from "../../testHelpers/server"
Expand All		@@ -17,7 +17,6 @@ const { t } = i18n

		describe("LoginPage", () => {
		beforeEach(() => {
		history.replace("/login")
		// appear logged out
		server.use(
		rest.get("/api/v2/users/me", (req, res, ctx) => {
Expand DownExpand Up		@@ -58,7 +57,6 @@ describe("LoginPage", () => {
		// Then
		const errorMessage = await screen.findByText(apiErrorMessage)
		expect(errorMessage).toBeDefined()
		expect(history.location.pathname).toEqual("/login")
		})

		it("shows github authentication when enabled", async () => {
Expand DownExpand Up		@@ -92,11 +90,20 @@ describe("LoginPage", () => {
		)

		// When
		render(
		<Routes>
		<Route path="/login" element={<LoginPage />}></Route>
		<Route path="/setup" element={<h1>Setup</h1>}></Route>
		</Routes>,
		renderWithRouter(
		createMemoryRouter(
		[
		{
		path: "/login",
		element: <LoginPage />,
		},
		{
		path: "/setup",
		element: <h1>Setup</h1>,
		},
		],
		{ initialEntries: ["/login"] },
		),
		)

		// Then
Expand Down