Skip to content

Commit 60810b9

Browse files
committed
Fix imports
1 parent 54e349a commit 60810b9

15 files changed

+33
-22
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,5 @@ result
8282

8383
# dlv debug binaries for go tests
8484
__debug_bin*
85+
86+
**/.claude/settings.local.json

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

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

45
const meta: Meta<typeof UserAutocomplete> = {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { useAuthenticated } from "hooks";
33
import { http, HttpResponse } from "msw";
44
import type { FC, PropsWithChildren } from "react";
55
import { QueryClientProvider } from "react-query";
6-
import { MockPermissions, MockUser } from "testHelpers/entities";
6+
import { MockPermissions, MockUserOwner } from "testHelpers/entities";
77
import {
88
createTestQueryClient,
99
renderWithAuth,
@@ -82,7 +82,7 @@ describe("useAuthenticated", () => {
8282

8383
expect(() => {
8484
renderHook(() => useAuthenticated(), {
85-
wrapper: createAuthWrapper({ user: MockUser }),
85+
wrapper: createAuthWrapper({ user: MockUserOwner }),
8686
});
8787
}).toThrow("Permissions are not available.");
8888

site/src/modules/dashboard/Navbar/NavbarView.test.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { screen } from "@testing-library/react";
22
import userEvent from "@testing-library/user-event";
33
import type { ProxyContextValue } from "contexts/ProxyContext";
4-
import { MockPrimaryWorkspaceProxy, MockUser } from "testHelpers/entities";
4+
import { MockPrimaryWorkspaceProxy, MockUserOwner } from "testHelpers/entities";
55
import { renderWithAuth } from "testHelpers/renderHelpers";
66
import { NavbarView } from "./NavbarView";
77

@@ -26,7 +26,7 @@ describe("NavbarView", () => {
2626
renderWithAuth(
2727
<NavbarView
2828
proxyContextValue={proxyContextValue}
29-
user={MockUser}
29+
user={MockUserOwner}
3030
onSignOut={noop}
3131
canViewDeployment
3232
canViewOrganizations
@@ -43,7 +43,7 @@ describe("NavbarView", () => {
4343
renderWithAuth(
4444
<NavbarView
4545
proxyContextValue={proxyContextValue}
46-
user={MockUser}
46+
user={MockUserOwner}
4747
onSignOut={noop}
4848
canViewDeployment
4949
canViewOrganizations
@@ -60,7 +60,7 @@ describe("NavbarView", () => {
6060
renderWithAuth(
6161
<NavbarView
6262
proxyContextValue={proxyContextValue}
63-
user={MockUser}
63+
user={MockUserOwner}
6464
onSignOut={noop}
6565
canViewDeployment
6666
canViewOrganizations
@@ -78,7 +78,7 @@ describe("NavbarView", () => {
7878
renderWithAuth(
7979
<NavbarView
8080
proxyContextValue={proxyContextValue}
81-
user={MockUser}
81+
user={MockUserOwner}
8282
onSignOut={noop}
8383
canViewDeployment
8484
canViewOrganizations

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
MockAuthMethodsAll,
99
MockPermissions,
1010
MockProxyLatencies,
11+
MockUserOwner,
1112
MockWorkspaceProxies,
1213
} from "testHelpers/entities";
1314
import { withDesktopViewport } from "testHelpers/storybook";
@@ -40,7 +41,7 @@ const meta: Meta<typeof ProxyMenu> = {
4041
],
4142
parameters: {
4243
queries: [
43-
{ key: ["me"], data: MockUser },
44+
{ key: ["me"], data: MockUserOwner },
4445
{ key: ["authMethods"], data: MockAuthMethodsAll },
4546
{ key: ["hasFirstUser"], data: true },
4647
{

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

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

site/src/modules/dashboard/Navbar/UserDropdown/UserDropdownContent.test.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { screen } from "@testing-library/react";
22
import { Popover } from "components/deprecated/Popover/Popover";
3-
import { MockUser } from "testHelpers/entities";
3+
import { MockUserOwner } from "testHelpers/entities";
44
import { render, waitForLoaderToBeRemoved } from "testHelpers/renderHelpers";
55
import { Language, UserDropdownContent } from "./UserDropdownContent";
66

77
describe("UserDropdownContent", () => {
88
it("has the correct link for the account item", async () => {
99
render(
1010
<Popover>
11-
<UserDropdownContent user={MockUser} onSignOut={jest.fn()} />
11+
<UserDropdownContent user={MockUserOwner} onSignOut={jest.fn()} />
1212
</Popover>,
1313
);
1414
await waitForLoaderToBeRemoved();
@@ -25,7 +25,7 @@ describe("UserDropdownContent", () => {
2525
const onSignOut = jest.fn();
2626
render(
2727
<Popover>
28-
<UserDropdownContent user={MockUser} onSignOut={onSignOut} />
28+
<UserDropdownContent user={MockUserOwner} onSignOut={onSignOut} />
2929
</Popover>,
3030
);
3131
await waitForLoaderToBeRemoved();

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ describe("CreateWorkspacePage", () => {
3636
it("succeeds with default owner", async () => {
3737
jest
3838
.spyOn(API, "getUsers")
39-
.mockResolvedValueOnce({ users: [MockUser], count: 1 });
39+
.mockResolvedValueOnce({ users: [MockUserOwner], count: 1 });
4040
jest
4141
.spyOn(API, "getWorkspaceQuota")
4242
.mockResolvedValueOnce(MockWorkspaceQuota);
@@ -186,7 +186,7 @@ describe("CreateWorkspacePage", () => {
186186
.mockResolvedValueOnce(MockWorkspaceQuota);
187187
jest
188188
.spyOn(API, "getUsers")
189-
.mockResolvedValueOnce({ users: [MockUser], count: 1 });
189+
.mockResolvedValueOnce({ users: [MockUserOwner], count: 1 });
190190
jest.spyOn(API, "createWorkspace").mockResolvedValueOnce(MockWorkspace);
191191
jest
192192
.spyOn(API, "getTemplateVersionExternalAuth")
@@ -233,7 +233,7 @@ describe("CreateWorkspacePage", () => {
233233
.mockResolvedValueOnce(MockWorkspaceQuota);
234234
jest
235235
.spyOn(API, "getUsers")
236-
.mockResolvedValueOnce({ users: [MockUser], count: 1 });
236+
.mockResolvedValueOnce({ users: [MockUserOwner], count: 1 });
237237
jest.spyOn(API, "createWorkspace").mockResolvedValueOnce(MockWorkspace);
238238
jest
239239
.spyOn(API, "getTemplateVersionExternalAuth")

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

+1-1
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 } from "testHelpers/entities";
4+
import { MockTemplate, MockUserOwner } from "testHelpers/entities";
55
import { CreateWorkspacePageViewExperimental } from "./CreateWorkspacePageViewExperimental";
66

77
const meta: Meta<typeof CreateWorkspacePageViewExperimental> = {

site/src/pages/SetupPage/SetupPage.test.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event";
33
import type { Response, User } from "api/typesGenerated";
44
import { http, HttpResponse } from "msw";
55
import { createMemoryRouter } from "react-router-dom";
6-
import { MockBuildInfo, MockUser } from "testHelpers/entities";
6+
import { MockBuildInfo, MockUserOwner } from "testHelpers/entities";
77
import {
88
renderWithRouter,
99
waitForLoaderToBeRemoved,
@@ -83,7 +83,7 @@ describe("Setup Page", () => {
8383
{ status: 401 },
8484
);
8585
}
86-
return HttpResponse.json(MockUser);
86+
return HttpResponse.json(MockUserOwner);
8787
}),
8888
http.get<never, null, User | Response>(
8989
"/api/v2/users/first",

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
MockEntitlements,
1919
MockExperiments,
2020
MockUserAppearanceSettings,
21+
MockUserOwner,
2122
MockWorkspace,
2223
MockWorkspaceAgent,
2324
} from "testHelpers/entities";
@@ -65,7 +66,7 @@ const meta = {
6566
),
6667
}),
6768
queries: [
68-
{ key: ["me"], data: MockUser },
69+
{ key: ["me"], data: MockUserOwner },
6970
{ key: ["authMethods"], data: MockAuthMethodsAll },
7071
{ key: ["hasFirstUser"], data: true },
7172
{ key: ["buildInfo"], data: MockBuildInfo },

site/src/pages/UserSettingsPage/AccountPage/AccountUserGroups.stories.tsx

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
import type { Meta, StoryObj } from "@storybook/react";
2-
import { MockGroup as MockGroup1, mockApiError } from "testHelpers/entities";
2+
import {
3+
MockGroup as MockGroup1,
4+
MockUserOwner,
5+
mockApiError,
6+
} from "testHelpers/entities";
37
import { withDashboardProvider } from "testHelpers/storybook";
48
import { AccountUserGroups } from "./AccountUserGroups";
59

610
const MockGroup2 = {
711
...MockGroup1,
812
avatar_url: "",
913
display_name: "Goofy Goobers",
10-
members: [MockUser],
14+
members: [MockUserOwner],
1115
};
1216

1317
const mockError = mockApiError({

site/src/pages/UserSettingsPage/AppearancePage/AppearancePage.test.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { screen } from "@testing-library/react";
22
import userEvent from "@testing-library/user-event";
33
import { API } from "api/api";
4+
import { MockUserOwner } from "testHelpers/entities";
45
import { renderWithAuth } from "testHelpers/renderHelpers";
56
import AppearancePage from "./AppearancePage";
67

site/src/pages/UsersPage/ResetPasswordDialog.stories.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { Meta, StoryObj } from "@storybook/react";
2+
import { MockUserOwner } from "testHelpers/entities";
23
import { ResetPasswordDialog } from "./ResetPasswordDialog";
34

45
const meta: Meta<typeof ResetPasswordDialog> = {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import type { User } from "api/typesGenerated";
99
import { MockGroups } from "pages/UsersPage/storybookData/groups";
1010
import { MockRoles } from "pages/UsersPage/storybookData/roles";
1111
import { MockUsers } from "pages/UsersPage/storybookData/users";
12-
import { MockAuthMethodsAll } from "testHelpers/entities";
12+
import { MockAuthMethodsAll, MockUserOwner } from "testHelpers/entities";
1313
import {
1414
withAuthProvider,
1515
withDashboardProvider,

0 commit comments

Comments
 (0)