Skip to content

Commit 84c8122

Browse files
BrunoQuaresmaBrunoQuaresma
committed
Refactor mocks
1 parent 591284d commit 84c8122

File tree

15 files changed

+51
-52
lines changed

15 files changed

+51
-52
lines changed

‎site/src/components/AppLink/AppLink.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
MockWorkspace,
44
MockWorkspaceAgent,
55
MockWorkspaceApp,
6-
} from "testHelpers/renderHelpers"
6+
} from "testHelpers/entities"
77
import { AppLink, AppLinkProps } from "./AppLink"
88

99
export default {

‎site/src/components/SSHButton/SSHButton.stories.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import { Story } from "@storybook/react"
2-
import {
3-
MockWorkspace,
4-
MockWorkspaceAgent,
5-
} from "../../testHelpers/renderHelpers"
2+
import { MockWorkspace, MockWorkspaceAgent } from "testHelpers/entities"
63
import { SSHButton, SSHButtonProps } from "./SSHButton"
74

85
export default {

‎site/src/components/TemplateStats/TemplateStats.stories.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Story } from "@storybook/react"
2-
import * as Mocks from "../../testHelpers/renderHelpers"
2+
import { MockTemplate, MockTemplateVersion } from "testHelpers/entities"
33
import {
44
TemplateStats,
55
TemplateStatsProps,
@@ -16,33 +16,33 @@ const Template: Story<TemplateStatsProps> = (args) => (
1616

1717
export const Example = Template.bind({})
1818
Example.args = {
19-
template: Mocks.MockTemplate,
20-
activeVersion: Mocks.MockTemplateVersion,
19+
template: MockTemplate,
20+
activeVersion: MockTemplateVersion,
2121
}
2222

2323
export const UsedByMany = Template.bind({})
2424
UsedByMany.args = {
2525
template: {
26-
...Mocks.MockTemplate,
26+
...MockTemplate,
2727
active_user_count: 15,
2828
},
29-
activeVersion: Mocks.MockTemplateVersion,
29+
activeVersion: MockTemplateVersion,
3030
}
3131

3232
export const ActiveUsersNotLoaded = Template.bind({})
3333
ActiveUsersNotLoaded.args = {
3434
template: {
35-
...Mocks.MockTemplate,
35+
...MockTemplate,
3636
active_user_count: -1,
3737
},
38-
activeVersion: Mocks.MockTemplateVersion,
38+
activeVersion: MockTemplateVersion,
3939
}
4040

4141
export const LongTemplateVersion = Template.bind({})
4242
LongTemplateVersion.args = {
43-
template: Mocks.MockTemplate,
43+
template: MockTemplate,
4444
activeVersion: {
45-
...Mocks.MockTemplateVersion,
45+
...MockTemplateVersion,
4646
name: "thisisareallyreallylongnamefortesting",
4747
},
4848
}
@@ -52,8 +52,8 @@ LongTemplateVersion.parameters = {
5252

5353
export const SmallViewport = Template.bind({})
5454
SmallViewport.args = {
55-
template: Mocks.MockTemplate,
56-
activeVersion: Mocks.MockTemplateVersion,
55+
template: MockTemplate,
56+
activeVersion: MockTemplateVersion,
5757
}
5858
SmallViewport.parameters = {
5959
chromatic: { viewports: [600] },

‎site/src/components/TerminalLink/TerminalLink.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Story } from "@storybook/react"
2-
import { MockWorkspace } from "../../testHelpers/renderHelpers"
2+
import { MockWorkspace } from "testHelpers/entities"
33
import { TerminalLink, TerminalLinkProps } from "./TerminalLink"
44

55
export default {

‎site/src/components/UserCell/UserCell.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ComponentMeta, Story } from "@storybook/react"
2-
import { MockUser, MockUserAgent } from "../../testHelpers/renderHelpers"
2+
import { MockUser, MockUserAgent } from "testHelpers/entities"
33
import { UserCell, UserCellProps } from "./UserCell"
44

55
export default {

‎site/src/components/UsersTable/UsersTable.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { ComponentMeta, Story } from "@storybook/react"
22
import {
3-
MockAssignableSiteRoles,
43
MockUser,
54
MockUser2,
6-
} from "../../testHelpers/renderHelpers"
5+
MockAssignableSiteRoles,
6+
} from "testHelpers/entities"
77
import { UsersTable, UsersTableProps } from "./UsersTable"
88

99
export default {

‎site/src/components/VSCodeDesktopButton/VSCodeDesktopButton.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Story } from "@storybook/react"
2-
import { MockWorkspace, MockWorkspaceAgent } from "testHelpers/renderHelpers"
2+
import { MockWorkspace, MockWorkspaceAgent } from "testHelpers/entities"
33
import {
44
VSCodeDesktopButton,
55
VSCodeDesktopButtonProps,

‎site/src/components/WorkspaceBuildProgress/WorkspaceBuildProgress.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { ComponentMeta, Story } from "@storybook/react"
22
import dayjs from "dayjs"
33
import {
4-
MockProvisionerJob,
54
MockStartingWorkspace,
65
MockWorkspaceBuild,
7-
} from "../../testHelpers/renderHelpers"
6+
MockProvisionerJob,
7+
} from "testHelpers/entities"
88
import {
99
WorkspaceBuildProgress,
1010
WorkspaceBuildProgressProps,

‎site/src/components/WorkspaceStats/WorkspaceStats.stories.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Story } from "@storybook/react"
2-
import * as Mocks from "../../testHelpers/renderHelpers"
3-
import { MockWorkspace } from "testHelpers/renderHelpers"
2+
import { MockWorkspace } from "testHelpers/entities"
43
import {
54
WorkspaceStats,
65
WorkspaceStatsProps,
@@ -17,7 +16,7 @@ const Template: Story<WorkspaceStatsProps> = (args) => (
1716

1817
export const Example = Template.bind({})
1918
Example.args = {
20-
workspace: Mocks.MockWorkspace,
19+
workspace: MockWorkspace,
2120
}
2221

2322
export const Outdated = Template.bind({})

‎site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
MockStoppedWorkspace,
1111
MockStoppingWorkspace,
1212
MockWorkspace,
13-
} from "testHelpers/renderHelpers"
13+
} from "testHelpers/entities"
1414
import {
1515
WorkspaceStatusBadge,
1616
WorkspaceStatusBadgeProps,

‎site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPageView.stories.tsx

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
import { Story } from "@storybook/react"
2-
import * as Mocks from "testHelpers/renderHelpers"
2+
import {
3+
MockTemplate,
4+
MockTemplateDAUResponse,
5+
MockTemplateVersion,
6+
MockWorkspaceResource,
7+
MockWorkspaceResource2,
8+
} from "testHelpers/entities"
39
import {
410
TemplateSummaryPageView,
511
TemplateSummaryPageViewProps,
@@ -16,31 +22,31 @@ const Template: Story<TemplateSummaryPageViewProps> = (args) => (
1622

1723
export const Example = Template.bind({})
1824
Example.args = {
19-
template: Mocks.MockTemplate,
20-
activeVersion: Mocks.MockTemplateVersion,
25+
template: MockTemplate,
26+
activeVersion: MockTemplateVersion,
2127
data: {
22-
resources: [Mocks.MockWorkspaceResource, Mocks.MockWorkspaceResource2],
23-
versions: [Mocks.MockTemplateVersion],
24-
daus: Mocks.MockTemplateDAUResponse,
28+
resources: [MockWorkspaceResource, MockWorkspaceResource2],
29+
versions: [MockTemplateVersion],
30+
daus: MockTemplateDAUResponse,
2531
},
2632
}
2733

2834
export const NoIcon = Template.bind({})
2935
NoIcon.args = {
30-
template: { ...Mocks.MockTemplate, icon: "" },
31-
activeVersion: Mocks.MockTemplateVersion,
36+
template: { ...MockTemplate, icon: "" },
37+
activeVersion: MockTemplateVersion,
3238
data: {
33-
resources: [Mocks.MockWorkspaceResource, Mocks.MockWorkspaceResource2],
34-
versions: [Mocks.MockTemplateVersion],
35-
daus: Mocks.MockTemplateDAUResponse,
39+
resources: [MockWorkspaceResource, MockWorkspaceResource2],
40+
versions: [MockTemplateVersion],
41+
daus: MockTemplateDAUResponse,
3642
},
3743
}
3844

3945
export const SmallViewport = Template.bind({})
4046
SmallViewport.args = {
41-
template: Mocks.MockTemplate,
47+
template: MockTemplate,
4248
activeVersion: {
43-
...Mocks.MockTemplateVersion,
49+
...MockTemplateVersion,
4450
readme: `---
4551
name:Template test
4652
---
@@ -54,9 +60,9 @@ SmallViewport.args = {
5460
`,
5561
},
5662
data: {
57-
resources: [Mocks.MockWorkspaceResource, Mocks.MockWorkspaceResource2],
58-
versions: [Mocks.MockTemplateVersion],
59-
daus: Mocks.MockTemplateDAUResponse,
63+
resources: [MockWorkspaceResource, MockWorkspaceResource2],
64+
versions: [MockTemplateVersion],
65+
daus: MockTemplateDAUResponse,
6066
},
6167
}
6268
SmallViewport.parameters = {

‎site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPageView.stories.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { action } from "@storybook/addon-actions"
22
import { Story } from "@storybook/react"
3-
import * as Mocks from "../../../testHelpers/renderHelpers"
4-
import { makeMockApiError } from "../../../testHelpers/renderHelpers"
3+
import { makeMockApiError, MockTemplate } from "testHelpers/entities"
54
import {
65
TemplateSettingsPageView,
76
TemplateSettingsPageViewProps,
@@ -11,7 +10,7 @@ export default {
1110
title: "pages/TemplateSettingsPageView",
1211
component: TemplateSettingsPageView,
1312
args: {
14-
template: Mocks.MockTemplate,
13+
template: MockTemplate,
1514
onSubmit: action("onSubmit"),
1615
onCancel: action("cancel"),
1716
},

‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePageView.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { action } from "@storybook/addon-actions"
22
import { Story } from "@storybook/react"
3-
import * as Mocks from "../../../testHelpers/renderHelpers"
3+
import { MockTemplate } from "testHelpers/entities"
44
import {
55
TemplateSchedulePageView,
66
TemplateSchedulePageViewProps,
@@ -11,7 +11,7 @@ export default {
1111
component: TemplateSchedulePageView,
1212
args: {
1313
canSetMaxTTL: true,
14-
template: Mocks.MockTemplate,
14+
template: MockTemplate,
1515
onSubmit: action("onSubmit"),
1616
onCancel: action("cancel"),
1717
},

‎site/src/pages/UsersPage/UsersPageView.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { ComponentMeta, Story } from "@storybook/react"
22
import { createPaginationRef } from "components/PaginationWidget/utils"
33
import {
4-
MockAssignableSiteRoles,
54
MockUser,
65
MockUser2,
7-
} from "../../testHelpers/renderHelpers"
6+
MockAssignableSiteRoles,
7+
} from "testHelpers/entities"
88
import { UsersPageView, UsersPageViewProps } from "./UsersPageView"
99

1010
export default {

‎site/src/testHelpers/renderHelpers.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,5 +138,3 @@ export const waitForLoaderToBeRemoved = (): Promise<void> =>
138138
waitForElementToBeRemoved(() => screen.queryByTestId("loader"), {
139139
timeout: 5_000,
140140
})
141-
142-
export * from "./entities"

0 commit comments

Comments
 (0)