Skip to content

chore(site): upgrade msw to 2.0 #12597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Mar 19, 2024
Merged

chore(site): upgrade msw to 2.0 #12597

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3e0e2e2
wp: upgrade msw
BrunoQuaresma Mar 8, 2024
d385f53
Minor fixes
BrunoQuaresma Mar 8, 2024
41fcf23
Fix polyfill issues and ProxyContext old api usage
BrunoQuaresma Mar 14, 2024
7855226
Fix PortForwardPopoverView tests
BrunoQuaresma Mar 14, 2024
41ccf83
Skip usePaginatedQuery.test
BrunoQuaresma Mar 14, 2024
b641691
Merge branch 'main' of https://github.com/coder/coder into bq/upgrade…
BrunoQuaresma Mar 14, 2024
c5f758a
Skip usePaginatedQuery test
BrunoQuaresma Mar 14, 2024
3c3db52
Fix fmt
BrunoQuaresma Mar 14, 2024
723ccd9
Fix lint
BrunoQuaresma Mar 14, 2024
4c61c01
fix typo
BrunoQuaresma Mar 18, 2024
a70d24c
Remove ynecessary async
BrunoQuaresma Mar 18, 2024
8f5748a
Merge branch 'main' of https://github.com/coder/coder into bq/upgrade…
BrunoQuaresma Mar 18, 2024
374f6c4
Fix metadata stuff
BrunoQuaresma Mar 18, 2024
089680d
Improve type
BrunoQuaresma Mar 18, 2024
538f1e2
Merge branch 'main' of https://github.com/coder/coder into bq/upgrade…
BrunoQuaresma Mar 18, 2024
d5d8788
Merge branch 'main' of https://github.com/coder/coder into bq/upgrade…
BrunoQuaresma Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove ynecessary async
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Mar 18, 2024
commit a70d24c2660a307ab1d555a50f3359a5163e9a77
2 changes: 1 addition & 1 deletion site/src/contexts/ProxyContext.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ describe("ProxyContextSelection", () => {
regions,
}),
),
http.get("/api/v2/workspaceproxies", async () =>
http.get("/api/v2/workspaceproxies", () =>
HttpResponse.json({ regions }),
),
);
Expand Down
114 changes: 54 additions & 60 deletions site/src/testHelpers/handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,154 +7,148 @@ import * as M from "./entities";
import { MockGroup, MockWorkspaceQuota } from "./entities";

