From 6e1c7db5bc7ca60010d7a643d74be9be5bb6b31f Mon Sep 17 00:00:00 2001 From: Kira Pilot Date: Wed, 11 May 2022 20:18:49 +0000 Subject: [PATCH] chore: renaming index files --- site/src/api/{index.test.ts => api.test.ts} | 2 +- site/src/api/{index.ts => api.ts} | 0 site/src/components/AdminDropdown/AdminDropdown.test.tsx | 2 +- site/src/components/CliAuthToken/CliAuthToken.test.tsx | 2 +- site/src/components/CodeBlock/CodeBlock.test.tsx | 2 +- site/src/components/CodeExample/CodeExample.test.tsx | 2 +- site/src/components/EmptyState/EmptyState.test.tsx | 2 +- site/src/components/Footer/Footer.test.tsx | 2 +- site/src/components/Header/Header.test.tsx | 2 +- site/src/components/NavbarView/NavbarView.test.tsx | 2 +- .../ResetPasswordDialog/ResetPasswordDialog.stories.tsx | 2 +- site/src/components/RoleSelect/RoleSelect.stories.tsx | 2 +- site/src/components/Table/Table.test.tsx | 2 +- site/src/components/UserCell/UserCell.stories.tsx | 2 +- site/src/components/UserCell/UserCell.test.tsx | 2 +- site/src/components/UserDropdown/UserDropdown.test.tsx | 2 +- site/src/components/UsersTable/UsersTable.stories.tsx | 2 +- site/src/components/Workspace/Workspace.stories.tsx | 2 +- site/src/components/Workspace/Workspace.test.tsx | 2 +- .../WorkspaceSchedule/WorkspaceSchedule.stories.tsx | 2 +- site/src/forms/CreateTemplateForm.test.tsx | 2 +- site/src/forms/CreateWorkspaceForm.test.tsx | 2 +- site/src/pages/CliAuthPage/CliAuthPage.tsx | 2 +- site/src/pages/LoginPage/LoginPage.test.tsx | 2 +- .../pages/PreferencesPages/AccountPage/AccountPage.test.tsx | 4 ++-- .../OrganizationPage/TemplatePage/CreateWorkspacePage.tsx | 2 +- site/src/pages/TerminalPage/TerminalPage.test.tsx | 2 +- .../pages/UsersPage/CreateUserPage/CreateUserPage.test.tsx | 4 ++-- site/src/pages/UsersPage/UsersPage.test.tsx | 4 ++-- site/src/pages/UsersPage/UsersPageView.stories.tsx | 2 +- site/src/pages/WorkspacePage/WorkspacePage.test.tsx | 2 +- site/src/testHelpers/{index.tsx => renderHelpers.tsx} | 0 site/src/xServices/auth/authXService.ts | 2 +- site/src/xServices/buildInfo/buildInfoXService.ts | 2 +- site/src/xServices/roles/siteRolesXService.ts | 2 +- site/src/xServices/terminal/terminalXService.ts | 2 +- site/src/xServices/users/usersXService.ts | 2 +- site/src/xServices/workspace/workspaceXService.ts | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) rename site/src/api/{index.test.ts => api.test.ts} (98%) rename site/src/api/{index.ts => api.ts} (100%) rename site/src/testHelpers/{index.tsx => renderHelpers.tsx} (100%) diff --git a/site/src/api/index.test.ts b/site/src/api/api.test.ts similarity index 98% rename from site/src/api/index.test.ts rename to site/src/api/api.test.ts index c29be8728d544..60ea7fa8067c0 100644 --- a/site/src/api/index.test.ts +++ b/site/src/api/api.test.ts @@ -1,5 +1,5 @@ import axios from "axios" -import { getApiKey, login, logout } from "." +import { getApiKey, login, logout } from "./api" import { APIKeyResponse, LoginResponse } from "./types" // Mock the axios module so that no real network requests are made, but rather diff --git a/site/src/api/index.ts b/site/src/api/api.ts similarity index 100% rename from site/src/api/index.ts rename to site/src/api/api.ts diff --git a/site/src/components/AdminDropdown/AdminDropdown.test.tsx b/site/src/components/AdminDropdown/AdminDropdown.test.tsx index ee5ebe463cf1a..67e0af1c56326 100644 --- a/site/src/components/AdminDropdown/AdminDropdown.test.tsx +++ b/site/src/components/AdminDropdown/AdminDropdown.test.tsx @@ -1,6 +1,6 @@ import { screen } from "@testing-library/react" import React from "react" -import { history, render } from "../../testHelpers" +import { history, render } from "../../testHelpers/renderHelpers" import { AdminDropdown, Language } from "./AdminDropdown" const renderAndClick = async () => { diff --git a/site/src/components/CliAuthToken/CliAuthToken.test.tsx b/site/src/components/CliAuthToken/CliAuthToken.test.tsx index a017697232e56..4f12ea7c63be0 100644 --- a/site/src/components/CliAuthToken/CliAuthToken.test.tsx +++ b/site/src/components/CliAuthToken/CliAuthToken.test.tsx @@ -1,6 +1,6 @@ import { screen } from "@testing-library/react" import React from "react" -import { render } from "../../testHelpers" +import { render } from "../../testHelpers/renderHelpers" import { CliAuthToken } from "./CliAuthToken" describe("CliAuthToken", () => { diff --git a/site/src/components/CodeBlock/CodeBlock.test.tsx b/site/src/components/CodeBlock/CodeBlock.test.tsx index 396bad80fcdac..f3d7413418d56 100644 --- a/site/src/components/CodeBlock/CodeBlock.test.tsx +++ b/site/src/components/CodeBlock/CodeBlock.test.tsx @@ -1,6 +1,6 @@ import { screen } from "@testing-library/react" import React from "react" -import { render } from "../../testHelpers" +import { render } from "../../testHelpers/renderHelpers" import { CodeBlock } from "./CodeBlock" describe("CodeBlock", () => { diff --git a/site/src/components/CodeExample/CodeExample.test.tsx b/site/src/components/CodeExample/CodeExample.test.tsx index bd1e314b1afaa..a94f2e3ff0db0 100644 --- a/site/src/components/CodeExample/CodeExample.test.tsx +++ b/site/src/components/CodeExample/CodeExample.test.tsx @@ -1,6 +1,6 @@ import { screen } from "@testing-library/react" import React from "react" -import { render } from "../../testHelpers" +import { render } from "../../testHelpers/renderHelpers" import { CodeExample } from "./CodeExample" describe("CodeExample", () => { diff --git a/site/src/components/EmptyState/EmptyState.test.tsx b/site/src/components/EmptyState/EmptyState.test.tsx index 1632044c1c994..02164d90b77ee 100644 --- a/site/src/components/EmptyState/EmptyState.test.tsx +++ b/site/src/components/EmptyState/EmptyState.test.tsx @@ -1,6 +1,6 @@ import { screen } from "@testing-library/react" import React from "react" -import { render } from "../../testHelpers" +import { render } from "../../testHelpers/renderHelpers" import { EmptyState } from "./EmptyState" describe("EmptyState", () => { diff --git a/site/src/components/Footer/Footer.test.tsx b/site/src/components/Footer/Footer.test.tsx index 88da5a62c8291..f47ee0aac64ed 100644 --- a/site/src/components/Footer/Footer.test.tsx +++ b/site/src/components/Footer/Footer.test.tsx @@ -1,6 +1,6 @@ import { screen } from "@testing-library/react" import React from "react" -import { MockBuildInfo, render } from "../../testHelpers" +import { MockBuildInfo, render } from "../../testHelpers/renderHelpers" import { Footer, Language } from "./Footer" describe("Footer", () => { diff --git a/site/src/components/Header/Header.test.tsx b/site/src/components/Header/Header.test.tsx index 81c7bb2f3e53b..35d38de89c7c3 100644 --- a/site/src/components/Header/Header.test.tsx +++ b/site/src/components/Header/Header.test.tsx @@ -1,6 +1,6 @@ import { screen } from "@testing-library/react" import React from "react" -import { render } from "../../testHelpers" +import { render } from "../../testHelpers/renderHelpers" import { Header } from "./Header" describe("Header", () => { diff --git a/site/src/components/NavbarView/NavbarView.test.tsx b/site/src/components/NavbarView/NavbarView.test.tsx index 7bcf44bb5f658..c2f44e6ad5d27 100644 --- a/site/src/components/NavbarView/NavbarView.test.tsx +++ b/site/src/components/NavbarView/NavbarView.test.tsx @@ -1,7 +1,7 @@ import { screen } from "@testing-library/react" import React from "react" -import { render } from "../../testHelpers" import { MockUser } from "../../testHelpers/entities" +import { render } from "../../testHelpers/renderHelpers" import { NavbarView } from "./NavbarView" describe("NavbarView", () => { diff --git a/site/src/components/ResetPasswordDialog/ResetPasswordDialog.stories.tsx b/site/src/components/ResetPasswordDialog/ResetPasswordDialog.stories.tsx index 170d280988387..177b7b1a28a78 100644 --- a/site/src/components/ResetPasswordDialog/ResetPasswordDialog.stories.tsx +++ b/site/src/components/ResetPasswordDialog/ResetPasswordDialog.stories.tsx @@ -1,6 +1,6 @@ import { Story } from "@storybook/react" import React from "react" -import { MockUser } from "../../testHelpers" +import { MockUser } from "../../testHelpers/renderHelpers" import { ResetPasswordDialog, ResetPasswordDialogProps } from "./ResetPasswordDialog" export default { diff --git a/site/src/components/RoleSelect/RoleSelect.stories.tsx b/site/src/components/RoleSelect/RoleSelect.stories.tsx index 3fe6134a81580..72352afc53a1e 100644 --- a/site/src/components/RoleSelect/RoleSelect.stories.tsx +++ b/site/src/components/RoleSelect/RoleSelect.stories.tsx @@ -1,6 +1,6 @@ import { ComponentMeta, Story } from "@storybook/react" import React from "react" -import { MockAdminRole, MockMemberRole, MockSiteRoles } from "../../testHelpers" +import { MockAdminRole, MockMemberRole, MockSiteRoles } from "../../testHelpers/renderHelpers" import { RoleSelect, RoleSelectProps } from "./RoleSelect" export default { diff --git a/site/src/components/Table/Table.test.tsx b/site/src/components/Table/Table.test.tsx index 6543483ec4f40..edf936f355ae8 100644 --- a/site/src/components/Table/Table.test.tsx +++ b/site/src/components/Table/Table.test.tsx @@ -1,6 +1,6 @@ import { screen } from "@testing-library/react" import React from "react" -import { render } from "../../testHelpers" +import { render } from "../../testHelpers/renderHelpers" import { Column, Table } from "./Table" interface TestData { diff --git a/site/src/components/UserCell/UserCell.stories.tsx b/site/src/components/UserCell/UserCell.stories.tsx index 1cdc0c39aacc5..83225340d8efb 100644 --- a/site/src/components/UserCell/UserCell.stories.tsx +++ b/site/src/components/UserCell/UserCell.stories.tsx @@ -1,6 +1,6 @@ import { ComponentMeta, Story } from "@storybook/react" import React from "react" -import { MockUser, MockUserAgent } from "../../testHelpers" +import { MockUser, MockUserAgent } from "../../testHelpers/renderHelpers" import { UserCell, UserCellProps } from "./UserCell" export default { diff --git a/site/src/components/UserCell/UserCell.test.tsx b/site/src/components/UserCell/UserCell.test.tsx index adec2f644f1f1..9986edac0c5d5 100644 --- a/site/src/components/UserCell/UserCell.test.tsx +++ b/site/src/components/UserCell/UserCell.test.tsx @@ -1,6 +1,6 @@ import { fireEvent, render, screen } from "@testing-library/react" import React from "react" -import { MockUser, MockUserAgent, WrapperComponent } from "../../testHelpers" +import { MockUser, MockUserAgent, WrapperComponent } from "../../testHelpers/renderHelpers" import { UserCell, UserCellProps } from "./UserCell" namespace Helpers { diff --git a/site/src/components/UserDropdown/UserDropdown.test.tsx b/site/src/components/UserDropdown/UserDropdown.test.tsx index c5261b1f0dcc4..0bdaaa75c4b67 100644 --- a/site/src/components/UserDropdown/UserDropdown.test.tsx +++ b/site/src/components/UserDropdown/UserDropdown.test.tsx @@ -1,7 +1,7 @@ import { screen } from "@testing-library/react" import React from "react" -import { render } from "../../testHelpers" import { MockUser } from "../../testHelpers/entities" +import { render } from "../../testHelpers/renderHelpers" import { Language, UserDropdown, UserDropdownProps } from "./UsersDropdown" const renderAndClick = async (props: Partial = {}) => { diff --git a/site/src/components/UsersTable/UsersTable.stories.tsx b/site/src/components/UsersTable/UsersTable.stories.tsx index 448a11cac0680..ddd025b547bf3 100644 --- a/site/src/components/UsersTable/UsersTable.stories.tsx +++ b/site/src/components/UsersTable/UsersTable.stories.tsx @@ -1,6 +1,6 @@ import { ComponentMeta, Story } from "@storybook/react" import React from "react" -import { MockSiteRoles, MockUser, MockUser2 } from "../../testHelpers" +import { MockSiteRoles, MockUser, MockUser2 } from "../../testHelpers/renderHelpers" import { UsersTable, UsersTableProps } from "./UsersTable" export default { diff --git a/site/src/components/Workspace/Workspace.stories.tsx b/site/src/components/Workspace/Workspace.stories.tsx index cc624d1bbe91c..816b2d633038a 100644 --- a/site/src/components/Workspace/Workspace.stories.tsx +++ b/site/src/components/Workspace/Workspace.stories.tsx @@ -1,6 +1,6 @@ import { Story } from "@storybook/react" import React from "react" -import { MockOrganization, MockTemplate, MockWorkspace } from "../../testHelpers" +import { MockOrganization, MockTemplate, MockWorkspace } from "../../testHelpers/renderHelpers" import { Workspace, WorkspaceProps } from "./Workspace" export default { diff --git a/site/src/components/Workspace/Workspace.test.tsx b/site/src/components/Workspace/Workspace.test.tsx index 534835a41529c..80f247d2f061a 100644 --- a/site/src/components/Workspace/Workspace.test.tsx +++ b/site/src/components/Workspace/Workspace.test.tsx @@ -1,6 +1,6 @@ import { screen } from "@testing-library/react" import React from "react" -import { MockOrganization, MockTemplate, MockWorkspace, render } from "../../testHelpers" +import { MockOrganization, MockTemplate, MockWorkspace, render } from "../../testHelpers/renderHelpers" import { Workspace } from "./Workspace" describe("Workspace", () => { diff --git a/site/src/components/WorkspaceSchedule/WorkspaceSchedule.stories.tsx b/site/src/components/WorkspaceSchedule/WorkspaceSchedule.stories.tsx index ff5988c72c0fe..c250580ae2a55 100644 --- a/site/src/components/WorkspaceSchedule/WorkspaceSchedule.stories.tsx +++ b/site/src/components/WorkspaceSchedule/WorkspaceSchedule.stories.tsx @@ -1,6 +1,6 @@ import { Story } from "@storybook/react" import React from "react" -import { MockWorkspaceAutostartEnabled } from "../../testHelpers" +import { MockWorkspaceAutostartEnabled } from "../../testHelpers/renderHelpers" import { WorkspaceSchedule, WorkspaceScheduleProps } from "./WorkspaceSchedule" export default { diff --git a/site/src/forms/CreateTemplateForm.test.tsx b/site/src/forms/CreateTemplateForm.test.tsx index 1882cb38507c4..0f531a153943e 100644 --- a/site/src/forms/CreateTemplateForm.test.tsx +++ b/site/src/forms/CreateTemplateForm.test.tsx @@ -1,6 +1,6 @@ import { render, screen } from "@testing-library/react" import React from "react" -import { MockOrganization, MockProvisioner, MockTemplate } from "../testHelpers" +import { MockOrganization, MockProvisioner, MockTemplate } from "../testHelpers/renderHelpers" import { CreateTemplateForm } from "./CreateTemplateForm" describe("CreateTemplateForm", () => { diff --git a/site/src/forms/CreateWorkspaceForm.test.tsx b/site/src/forms/CreateWorkspaceForm.test.tsx index 59a7cd3ac782a..a9e87cf719c83 100644 --- a/site/src/forms/CreateWorkspaceForm.test.tsx +++ b/site/src/forms/CreateWorkspaceForm.test.tsx @@ -1,6 +1,6 @@ import { render, screen } from "@testing-library/react" import React from "react" -import { MockOrganization, MockTemplate, MockWorkspace } from "../testHelpers" +import { MockOrganization, MockTemplate, MockWorkspace } from "../testHelpers/renderHelpers" import { CreateWorkspaceForm } from "./CreateWorkspaceForm" describe("CreateWorkspaceForm", () => { diff --git a/site/src/pages/CliAuthPage/CliAuthPage.tsx b/site/src/pages/CliAuthPage/CliAuthPage.tsx index 44498ab7bb14a..ed9a8b73b7cba 100644 --- a/site/src/pages/CliAuthPage/CliAuthPage.tsx +++ b/site/src/pages/CliAuthPage/CliAuthPage.tsx @@ -1,7 +1,7 @@ import { makeStyles } from "@material-ui/core/styles" import { useActor } from "@xstate/react" import React, { useContext, useEffect, useState } from "react" -import { getApiKey } from "../../api" +import { getApiKey } from "../../api/api" import { CliAuthToken } from "../../components/CliAuthToken/CliAuthToken" import { FullScreenLoader } from "../../components/Loader/FullScreenLoader" import { XServiceContext } from "../../xServices/StateContext" diff --git a/site/src/pages/LoginPage/LoginPage.test.tsx b/site/src/pages/LoginPage/LoginPage.test.tsx index 1d5e8c2abf771..f81c3ebddeae6 100644 --- a/site/src/pages/LoginPage/LoginPage.test.tsx +++ b/site/src/pages/LoginPage/LoginPage.test.tsx @@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event" import { rest } from "msw" import React from "react" import { Language } from "../../components/SignInForm/SignInForm" -import { history, render } from "../../testHelpers" +import { history, render } from "../../testHelpers/renderHelpers" import { server } from "../../testHelpers/server" import { LoginPage } from "./LoginPage" diff --git a/site/src/pages/PreferencesPages/AccountPage/AccountPage.test.tsx b/site/src/pages/PreferencesPages/AccountPage/AccountPage.test.tsx index 115e2f7a3df6e..492e3d8ee25cd 100644 --- a/site/src/pages/PreferencesPages/AccountPage/AccountPage.test.tsx +++ b/site/src/pages/PreferencesPages/AccountPage/AccountPage.test.tsx @@ -1,9 +1,9 @@ import { fireEvent, screen, waitFor } from "@testing-library/react" import React from "react" -import * as API from "../../../api" +import * as API from "../../../api/api" import { GlobalSnackbar } from "../../../components/GlobalSnackbar/GlobalSnackbar" import * as AccountForm from "../../../components/PreferencesAccountForm/PreferencesAccountForm" -import { renderWithAuth } from "../../../testHelpers" +import { renderWithAuth } from "../../../testHelpers/renderHelpers" import * as AuthXService from "../../../xServices/auth/authXService" import { AccountPage, Language } from "./AccountPage" diff --git a/site/src/pages/TemplatesPages/OrganizationPage/TemplatePage/CreateWorkspacePage.tsx b/site/src/pages/TemplatesPages/OrganizationPage/TemplatePage/CreateWorkspacePage.tsx index 1524ee58a06d2..b3c7c2ebbc626 100644 --- a/site/src/pages/TemplatesPages/OrganizationPage/TemplatePage/CreateWorkspacePage.tsx +++ b/site/src/pages/TemplatesPages/OrganizationPage/TemplatePage/CreateWorkspacePage.tsx @@ -3,7 +3,7 @@ import { useSelector } from "@xstate/react" import React, { useCallback, useContext } from "react" import { useNavigate, useParams } from "react-router-dom" import useSWR from "swr" -import * as API from "../../../../api" +import * as API from "../../../../api/api" import * as Types from "../../../../api/types" import { ErrorSummary } from "../../../../components/ErrorSummary/ErrorSummary" import { FullScreenLoader } from "../../../../components/Loader/FullScreenLoader" diff --git a/site/src/pages/TerminalPage/TerminalPage.test.tsx b/site/src/pages/TerminalPage/TerminalPage.test.tsx index 07762ce7ba48b..2ece384d7e41d 100644 --- a/site/src/pages/TerminalPage/TerminalPage.test.tsx +++ b/site/src/pages/TerminalPage/TerminalPage.test.tsx @@ -6,7 +6,7 @@ import React from "react" import { Route, Routes } from "react-router-dom" import { TextDecoder, TextEncoder } from "util" import { ReconnectingPTYRequest } from "../../api/types" -import { history, MockWorkspaceAgent, render } from "../../testHelpers" +import { history, MockWorkspaceAgent, render } from "../../testHelpers/renderHelpers" import { server } from "../../testHelpers/server" import TerminalPage, { Language } from "./TerminalPage" diff --git a/site/src/pages/UsersPage/CreateUserPage/CreateUserPage.test.tsx b/site/src/pages/UsersPage/CreateUserPage/CreateUserPage.test.tsx index 80c86367dd2e7..467af3fdca713 100644 --- a/site/src/pages/UsersPage/CreateUserPage/CreateUserPage.test.tsx +++ b/site/src/pages/UsersPage/CreateUserPage/CreateUserPage.test.tsx @@ -2,10 +2,10 @@ import { screen } from "@testing-library/react" import userEvent from "@testing-library/user-event" import { rest } from "msw" import React from "react" -import * as API from "../../../api" +import * as API from "../../../api/api" import { Language as FormLanguage } from "../../../components/CreateUserForm/CreateUserForm" import { Language as FooterLanguage } from "../../../components/FormFooter/FormFooter" -import { history, render } from "../../../testHelpers" +import { history, render } from "../../../testHelpers/renderHelpers" import { server } from "../../../testHelpers/server" import { Language as UserLanguage } from "../../../xServices/users/usersXService" import { CreateUserPage, Language } from "./CreateUserPage" diff --git a/site/src/pages/UsersPage/UsersPage.test.tsx b/site/src/pages/UsersPage/UsersPage.test.tsx index 04a9ef6e41c2c..d371c9fa58d60 100644 --- a/site/src/pages/UsersPage/UsersPage.test.tsx +++ b/site/src/pages/UsersPage/UsersPage.test.tsx @@ -1,12 +1,12 @@ import { fireEvent, screen, waitFor, within } from "@testing-library/react" import React from "react" -import * as API from "../../api" +import * as API from "../../api/api" import { Role } from "../../api/typesGenerated" import { GlobalSnackbar } from "../../components/GlobalSnackbar/GlobalSnackbar" import { Language as ResetPasswordDialogLanguage } from "../../components/ResetPasswordDialog/ResetPasswordDialog" import { Language as RoleSelectLanguage } from "../../components/RoleSelect/RoleSelect" import { Language as UsersTableLanguage } from "../../components/UsersTable/UsersTable" -import { MockAuditorRole, MockUser, MockUser2, render } from "../../testHelpers" +import { MockAuditorRole, MockUser, MockUser2, render } from "../../testHelpers/renderHelpers" import { Language as usersXServiceLanguage } from "../../xServices/users/usersXService" import { Language as UsersPageLanguage, UsersPage } from "./UsersPage" diff --git a/site/src/pages/UsersPage/UsersPageView.stories.tsx b/site/src/pages/UsersPage/UsersPageView.stories.tsx index 266a29acc24ac..feeb3fe42e240 100644 --- a/site/src/pages/UsersPage/UsersPageView.stories.tsx +++ b/site/src/pages/UsersPage/UsersPageView.stories.tsx @@ -1,6 +1,6 @@ import { ComponentMeta, Story } from "@storybook/react" import React from "react" -import { MockSiteRoles, MockUser, MockUser2 } from "../../testHelpers" +import { MockSiteRoles, MockUser, MockUser2 } from "../../testHelpers/renderHelpers" import { UsersPageView, UsersPageViewProps } from "./UsersPageView" export default { diff --git a/site/src/pages/WorkspacePage/WorkspacePage.test.tsx b/site/src/pages/WorkspacePage/WorkspacePage.test.tsx index 4f2795b32bbc6..24f67948df192 100644 --- a/site/src/pages/WorkspacePage/WorkspacePage.test.tsx +++ b/site/src/pages/WorkspacePage/WorkspacePage.test.tsx @@ -1,6 +1,6 @@ import { screen } from "@testing-library/react" import React from "react" -import { MockTemplate, MockWorkspace, renderWithAuth } from "../../testHelpers" +import { MockTemplate, MockWorkspace, renderWithAuth } from "../../testHelpers/renderHelpers" import { WorkspacePage } from "./WorkspacePage" describe("Workspace Page", () => { diff --git a/site/src/testHelpers/index.tsx b/site/src/testHelpers/renderHelpers.tsx similarity index 100% rename from site/src/testHelpers/index.tsx rename to site/src/testHelpers/renderHelpers.tsx diff --git a/site/src/xServices/auth/authXService.ts b/site/src/xServices/auth/authXService.ts index 0683e126b7465..9a39968951233 100644 --- a/site/src/xServices/auth/authXService.ts +++ b/site/src/xServices/auth/authXService.ts @@ -1,5 +1,5 @@ import { assign, createMachine } from "xstate" -import * as API from "../../api" +import * as API from "../../api/api" import * as Types from "../../api/types" import * as TypesGen from "../../api/typesGenerated" import { displaySuccess } from "../../components/GlobalSnackbar/utils" diff --git a/site/src/xServices/buildInfo/buildInfoXService.ts b/site/src/xServices/buildInfo/buildInfoXService.ts index 2c428b2ec2460..ea7e59f475cd0 100644 --- a/site/src/xServices/buildInfo/buildInfoXService.ts +++ b/site/src/xServices/buildInfo/buildInfoXService.ts @@ -1,5 +1,5 @@ import { assign, createMachine } from "xstate" -import * as API from "../../api" +import * as API from "../../api/api" import * as Types from "../../api/types" export interface BuildInfoContext { diff --git a/site/src/xServices/roles/siteRolesXService.ts b/site/src/xServices/roles/siteRolesXService.ts index d99ba3db8a235..2380150581fb4 100644 --- a/site/src/xServices/roles/siteRolesXService.ts +++ b/site/src/xServices/roles/siteRolesXService.ts @@ -1,5 +1,5 @@ import { assign, createMachine } from "xstate" -import * as API from "../../api" +import * as API from "../../api/api" import * as TypesGen from "../../api/typesGenerated" import { displayError } from "../../components/GlobalSnackbar/utils" diff --git a/site/src/xServices/terminal/terminalXService.ts b/site/src/xServices/terminal/terminalXService.ts index d522611451c5c..4f6c24014998c 100644 --- a/site/src/xServices/terminal/terminalXService.ts +++ b/site/src/xServices/terminal/terminalXService.ts @@ -1,5 +1,5 @@ import { assign, createMachine } from "xstate" -import * as API from "../../api" +import * as API from "../../api/api" import * as Types from "../../api/types" export interface TerminalContext { diff --git a/site/src/xServices/users/usersXService.ts b/site/src/xServices/users/usersXService.ts index dd3d63277072f..278bf7740123a 100644 --- a/site/src/xServices/users/usersXService.ts +++ b/site/src/xServices/users/usersXService.ts @@ -1,5 +1,5 @@ import { assign, createMachine } from "xstate" -import * as API from "../../api" +import * as API from "../../api/api" import { ApiError, FieldErrors, isApiError, mapApiErrorToFieldErrors } from "../../api/errors" import * as Types from "../../api/types" import * as TypesGen from "../../api/typesGenerated" diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts index 34137ce5f0796..8c56062f1e2b5 100644 --- a/site/src/xServices/workspace/workspaceXService.ts +++ b/site/src/xServices/workspace/workspaceXService.ts @@ -1,5 +1,5 @@ import { assign, createMachine } from "xstate" -import * as API from "../../api" +import * as API from "../../api/api" import * as Types from "../../api/types" interface WorkspaceContext {