Skip to content

Commit 5717c9a

Browse files
BrunoQuaresmaBrunoQuaresma
committed
chore: better represent user mocks
1 parent d146115 commit 5717c9a

39 files changed

+177
-191
lines changed

‎docs/contributing/frontend.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export const WithQuota: Story = {
131131
parameters: {
132132
queries: [
133133
{
134-
key: getWorkspaceQuotaQueryKey(MockUser.username),
134+
key: getWorkspaceQuotaQueryKey(MockUserOwner.username),
135135
data: {
136136
credits_consumed: 2,
137137
budget: 40,

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { userEvent, within } from "@storybook/test";
44
import {
55
MockOrganization,
66
MockOrganization2,
7-
MockUser,
7+
MockUserOwner,
88
} from "testHelpers/entities";
99
import { OrganizationAutocomplete } from "./OrganizationAutocomplete";
1010

@@ -22,7 +22,7 @@ type Story = StoryObj<typeof OrganizationAutocomplete>;
2222
export const ManyOrgs: Story = {
2323
parameters: {
2424
showOrganizations: true,
25-
user: MockUser,
25+
user: MockUserOwner,
2626
features: ["multiple_organizations"],
2727
permissions: { viewDeploymentConfig: true },
2828
queries: [
@@ -42,7 +42,7 @@ export const ManyOrgs: Story = {
4242
export const OneOrg: Story = {
4343
parameters: {
4444
showOrganizations: true,
45-
user: MockUser,
45+
user: MockUserOwner,
4646
features: ["multiple_organizations"],
4747
permissions: { viewDeploymentConfig: true },
4848
queries: [

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { Meta, StoryObj } from "@storybook/react";
2-
import { MockUser } from "testHelpers/entities";
32
import { UserAutocomplete } from "./UserAutocomplete";
43

54
const meta: Meta<typeof UserAutocomplete> = {
@@ -12,13 +11,13 @@ type Story = StoryObj<typeof UserAutocomplete>;
1211

1312
export const WithLabel: Story = {
1413
args: {
15-
value: MockUser,
14+
value: MockUserOwner,
1615
label: "User",
1716
},
1817
};
1918

2019
export const NoLabel: Story = {
2120
args: {
22-
value: MockUser,
21+
value: MockUserOwner,
2322
},
2423
};

‎site/src/contexts/auth/RequireAuth.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ describe("useAuthenticated", () => {
9393
expect(() => {
9494
renderHook(() => useAuthenticated(), {
9595
wrapper: createAuthWrapper({
96-
user: MockUser,
96+
user: MockUserOwner,
9797
permissions: MockPermissions,
9898
}),
9999
});

‎site/src/hooks/useEmbeddedMetadata.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
MockBuildInfo,
66
MockEntitlements,
77
MockExperiments,
8-
MockUser,
98
MockUserAppearanceSettings,
9+
MockUserOwner,
1010
} from "testHelpers/entities";
1111
import {
1212
DEFAULT_METADATA_KEY,
@@ -38,7 +38,7 @@ const mockDataForTags = {
3838
"build-info": MockBuildInfo,
3939
entitlements: MockEntitlements,
4040
experiments: MockExperiments,
41-
user: MockUser,
41+
user: MockUserOwner,
4242
userAppearance: MockUserAppearanceSettings,
4343
regions: MockRegions,
4444
} as const satisfies Record<MetadataKey, MetadataValue>;
@@ -97,7 +97,7 @@ const populatedMetadata: RuntimeHtmlMetadata = {
9797
},
9898
user: {
9999
available: true,
100-
value: MockUser,
100+
value: MockUserOwner,
101101
},
102102
userAppearance: {
103103
available: true,

‎site/src/modules/dashboard/Navbar/MobileMenu.stories.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import {
66
MockPrimaryWorkspaceProxy,
77
MockProxyLatencies,
88
MockSupportLinks,
9-
MockUser,
10-
MockUser2,
9+
MockUserMember,
10+
MockUserOwner,
1111
MockWorkspaceProxies,
1212
} from "testHelpers/entities";
1313
import { MobileMenu } from "./MobileMenu";
@@ -36,7 +36,7 @@ const meta: Meta<typeof MobileMenu> = {
3636
proxyLatencies: MockProxyLatencies,
3737
proxies: MockWorkspaceProxies,
3838
},
39-
user: MockUser,
39+
user: MockUserOwner,
4040
supportLinks: MockSupportLinks,
4141
onSignOut: fn(),
4242
isDefaultOpen: true,
@@ -63,7 +63,7 @@ export const Admin: Story = {
6363

6464
export const Auditor: Story = {
6565
args: {
66-
user: MockUser2,
66+
user: MockUserMember,
6767
canViewAuditLog: true,
6868
canViewDeployment: false,
6969
canViewHealth: false,
@@ -74,7 +74,7 @@ export const Auditor: Story = {
7474

7575
export const OrgAdmin: Story = {
7676
args: {
77-
user: MockUser2,
77+
user: MockUserMember,
7878
canViewAuditLog: true,
7979
canViewDeployment: false,
8080
canViewHealth: false,
@@ -85,7 +85,7 @@ export const OrgAdmin: Story = {
8585

8686
export const Member: Story = {
8787
args: {
88-
user: MockUser2,
88+
user: MockUserMember,
8989
canViewAuditLog: false,
9090
canViewDeployment: false,
9191
canViewHealth: false,

‎site/src/modules/dashboard/Navbar/NavbarView.stories.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from "@storybook/react";
22
import { userEvent, within } from "@storybook/test";
33
import { chromaticWithTablet } from "testHelpers/chromatic";
4-
import { MockUser, MockUser2 } from "testHelpers/entities";
4+
import { MockUserMember, MockUserOwner } from "testHelpers/entities";
55
import { withDashboardProvider } from "testHelpers/storybook";
66
import { NavbarView } from "./NavbarView";
77

@@ -10,7 +10,7 @@ const meta: Meta<typeof NavbarView> = {
1010
parameters: { chromatic: chromaticWithTablet, layout: "fullscreen" },
1111
component: NavbarView,
1212
args: {
13-
user: MockUser,
13+
user: MockUserOwner,
1414
canViewAuditLog: true,
1515
canViewDeployment: true,
1616
canViewHealth: true,
@@ -33,7 +33,7 @@ export const ForAdmin: Story = {
3333

3434
export const ForAuditor: Story = {
3535
args: {
36-
user: MockUser2,
36+
user: MockUserMember,
3737
canViewAuditLog: true,
3838
canViewDeployment: false,
3939
canViewHealth: false,
@@ -49,7 +49,7 @@ export const ForAuditor: Story = {
4949

5050
export const ForOrgAdmin: Story = {
5151
args: {
52-
user: MockUser2,
52+
user: MockUserMember,
5353
canViewAuditLog: true,
5454
canViewDeployment: false,
5555
canViewHealth: false,
@@ -65,7 +65,7 @@ export const ForOrgAdmin: Story = {
6565

6666
export const ForMember: Story = {
6767
args: {
68-
user: MockUser2,
68+
user: MockUserMember,
6969
canViewAuditLog: false,
7070
canViewDeployment: false,
7171
canViewHealth: false,

‎site/src/modules/dashboard/Navbar/ProxyMenu.stories.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
MockAuthMethodsAll,
99
MockPermissions,
1010
MockProxyLatencies,
11-
MockUser,
1211
MockWorkspaceProxies,
1312
} from "testHelpers/entities";
1413
import { withDesktopViewport } from "testHelpers/storybook";

‎site/src/modules/dashboard/Navbar/UserDropdown/UserDropdown.stories.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import type { Meta, StoryObj } from "@storybook/react";
22
import { expect, screen, userEvent, waitFor, within } from "@storybook/test";
3-
import { MockBuildInfo, MockUser } from "testHelpers/entities";
3+
import { MockBuildInfo } from "testHelpers/entities";
44
import { withDashboardProvider } from "testHelpers/storybook";
55
import { UserDropdown } from "./UserDropdown";
66

77
const meta: Meta<typeof UserDropdown> = {
88
title: "modules/dashboard/UserDropdown",
99
component: UserDropdown,
1010
args: {
11-
user: MockUser,
11+
user: MockUserOwner,
1212
buildInfo: MockBuildInfo,
1313
supportLinks: [
1414
{ icon: "docs", name: "Documentation", target: "" },

‎site/src/pages/AuditPage/AuditLogRow/AuditLogRow.stories.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
MockAuditLogRequestPasswordReset,
1414
MockAuditLogWithDeletedResource,
1515
MockAuditLogWithWorkspaceBuild,
16-
MockUser,
16+
MockUserOwner,
1717
} from "testHelpers/entities";
1818
import { AuditLogRow } from "./AuditLogRow";
1919

@@ -155,7 +155,7 @@ export const NoUserAgent: Story = {
155155
description: "{user} deleted workspace {target}",
156156
resource_link: "/@jon/yeee/builds/35",
157157
is_deleted: false,
158-
user: MockUser,
158+
user: MockUserOwner,
159159
},
160160
},
161161
};

‎site/src/pages/AuditPage/AuditPageView.stories.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
MockAuditLog,
1515
MockAuditLog2,
1616
MockAuditLog3,
17-
MockUser,
17+
MockUserOwner,
1818
} from "testHelpers/entities";
1919
import { AuditPageView } from "./AuditPageView";
2020

@@ -23,7 +23,7 @@ type FilterProps = ComponentProps<typeof AuditPageView>["filterProps"];
2323
const defaultFilterProps = getDefaultFilterProps<FilterProps>({
2424
query: "owner:me",
2525
values: {
26-
username: MockUser.username,
26+
username: MockUserOwner.username,
2727
action: undefined,
2828
resource_type: undefined,
2929
organization: undefined,

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
MockTemplateVersionParameter1,
99
MockTemplateVersionParameter2,
1010
MockTemplateVersionParameter3,
11-
MockUser,
11+
MockUserOwner,
1212
MockWorkspace,
1313
MockWorkspaceQuota,
1414
MockWorkspaceRequest,
@@ -59,7 +59,7 @@ describe("CreateWorkspacePage", () => {
5959

6060
await waitFor(() =>
6161
expect(API.createWorkspace).toBeCalledWith(
62-
MockUser.id,
62+
MockUserOwner.id,
6363
expect.objectContaining({
6464
...MockWorkspaceRichParametersRequest,
6565
}),
@@ -219,7 +219,7 @@ describe("CreateWorkspacePage", () => {
219219

220220
await waitFor(() =>
221221
expect(API.createWorkspace).toBeCalledWith(
222-
MockUser.id,
222+
MockUserOwner.id,
223223
expect.objectContaining({
224224
...MockWorkspaceRequest,
225225
}),
@@ -258,7 +258,7 @@ describe("CreateWorkspacePage", () => {
258258

259259
await waitFor(() =>
260260
expect(API.createWorkspace).toBeCalledWith(
261-
MockUser.id,
261+
MockUserOwner.id,
262262
expect.objectContaining({
263263
...MockWorkspaceRequest,
264264
}),

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
MockTemplateVersionParameter1,
99
MockTemplateVersionParameter2,
1010
MockTemplateVersionParameter3,
11-
MockUser,
11+
MockUserOwner,
1212
mockApiError,
1313
} from "testHelpers/entities";
1414
import { CreateWorkspacePageView } from "./CreateWorkspacePageView";
@@ -19,7 +19,7 @@ const meta: Meta<typeof CreateWorkspacePageView> = {
1919
component: CreateWorkspacePageView,
2020
args: {
2121
defaultName: "",
22-
defaultOwner: MockUser,
22+
defaultOwner: MockUserOwner,
2323
autofillParameters: [],
2424
template: MockTemplate,
2525
parameters: [],

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.stories.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from "@storybook/react";
22
import { DetailedError } from "api/errors";
33
import { chromatic } from "testHelpers/chromatic";
4-
import { MockTemplate, MockUser } from "testHelpers/entities";
4+
import { MockTemplate } from "testHelpers/entities";
55
import { CreateWorkspacePageViewExperimental } from "./CreateWorkspacePageViewExperimental";
66

77
const meta: Meta<typeof CreateWorkspacePageViewExperimental> = {
@@ -12,7 +12,7 @@ const meta: Meta<typeof CreateWorkspacePageViewExperimental> = {
1212
autofillParameters: [],
1313
diagnostics: [],
1414
defaultName: "",
15-
defaultOwner: MockUser,
15+
defaultOwner: MockUserOwner,
1616
externalAuth: [],
1717
externalAuthPollingState: "idle",
1818
hasAllRequiredExternalAuth: true,

‎site/src/pages/DeploymentSettingsPage/NotificationsPage/storybookUtils.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type { DeploymentValues, SerpentOption } from "api/typesGenerated";
77
import {
88
MockNotificationMethodsResponse,
99
MockNotificationTemplates,
10-
MockUser,
10+
MockUserOwner,
1111
} from "testHelpers/entities";
1212
import {
1313
withAuthProvider,
@@ -193,7 +193,7 @@ export const baseMeta = {
193193
data: MockNotificationMethodsResponse,
194194
},
195195
],
196-
user: MockUser,
196+
user: MockUserOwner,
197197
permissions: { viewDeploymentConfig: true },
198198
deploymentOptions: mockNotificationsDeploymentOptions,
199199
deploymentValues: {

‎site/src/pages/OrganizationSettingsPage/OrganizationMembersPage.test.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
MockOrganization,
88
MockOrganizationAuditorRole,
99
MockOrganizationPermissions,
10-
MockUser,
10+
MockUserOwner,
1111
} from "testHelpers/entities";
1212
import {
1313
renderWithOrganizationSettingsLayout,
@@ -102,11 +102,11 @@ describe("OrganizationMembersPage", () => {
102102
it("updates the roles", async () => {
103103
server.use(
104104
http.put(
105-
`/api/v2/organizations/:organizationId/members/${MockUser.id}/roles`,
105+
`/api/v2/organizations/:organizationId/members/${MockUserOwner.id}/roles`,
106106
async () => {
107107
return HttpResponse.json({
108-
...MockUser,
109-
roles: [...MockUser.roles, MockOrganizationAuditorRole],
108+
...MockUserOwner,
109+
roles: [...MockUserOwner.roles, MockOrganizationAuditorRole],
110110
});
111111
},
112112
),
@@ -122,7 +122,7 @@ describe("OrganizationMembersPage", () => {
122122
it("shows an error message", async () => {
123123
server.use(
124124
http.put(
125-
`/api/v2/organizations/:organizationId/members/${MockUser.id}/roles`,
125+
`/api/v2/organizations/:organizationId/members/${MockUserOwner.id}/roles`,
126126
() => {
127127
return HttpResponse.json(
128128
{ message: "Error on updating the user roles." },

‎site/src/pages/OrganizationSettingsPage/OrganizationMembersPageView.stories.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { UsePaginatedQueryResult } from "hooks/usePaginatedQuery";
44
import {
55
MockOrganizationMember,
66
MockOrganizationMember2,
7-
MockUser,
7+
MockUserOwner,
88
} from "testHelpers/entities";
99
import { OrganizationMembersPageView } from "./OrganizationMembersPageView";
1010

@@ -17,7 +17,7 @@ const meta: Meta<typeof OrganizationMembersPageView> = {
1717
isAddingMember: false,
1818
isUpdatingMemberRoles: false,
1919
canViewMembers: true,
20-
me: MockUser,
20+
me: MockUserOwner,
2121
members: [
2222
{ ...MockOrganizationMember, groups: [] },
2323
{ ...MockOrganizationMember2, groups: [] },

‎site/src/pages/TerminalPage/TerminalPage.stories.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {
1717
MockDeploymentConfig,
1818
MockEntitlements,
1919
MockExperiments,
20-
MockUser,
2120
MockUserAppearanceSettings,
2221
MockWorkspace,
2322
MockWorkspaceAgent,

0 commit comments

Comments
 (0)