Skip to content

Commit 0e05cd2

Browse files
BrunoQuaresmaBrunoQuaresma
committed
RefactorTemplateSettingsPage tests
1 parent d5ff966 commit 0e05cd2

File tree

12 files changed

+99
-122
lines changed

12 files changed

+99
-122
lines changed

‎site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import { docs } from "utils/docs";
4646
import {
4747
AutostopRequirementDaysHelperText,
4848
AutostopRequirementWeeksHelperText,
49-
} from "pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/AutostopRequirementHelperText";
49+
} from "pages/TemplateSettingsPage/TemplateSchedulePage/AutostopRequirementHelperText";
5050
import MenuItem from "@mui/material/MenuItem";
5151

5252
const MAX_DESCRIPTION_CHAR_LIMIT = 128;

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

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,33 @@
1-
import { action } from "@storybook/addon-actions";
2-
import { Story } from "@storybook/react";
31
import { mockApiError, MockTemplate } from "testHelpers/entities";
4-
import {
5-
TemplateSettingsPageView,
6-
TemplateSettingsPageViewProps,
7-
} from "./TemplateSettingsPageView";
2+
import { TemplateSettingsPageView } from "./TemplateSettingsPageView";
3+
import type { Meta, StoryObj } from "@storybook/react";
84

9-
export default {
5+
const meta: Meta<typeof TemplateSettingsPageView> = {
106
title: "pages/TemplateSettingsPageView",
117
component: TemplateSettingsPageView,
128
args: {
139
template: MockTemplate,
14-
onSubmit: action("onSubmit"),
15-
onCancel: action("cancel"),
1610
},
1711
};
1812

19-
const Template: Story<TemplateSettingsPageViewProps> = (args) => (
20-
<TemplateSettingsPageView {...args} />
21-
);
13+
export default meta;
14+
type Story = StoryObj<typeof TemplateSettingsPageView>;
2215

23-
export const Example = Template.bind({});
24-
Example.args = {};
16+
export const Example: Story = {};
2517

26-
export const SaveTemplateSettingsError = Template.bind({});
27-
SaveTemplateSettingsError.args = {
28-
submitError: mockApiError({
29-
message: 'Template "test" already exists.',
30-
validations: [
31-
{
32-
field: "name",
33-
detail: "This value is already in use and should be unique.",
34-
},
35-
],
36-
}),
37-
initialTouched: {
38-
allow_user_cancel_workspace_jobs: true,
18+
export const SaveTemplateSettingsError: Story = {
19+
args: {
20+
submitError: mockApiError({
21+
message: 'Template "test" already exists.',
22+
validations: [
23+
{
24+
field: "name",
25+
detail: "This value is already in use and should be unique.",
26+
},
27+
],
28+
}),
29+
initialTouched: {
30+
allow_user_cancel_workspace_jobs: true,
31+
},
3932
},
4033
};

‎site/src/pages/TemplateSettingsPage/TemplatePermissionsPage/TemplatePermissionsPageView.stories.tsx

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,37 @@
1-
import { Story } from "@storybook/react";
21
import {
32
MockOrganization,
43
MockTemplateACL,
54
MockTemplateACLEmpty,
65
} from "testHelpers/entities";
7-
import {
8-
TemplatePermissionsPageView,
9-
TemplatePermissionsPageViewProps,
10-
} from "./TemplatePermissionsPageView";
6+
import { TemplatePermissionsPageView } from "./TemplatePermissionsPageView";
7+
import type { Meta, StoryObj } from "@storybook/react";
118

12-
export default {
9+
const meta: Meta<typeof TemplatePermissionsPageView> = {
1310
title: "pages/TemplatePermissionsPageView",
1411
component: TemplatePermissionsPageView,
1512
};
1613

17-
const Template: Story<TemplatePermissionsPageViewProps> = (
18-
args: TemplatePermissionsPageViewProps,
19-
) => <TemplatePermissionsPageView {...args} />;
14+
export default meta;
15+
type Story = StoryObj<typeof TemplatePermissionsPageView>;
2016

21-
export const Empty = Template.bind({});
22-
Empty.args = {
23-
templateACL: MockTemplateACLEmpty,
24-
canUpdatePermissions: false,
17+
export const Empty: Story = {
18+
args: {
19+
templateACL: MockTemplateACLEmpty,
20+
canUpdatePermissions: false,
21+
},
2522
};
2623

27-
export const WithTemplateACL = Template.bind({});
28-
WithTemplateACL.args = {
29-
templateACL: MockTemplateACL,
30-
canUpdatePermissions: false,
24+
export const WithTemplateACL: Story = {
25+
args: {
26+
templateACL: MockTemplateACL,
27+
canUpdatePermissions: false,
28+
},
3129
};
3230

33-
export const WithUpdatePermissions = Template.bind({});
34-
WithUpdatePermissions.args = {
35-
templateACL: MockTemplateACL,
36-
canUpdatePermissions: true,
37-
organizationId: MockOrganization.id,
31+
export const WithUpdatePermissions: Story = {
32+
args: {
33+
templateACL: MockTemplateACL,
34+
canUpdatePermissions: true,
35+
organizationId: MockOrganization.id,
36+
},
3837
};

‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/AutostopRequirementHelperText.tsx renamed to ‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/AutostopRequirementHelperText.tsx

File renamed without changes.

‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TTLHelperText.tsx renamed to ‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TTLHelperText.tsx

File renamed without changes.

‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx renamed to ‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx

File renamed without changes.

‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.test.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ import {
1010
renderWithTemplateSettingsLayout,
1111
waitForLoaderToBeRemoved,
1212
} from "testHelpers/renderHelpers";
13-
import {
14-
TemplateScheduleFormValues,
15-
getValidationSchema,
16-
} from "./TemplateScheduleForm/formHelpers";
13+
import { TemplateScheduleFormValues, getValidationSchema } from "./formHelpers";
1714
import TemplateSchedulePage from "./TemplateSchedulePage";
1815
import i18next from "i18next";
1916

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Template, UpdateTemplateMeta } from "api/typesGenerated";
22
import { ComponentProps, FC } from "react";
3-
import { TemplateScheduleForm } from "./TemplateScheduleForm/TemplateScheduleForm";
3+
import { TemplateScheduleForm } from "./TemplateScheduleForm";
44
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
55
import { makeStyles } from "@mui/styles";
66

‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/formHelpers.tsx renamed to ‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/formHelpers.tsx

File renamed without changes.

‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/useWorkspacesToBeDeleted.ts renamed to ‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/useWorkspacesToBeDeleted.ts

File renamed without changes.

‎site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPageView.stories.tsx

Lines changed: 54 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { action } from "@storybook/addon-actions";
2-
import { Story } from "@storybook/react";
31
import {
42
mockApiError,
53
MockTemplateVersion,
@@ -9,87 +7,77 @@ import {
97
MockTemplateVersionVariable4,
108
MockTemplateVersionVariable5,
119
} from "testHelpers/entities";
12-
import {
13-
TemplateVariablesPageView,
14-
TemplateVariablesPageViewProps,
15-
} from "./TemplateVariablesPageView";
10+
import { TemplateVariablesPageView } from "./TemplateVariablesPageView";
11+
import type { Meta, StoryObj } from "@storybook/react";
1612

17-
export default {
13+
const meta: Meta<typeof TemplateVariablesPageView> = {
1814
title: "pages/TemplateVariablesPageView",
1915
component: TemplateVariablesPageView,
2016
};
2117

22-
const TemplateVariables: Story<TemplateVariablesPageViewProps> = (args) => (
23-
<TemplateVariablesPageView {...args} />
24-
);
18+
export default meta;
19+
type Story = StoryObj<typeof TemplateVariablesPageView>;
2520

26-
export const Loading = TemplateVariables.bind({});
27-
Loading.args = {
28-
onSubmit: action("onSubmit"),
29-
onCancel: action("cancel"),
30-
};
21+
export const Loading: Story = {};
3122

32-
export const Basic = TemplateVariables.bind({});
33-
Basic.args = {
34-
templateVersion: MockTemplateVersion,
35-
templateVariables: [
36-
MockTemplateVersionVariable1,
37-
MockTemplateVersionVariable2,
38-
MockTemplateVersionVariable3,
39-
MockTemplateVersionVariable4,
40-
],
41-
onSubmit: action("onSubmit"),
42-
onCancel: action("cancel"),
23+
export const Basic: Story = {
24+
args: {
25+
templateVersion: MockTemplateVersion,
26+
templateVariables: [
27+
MockTemplateVersionVariable1,
28+
MockTemplateVersionVariable2,
29+
MockTemplateVersionVariable3,
30+
MockTemplateVersionVariable4,
31+
],
32+
},
4333
};
4434

4535
// This example isn't fully supported. As "user_variable_values" is an array,
4636
// FormikTouched can't properly handle this.
4737
// See: https://github.com/jaredpalmer/formik/issues/2022
48-
export const RequiredVariable = TemplateVariables.bind({});
49-
RequiredVariable.args = {
50-
templateVersion: MockTemplateVersion,
51-
templateVariables: [
52-
MockTemplateVersionVariable4,
53-
MockTemplateVersionVariable5,
54-
],
55-
onSubmit: action("onSubmit"),
56-
onCancel: action("cancel"),
57-
initialTouched: {
58-
user_variable_values: true,
38+
export const RequiredVariable: Story = {
39+
args: {
40+
templateVersion: MockTemplateVersion,
41+
templateVariables: [
42+
MockTemplateVersionVariable4,
43+
MockTemplateVersionVariable5,
44+
],
45+
46+
initialTouched: {
47+
user_variable_values: true,
48+
},
5949
},
6050
};
6151

62-
export const WithUpdateTemplateError = TemplateVariables.bind({});
63-
WithUpdateTemplateError.args = {
64-
templateVersion: MockTemplateVersion,
65-
templateVariables: [
66-
MockTemplateVersionVariable1,
67-
MockTemplateVersionVariable2,
68-
MockTemplateVersionVariable3,
69-
MockTemplateVersionVariable4,
70-
],
71-
errors: {
72-
updateTemplateError: mockApiError({
73-
message: "Something went wrong.",
74-
}),
52+
export const WithUpdateTemplateError: Story = {
53+
args: {
54+
templateVersion: MockTemplateVersion,
55+
templateVariables: [
56+
MockTemplateVersionVariable1,
57+
MockTemplateVersionVariable2,
58+
MockTemplateVersionVariable3,
59+
MockTemplateVersionVariable4,
60+
],
61+
errors: {
62+
updateTemplateError: mockApiError({
63+
message: "Something went wrong.",
64+
}),
65+
},
7566
},
76-
onSubmit: action("onSubmit"),
77-
onCancel: action("cancel"),
7867
};
7968

80-
export const WithJobError = TemplateVariables.bind({});
81-
WithJobError.args = {
82-
templateVersion: MockTemplateVersion,
83-
templateVariables: [
84-
MockTemplateVersionVariable1,
85-
MockTemplateVersionVariable2,
86-
MockTemplateVersionVariable3,
87-
MockTemplateVersionVariable4,
88-
],
89-
errors: {
90-
jobError:
91-
"template import provision for start: recv import provision: plan terraform: terraform plan: exit status 1",
69+
export const WithJobError: Story = {
70+
args: {
71+
templateVersion: MockTemplateVersion,
72+
templateVariables: [
73+
MockTemplateVersionVariable1,
74+
MockTemplateVersionVariable2,
75+
MockTemplateVersionVariable3,
76+
MockTemplateVersionVariable4,
77+
],
78+
errors: {
79+
jobError:
80+
"template import provision for start: recv import provision: plan terraform: terraform plan: exit status 1",
81+
},
9282
},
93-
onSubmit: action("onSubmit"),
94-
onCancel: action("cancel"),
9583
};

‎site/src/xServices/createTemplate/createTemplateXService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { displayError } from "components/GlobalSnackbar/utils";
2323
import {
2424
TemplateAutostopRequirementDaysValue,
2525
calculateAutostopRequirementDaysValue,
26-
} from "pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/AutostopRequirementHelperText";
26+
} from "pages/TemplateSettingsPage/TemplateSchedulePage/AutostopRequirementHelperText";
2727
import { delay } from "utils/delay";
2828
import { assign, createMachine } from "xstate";
2929

0 commit comments

Comments
 (0)