Skip to content

Commit f40a708

Browse files
committed
chore: cleanup
1 parent b68be24 commit f40a708

File tree

2 files changed

+41
-42
lines changed

2 files changed

+41
-42
lines changed

site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.test.tsx

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ import userEvent from "@testing-library/user-event";
33
import { API } from "api/api";
44
import type { DynamicParametersResponse } from "api/typesGenerated";
55
import {
6+
MockDropdownParameter,
7+
MockDynamicParametersResponse,
8+
MockDynamicParametersResponseWithError,
69
MockPermissions,
10+
MockSliderParameter,
711
MockTemplate,
812
MockTemplateVersionExternalAuthGithub,
913
MockTemplateVersionExternalAuthGithubAuthenticated,
1014
MockUserOwner,
11-
MockWorkspace,
12-
MockDropdownParameter,
13-
MockSliderParameter,
1415
MockValidationParameter,
15-
MockDynamicParametersResponse,
16-
MockDynamicParametersResponseWithError,
16+
MockWorkspace,
1717
} from "testHelpers/entities";
1818
import {
1919
renderWithAuth,
@@ -57,7 +57,9 @@ describe("CreateWorkspacePageExperimental", () => {
5757
callbacks.onMessage(JSON.parse(event.data));
5858
});
5959
mockWebSocket.addEventListener("error", () => {
60-
callbacks.onError(new Error("Connection for dynamic parameters failed."));
60+
callbacks.onError(
61+
new Error("Connection for dynamic parameters failed."),
62+
);
6163
});
6264
mockWebSocket.addEventListener("close", () => {
6365
callbacks.onClose();
@@ -112,7 +114,9 @@ describe("CreateWorkspacePageExperimental", () => {
112114
callbacks.onMessage(JSON.parse(event.data));
113115
});
114116
mockWebSocket.addEventListener("error", () => {
115-
callbacks.onError(new Error("Connection for dynamic parameters failed."));
117+
callbacks.onError(
118+
new Error("Connection for dynamic parameters failed."),
119+
);
116120
});
117121
mockWebSocket.addEventListener("close", () => {
118122
callbacks.onClose();
@@ -167,13 +171,9 @@ describe("CreateWorkspacePageExperimental", () => {
167171
callbacks.onError(new Error("Connection failed"));
168172
});
169173

170-
setTimeout(() => {
171-
publisher.publishError(
172-
new ErrorEvent("error", {
173-
error: new Error("Connection failed"),
174-
}),
175-
);
176-
}, 10);
174+
queueMicrotask(() =>
175+
publisher.publishError(new Event("Connection failed")),
176+
);
177177

178178
return mockWebSocket;
179179
});
@@ -195,9 +195,7 @@ describe("CreateWorkspacePageExperimental", () => {
195195
callbacks.onClose();
196196
});
197197

198-
setTimeout(() => {
199-
publisher.publishClose(new CloseEvent("close"));
200-
}, 10);
198+
queueMicrotask(() => publisher.publishClose(new CloseEvent("close")));
201199

202200
return mockWebSocket;
203201
});

site/src/testHelpers/entities.ts

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
} from "api/api";
66
import type { FieldError } from "api/errors";
77
import type * as TypesGen from "api/typesGenerated";
8-
import { DynamicParametersResponse } from "api/typesGenerated";
98
import type { ProxyLatencyReport } from "contexts/useProxyLatency";
109
import range from "lodash/range";
1110
import type { Permissions } from "modules/permissions";
@@ -3274,32 +3273,34 @@ export const MockValidationParameter: TypesGen.PreviewParameter = {
32743273
order: 1,
32753274
};
32763275

3277-
export const MockDynamicParametersResponse: TypesGen.DynamicParametersResponse = {
3278-
id: 1,
3279-
parameters: [
3280-
MockDropdownParameter,
3281-
MockSliderParameter,
3282-
MockSwitchParameter,
3283-
MockTagSelectParameter,
3284-
MockMultiSelectParameter,
3285-
],
3286-
diagnostics: [],
3287-
};
3276+
export const MockDynamicParametersResponse: TypesGen.DynamicParametersResponse =
3277+
{
3278+
id: 1,
3279+
parameters: [
3280+
MockDropdownParameter,
3281+
MockSliderParameter,
3282+
MockSwitchParameter,
3283+
MockTagSelectParameter,
3284+
MockMultiSelectParameter,
3285+
],
3286+
diagnostics: [],
3287+
};
32883288

3289-
export const MockDynamicParametersResponseWithError: TypesGen.DynamicParametersResponse = {
3290-
id: 2,
3291-
parameters: [MockDropdownParameter],
3292-
diagnostics: [
3293-
{
3294-
severity: "error",
3295-
summary: "Validation failed",
3296-
detail: "The selected instance type is not available in this region",
3297-
extra: {
3298-
code: "",
3289+
export const MockDynamicParametersResponseWithError: TypesGen.DynamicParametersResponse =
3290+
{
3291+
id: 2,
3292+
parameters: [MockDropdownParameter],
3293+
diagnostics: [
3294+
{
3295+
severity: "error",
3296+
summary: "Validation failed",
3297+
detail: "The selected instance type is not available in this region",
3298+
extra: {
3299+
code: "",
3300+
},
32993301
},
3300-
},
3301-
],
3302-
};
3302+
],
3303+
};
33033304

33043305
export const MockTemplateVersionExternalAuthGithub: TypesGen.TemplateVersionExternalAuth =
33053306
{

0 commit comments

Comments
 (0)