export const handlers = [
http.get("/api/v2/templates/:templateId/daus", async () => {
http.get("/api/v2/templates/:templateId/daus", () => {
return HttpResponse.json(M.MockTemplateDAUResponse);
}),

http.get("/api/v2/insights/daus", async () => {
http.get("/api/v2/insights/daus", () => {
return HttpResponse.json(M.MockDeploymentDAUResponse);
}),
// Workspace proxies
http.get("/api/v2/regions", async () => {
http.get("/api/v2/regions", () => {
return HttpResponse.json({
regions: M.MockWorkspaceProxies,
});
}),
http.get("/api/v2/workspaceproxies", async () => {
http.get("/api/v2/workspaceproxies", () => {
return HttpResponse.json({
regions: M.MockWorkspaceProxies,
});
}),
// build info
http.get("/api/v2/buildinfo", async () => {
http.get("/api/v2/buildinfo", () => {
return HttpResponse.json(M.MockBuildInfo);
}),

// experiments
http.get("/api/v2/experiments", async () => {
http.get("/api/v2/experiments", () => {
return HttpResponse.json(M.MockExperiments);
}),

// update check
http.get("/api/v2/updatecheck", async () => {
http.get("/api/v2/updatecheck", () => {
return HttpResponse.json(M.MockUpdateCheck);
}),

// organizations
http.get("/api/v2/organizations/:organizationId", async () => {
http.get("/api/v2/organizations/:organizationId", () => {
return HttpResponse.json(M.MockOrganization);
}),
http.get("api/v2/organizations/:organizationId/templates/examples", () => {
return HttpResponse.json([M.MockTemplateExample, M.MockTemplateExample2]);
}),
http.get(
"/api/v2/organizations/:organizationId/templates/:templateId",
async () => {
() => {
return HttpResponse.json(M.MockTemplate);
},
),
http.get("/api/v2/organizations/:organizationId/templates", async () => {
http.get("/api/v2/organizations/:organizationId/templates", () => {
return HttpResponse.json([M.MockTemplate]);
}),

// templates
http.get("/api/v2/templates/:templateId", async () => {
http.get("/api/v2/templates/:templateId", () => {
return HttpResponse.json(M.MockTemplate);
}),
http.get("/api/v2/templates/:templateId/versions", async () => {
http.get("/api/v2/templates/:templateId/versions", () => {
return HttpResponse.json([M.MockTemplateVersion2, M.MockTemplateVersion]);
}),
http.patch("/api/v2/templates/:templateId/versions", async () => {
http.patch("/api/v2/templates/:templateId/versions", () => {
return new HttpResponse(null, { status: 200 });
}),
http.patch("/api/v2/templates/:templateId", async () => {
http.patch("/api/v2/templates/:templateId", () => {
return HttpResponse.json(M.MockTemplate);
}),
http.get("/api/v2/templateversions/:templateVersionId", async () => {
http.get("/api/v2/templateversions/:templateVersionId", () => {
return HttpResponse.json(M.MockTemplateVersion);
}),
http.get(
"/api/v2/templateversions/:templateVersionId/resources",
async () => {
return HttpResponse.json([
M.MockWorkspaceResource,
M.MockWorkspaceVolumeResource,
M.MockWorkspaceImageResource,
M.MockWorkspaceContainerResource,
]);
},
),
http.get("/api/v2/templateversions/:templateVersionId/resources", () => {
return HttpResponse.json([
M.MockWorkspaceResource,
M.MockWorkspaceVolumeResource,
M.MockWorkspaceImageResource,
M.MockWorkspaceContainerResource,
]);
}),
http.get(
"/api/v2/templateversions/:templateVersionId/rich-parameters",
async () => {
return HttpResponse.json([]);
},
),
http.get(
"/api/v2/templateversions/:templateVersionId/external-auth",
async () => {
() => {
return HttpResponse.json([]);
},
),
http.get("/api/v2/templateversions/:templateversionId/logs", async () => {
http.get("/api/v2/templateversions/:templateVersionId/external-auth", () => {
return HttpResponse.json([]);
}),
http.get("/api/v2/templateversions/:templateversionId/logs", () => {
return HttpResponse.json(M.MockWorkspaceBuildLogs);
}),
http.get(
"api/v2/organizations/:organizationId/templates/:templateName/versions/:templateVersionName",
async () => {
() => {
return HttpResponse.json(M.MockTemplateVersion);
},
),
http.get(
"api/v2/organizations/:organizationId/templates/:templateName/versions/:templateVersionName/previous",
async () => {
() => {
return HttpResponse.json(M.MockTemplateVersion2);
},
),
http.delete("/api/v2/templates/:templateId", async () => {
http.delete("/api/v2/templates/:templateId", () => {
return HttpResponse.json(M.MockTemplate);
}),

// users
http.get("/api/v2/users", async () => {
http.get("/api/v2/users", () => {
return HttpResponse.json({
users: [M.MockUser, M.MockUser2, M.SuspendedMockUser],
count: 26,
});
}),
http.post("/api/v2/users", async () => {
http.post("/api/v2/users", () => {
return HttpResponse.json(M.MockUser);
}),
http.get("/api/v2/users/:userid/login-type", async () => {
http.get("/api/v2/users/:userid/login-type", () => {
return HttpResponse.json({
login_type: "password",
});
}),
http.get("/api/v2/users/me/organizations", () => {
return HttpResponse.json([M.MockOrganization]);
}),
http.get("/api/v2/users/me/organizations/:organizationId", async () => {
http.get("/api/v2/users/me/organizations/:organizationId", () => {
return HttpResponse.json(M.MockOrganization);
}),
http.post("/api/v2/users/login", async () => {
http.post("/api/v2/users/login", () => {
return HttpResponse.json(M.MockSessionToken);
}),
http.post("/api/v2/users/logout", async () => {
http.post("/api/v2/users/logout", () => {
return new HttpResponse(null, { status: 200 });
}),
http.get("/api/v2/users/me", async () => {
http.get("/api/v2/users/me", () => {
return HttpResponse.json(M.MockUser);
}),
http.get("/api/v2/users/me/keys", async () => {
http.get("/api/v2/users/me/keys", () => {
return HttpResponse.json(M.MockAPIKey);
}),
http.get("/api/v2/users/authmethods", async () => {
http.get("/api/v2/users/authmethods", () => {
return HttpResponse.json(M.MockAuthMethodsPasswordOnly);
}),
http.get("/api/v2/users/roles", async () => {
http.get("/api/v2/users/roles", () => {
return HttpResponse.json(M.MockSiteRoles);
}),
http.post("/api/v2/authcheck", async () => {
http.post("/api/v2/authcheck", () => {
const permissions = [
...Object.keys(permissionsToCheck),
"canUpdateTemplate",
Expand All @@ -169,38 +163,38 @@ export const handlers = [

return HttpResponse.json(response);
}),
http.get("/api/v2/users/:userId/gitsshkey", async () => {
http.get("/api/v2/users/:userId/gitsshkey", () => {
return HttpResponse.json(M.MockGitSSHKey);
}),
http.get("/api/v2/users/:userId/workspace/:workspaceName", async () => {
http.get("/api/v2/users/:userId/workspace/:workspaceName", () => {
return HttpResponse.json(M.MockWorkspace);
}),

// First user
http.get("/api/v2/users/first", async () => {
http.get("/api/v2/users/first", () => {
return new HttpResponse(null, { status: 200 });
}),
http.post("/api/v2/users/first", async () => {
http.post("/api/v2/users/first", () => {
return HttpResponse.json(M.MockUser);
}),

// workspaces
http.get("/api/v2/workspaces", async () => {
http.get("/api/v2/workspaces", () => {
return HttpResponse.json(M.MockWorkspacesResponse);
}),
http.get("/api/v2/workspaces/:workspaceId", async () => {
http.get("/api/v2/workspaces/:workspaceId", () => {
return HttpResponse.json(M.MockWorkspace);
}),
http.put("/api/v2/workspaces/:workspaceId/autostart", async () => {
http.put("/api/v2/workspaces/:workspaceId/autostart", () => {
return new HttpResponse(null, { status: 200 });
}),
http.put("/api/v2/workspaces/:workspaceId/ttl", async () => {
http.put("/api/v2/workspaces/:workspaceId/ttl", () => {
return new HttpResponse(null, { status: 200 });
}),
http.put("/api/v2/workspaces/:workspaceId/extend", async () => {
http.put("/api/v2/workspaces/:workspaceId/extend", () => {
return new HttpResponse(null, { status: 200 });
}),
http.get("/api/v2/workspaces/:workspaceId/resolve-autostart", async () => {
http.get("/api/v2/workspaces/:workspaceId/resolve-autostart", () => {
return HttpResponse.json({ parameter_mismatch: false });
}),

Expand All @@ -216,7 +210,7 @@ export const handlers = [
const result = transitionToBuild[transition];
return HttpResponse.json(result);
}),
http.get("/api/v2/workspaces/:workspaceId/builds", async () => {
http.get("/api/v2/workspaces/:workspaceId/builds", () => {
return HttpResponse.json(M.MockBuilds);
}),
http.get("/api/v2/workspaces/:workspaceId/port-share", () => {
Expand Down Expand Up @@ -270,7 +264,7 @@ export const handlers = [
return HttpResponse.json([MockGroup]);
}),

http.post("/api/v2/organizations/:organizationId/groups", async () => {
http.post("/api/v2/organizations/:organizationId/groups", () => {
return HttpResponse.json(M.MockGroup, { status: 201 });
}),

Expand Down