Refactor mocks

coder · BrunoQuaresma · Mar 29, 2023 · Mar 28, 2023 · Mar 28, 2023 · Mar 28, 2023
commit 84c812205aebbb5bd45650233a91e504cc092806
diff --git a/site/src/components/AppLink/AppLink.stories.tsx b/site/src/components/AppLink/AppLink.stories.tsx
@@ -3,7 +3,7 @@ import {
   MockWorkspace,
   MockWorkspaceAgent,
   MockWorkspaceApp,
-} from "testHelpers/renderHelpers"
+} from "testHelpers/entities"
 import { AppLink, AppLinkProps } from "./AppLink"
 
 export default {

diff --git a/site/src/components/SSHButton/SSHButton.stories.tsx b/site/src/components/SSHButton/SSHButton.stories.tsx
@@ -1,8 +1,5 @@
 import { Story } from "@storybook/react"
-import {
-  MockWorkspace,
-  MockWorkspaceAgent,
-} from "../../testHelpers/renderHelpers"
+import { MockWorkspace, MockWorkspaceAgent } from "testHelpers/entities"
 import { SSHButton, SSHButtonProps } from "./SSHButton"
 
 export default {

diff --git a/site/src/components/TemplateStats/TemplateStats.stories.tsx b/site/src/components/TemplateStats/TemplateStats.stories.tsx
@@ -1,5 +1,5 @@
 import { Story } from "@storybook/react"
-import * as Mocks from "../../testHelpers/renderHelpers"
+import { MockTemplate, MockTemplateVersion } from "testHelpers/entities"
 import {
   TemplateStats,
   TemplateStatsProps,
@@ -16,33 +16,33 @@ const Template: Story<TemplateStatsProps> = (args) => (
 
 export const Example = Template.bind({})
 Example.args = {
-  template: Mocks.MockTemplate,
-  activeVersion: Mocks.MockTemplateVersion,
+  template: MockTemplate,
+  activeVersion: MockTemplateVersion,
 }
 
 export const UsedByMany = Template.bind({})
 UsedByMany.args = {
   template: {
-    ...Mocks.MockTemplate,
+    ...MockTemplate,
     active_user_count: 15,
   },
-  activeVersion: Mocks.MockTemplateVersion,
+  activeVersion: MockTemplateVersion,
 }
 
 export const ActiveUsersNotLoaded = Template.bind({})
 ActiveUsersNotLoaded.args = {
   template: {
-    ...Mocks.MockTemplate,
+    ...MockTemplate,
     active_user_count: -1,
   },
-  activeVersion: Mocks.MockTemplateVersion,
+  activeVersion: MockTemplateVersion,
 }
 
 export const LongTemplateVersion = Template.bind({})
 LongTemplateVersion.args = {
-  template: Mocks.MockTemplate,
+  template: MockTemplate,
   activeVersion: {
-    ...Mocks.MockTemplateVersion,
+    ...MockTemplateVersion,
     name: "thisisareallyreallylongnamefortesting",
   },
 }
@@ -52,8 +52,8 @@ LongTemplateVersion.parameters = {
 
 export const SmallViewport = Template.bind({})
 SmallViewport.args = {
-  template: Mocks.MockTemplate,
-  activeVersion: Mocks.MockTemplateVersion,
+  template: MockTemplate,
+  activeVersion: MockTemplateVersion,
 }
 SmallViewport.parameters = {
   chromatic: { viewports: [600] },

diff --git a/site/src/components/TerminalLink/TerminalLink.stories.tsx b/site/src/components/TerminalLink/TerminalLink.stories.tsx
@@ -1,5 +1,5 @@
 import { Story } from "@storybook/react"
-import { MockWorkspace } from "../../testHelpers/renderHelpers"
+import { MockWorkspace } from "testHelpers/entities"
 import { TerminalLink, TerminalLinkProps } from "./TerminalLink"
 
 export default {

diff --git a/site/src/components/UserCell/UserCell.stories.tsx b/site/src/components/UserCell/UserCell.stories.tsx
@@ -1,5 +1,5 @@
 import { ComponentMeta, Story } from "@storybook/react"
-import { MockUser, MockUserAgent } from "../../testHelpers/renderHelpers"
+import { MockUser, MockUserAgent } from "testHelpers/entities"
 import { UserCell, UserCellProps } from "./UserCell"
 
 export default {

diff --git a/site/src/components/UsersTable/UsersTable.stories.tsx b/site/src/components/UsersTable/UsersTable.stories.tsx
@@ -1,9 +1,9 @@
 import { ComponentMeta, Story } from "@storybook/react"
 import {
-  MockAssignableSiteRoles,
   MockUser,
   MockUser2,
-} from "../../testHelpers/renderHelpers"
+  MockAssignableSiteRoles,
+} from "testHelpers/entities"
 import { UsersTable, UsersTableProps } from "./UsersTable"
 
 export default {

diff --git a/site/src/components/VSCodeDesktopButton/VSCodeDesktopButton.stories.tsx b/site/src/components/VSCodeDesktopButton/VSCodeDesktopButton.stories.tsx
@@ -1,5 +1,5 @@
 import { Story } from "@storybook/react"
-import { MockWorkspace, MockWorkspaceAgent } from "testHelpers/renderHelpers"
+import { MockWorkspace, MockWorkspaceAgent } from "testHelpers/entities"
 import {
   VSCodeDesktopButton,
   VSCodeDesktopButtonProps,

diff --git a/site/src/components/WorkspaceBuildProgress/WorkspaceBuildProgress.stories.tsx b/site/src/components/WorkspaceBuildProgress/WorkspaceBuildProgress.stories.tsx
@@ -1,10 +1,10 @@
 import { ComponentMeta, Story } from "@storybook/react"
 import dayjs from "dayjs"
 import {
-  MockProvisionerJob,
   MockStartingWorkspace,
   MockWorkspaceBuild,
-} from "../../testHelpers/renderHelpers"
+  MockProvisionerJob,
+} from "testHelpers/entities"
 import {
   WorkspaceBuildProgress,
   WorkspaceBuildProgressProps,

diff --git a/site/src/components/WorkspaceStats/WorkspaceStats.stories.tsx b/site/src/components/WorkspaceStats/WorkspaceStats.stories.tsx
@@ -1,6 +1,5 @@
 import { Story } from "@storybook/react"
-import * as Mocks from "../../testHelpers/renderHelpers"
-import { MockWorkspace } from "testHelpers/renderHelpers"
+import { MockWorkspace } from "testHelpers/entities"
 import {
   WorkspaceStats,
   WorkspaceStatsProps,
@@ -17,7 +16,7 @@ const Template: Story<WorkspaceStatsProps> = (args) => (
 
 export const Example = Template.bind({})
 Example.args = {
-  workspace: Mocks.MockWorkspace,
+  workspace: MockWorkspace,
 }
 
 export const Outdated = Template.bind({})

diff --git a/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.stories.tsx b/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.stories.tsx
@@ -10,7 +10,7 @@ import {
   MockStoppedWorkspace,
   MockStoppingWorkspace,
   MockWorkspace,
-} from "testHelpers/renderHelpers"
+} from "testHelpers/entities"
 import {
   WorkspaceStatusBadge,
   WorkspaceStatusBadgeProps,

diff --git a/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPageView.stories.tsx b/site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPageView.stories.tsx
@@ -1,5 +1,11 @@
 import { Story } from "@storybook/react"
-import * as Mocks from "testHelpers/renderHelpers"
+import {
+  MockTemplate,
+  MockTemplateDAUResponse,
+  MockTemplateVersion,
+  MockWorkspaceResource,
+  MockWorkspaceResource2,
+} from "testHelpers/entities"
 import {
   TemplateSummaryPageView,
   TemplateSummaryPageViewProps,
@@ -16,31 +22,31 @@ const Template: Story<TemplateSummaryPageViewProps> = (args) => (
 
 export const Example = Template.bind({})
 Example.args = {
-  template: Mocks.MockTemplate,
-  activeVersion: Mocks.MockTemplateVersion,
+  template: MockTemplate,
+  activeVersion: MockTemplateVersion,
   data: {
-    resources: [Mocks.MockWorkspaceResource, Mocks.MockWorkspaceResource2],
-    versions: [Mocks.MockTemplateVersion],
-    daus: Mocks.MockTemplateDAUResponse,
+    resources: [MockWorkspaceResource, MockWorkspaceResource2],
+    versions: [MockTemplateVersion],
+    daus: MockTemplateDAUResponse,
   },
 }
 
 export const NoIcon = Template.bind({})
 NoIcon.args = {
-  template: { ...Mocks.MockTemplate, icon: "" },
-  activeVersion: Mocks.MockTemplateVersion,
+  template: { ...MockTemplate, icon: "" },
+  activeVersion: MockTemplateVersion,
   data: {
-    resources: [Mocks.MockWorkspaceResource, Mocks.MockWorkspaceResource2],
-    versions: [Mocks.MockTemplateVersion],
-    daus: Mocks.MockTemplateDAUResponse,
+    resources: [MockWorkspaceResource, MockWorkspaceResource2],
+    versions: [MockTemplateVersion],
+    daus: MockTemplateDAUResponse,
   },
 }
 
 export const SmallViewport = Template.bind({})
 SmallViewport.args = {
-  template: Mocks.MockTemplate,
+  template: MockTemplate,
   activeVersion: {
-    ...Mocks.MockTemplateVersion,
+    ...MockTemplateVersion,
     readme: `---
   name:Template test
   ---
@@ -54,9 +60,9 @@ SmallViewport.args = {
   `,
   },
   data: {
-    resources: [Mocks.MockWorkspaceResource, Mocks.MockWorkspaceResource2],
-    versions: [Mocks.MockTemplateVersion],
-    daus: Mocks.MockTemplateDAUResponse,
+    resources: [MockWorkspaceResource, MockWorkspaceResource2],
+    versions: [MockTemplateVersion],
+    daus: MockTemplateDAUResponse,
   },
 }
 SmallViewport.parameters = {

diff --git a/...ges/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPageView.stories.tsx b/...ges/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPageView.stories.tsx
@@ -1,7 +1,6 @@
 import { action } from "@storybook/addon-actions"
 import { Story } from "@storybook/react"
-import * as Mocks from "../../../testHelpers/renderHelpers"
-import { makeMockApiError } from "../../../testHelpers/renderHelpers"
+import { makeMockApiError, MockTemplate } from "testHelpers/entities"
 import {
   TemplateSettingsPageView,
   TemplateSettingsPageViewProps,
@@ -11,7 +10,7 @@ export default {
   title: "pages/TemplateSettingsPageView",
   component: TemplateSettingsPageView,
   args: {
-    template: Mocks.MockTemplate,
+    template: MockTemplate,
     onSubmit: action("onSubmit"),
     onCancel: action("cancel"),
   },

diff --git a/.../src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.stories.tsx b/.../src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.stories.tsx
@@ -1,6 +1,6 @@
 import { action } from "@storybook/addon-actions"
 import { Story } from "@storybook/react"
-import * as Mocks from "../../../testHelpers/renderHelpers"
+import { MockTemplate } from "testHelpers/entities"
 import {
   TemplateSchedulePageView,
   TemplateSchedulePageViewProps,
@@ -11,7 +11,7 @@ export default {
   component: TemplateSchedulePageView,
   args: {
     canSetMaxTTL: true,
-    template: Mocks.MockTemplate,
+    template: MockTemplate,
     onSubmit: action("onSubmit"),
     onCancel: action("cancel"),
   },

diff --git a/site/src/pages/UsersPage/UsersPageView.stories.tsx b/site/src/pages/UsersPage/UsersPageView.stories.tsx
@@ -1,10 +1,10 @@
 import { ComponentMeta, Story } from "@storybook/react"
 import { createPaginationRef } from "components/PaginationWidget/utils"
 import {
-  MockAssignableSiteRoles,
   MockUser,
   MockUser2,
-} from "../../testHelpers/renderHelpers"
+  MockAssignableSiteRoles,
+} from "testHelpers/entities"
 import { UsersPageView, UsersPageViewProps } from "./UsersPageView"
 
 export default {

diff --git a/site/src/testHelpers/renderHelpers.tsx b/site/src/testHelpers/renderHelpers.tsx
@@ -138,5 +138,3 @@ export const waitForLoaderToBeRemoved = (): Promise<void> =>
   waitForElementToBeRemoved(() => screen.queryByTestId("loader"), {
     timeout: 5_000,
   })
-
-export * from "./entities"