Skip to content

Commit b72c9dd

Browse files
BrunoQuaresmaBrunoQuaresma
committed
Fix imports
1 parent 84c8122 commit b72c9dd

File tree

11 files changed

+53
-56
lines changed

11 files changed

+53
-56
lines changed

‎site/src/components/Navbar/Navbar.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { rest } from "msw"
55
import {
66
MockEntitlementsWithAuditLog,
77
MockMemberPermissions,
8-
} from "testHelpers/renderHelpers"
8+
} from "testHelpers/entities"
99
import { server } from "testHelpers/server"
1010

1111
/**

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ import userEvent from "@testing-library/user-event"
33
import * as API from "api/api"
44
import { rest } from "msw"
55
import {
6-
renderWithAuth,
76
MockAuditLog,
87
MockAuditLog2,
9-
waitForLoaderToBeRemoved,
108
MockEntitlementsWithAuditLog,
9+
} from "testHelpers/entities"
10+
import {
11+
renderWithAuth,
12+
waitForLoaderToBeRemoved,
1113
} from "testHelpers/renderHelpers"
1214
import { server } from "testHelpers/server"
1315

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { screen } from "@testing-library/react"
2+
import { MockTemplateExample } from "testHelpers/entities"
23
import {
3-
MockTemplateExample,
44
renderWithAuth,
55
waitForLoaderToBeRemoved,
66
} from "testHelpers/renderHelpers"

‎site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.test.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ import { TemplateLayout } from "components/TemplateLayout/TemplateLayout"
33
import { rest } from "msw"
44
import { ResizeObserver } from "resize-observer"
55
import {
6-
MockMemberPermissions,
76
MockTemplate,
8-
MockTemplateVersion,
97
MockWorkspaceResource,
10-
renderWithAuth,
11-
} from "testHelpers/renderHelpers"
8+
MockTemplateVersion,
9+
MockMemberPermissions,
10+
} from "testHelpers/entities"
11+
import { renderWithAuth } from "testHelpers/renderHelpers"
1212
import { server } from "testHelpers/server"
1313
import * as CreateDayString from "util/createDayString"
1414
import { TemplateSummaryPage } from "./TemplateSummaryPage"

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
import { screen } from "@testing-library/react"
22
import userEvent from "@testing-library/user-event"
33
import {
4-
MockTemplate,
5-
MockTemplateVersion2,
6-
MockTemplateVersion,
7-
MockTemplateVersionVariable1,
8-
MockTemplateVersionVariable2,
9-
MockTemplateVersionVariable5,
104
renderWithTemplateSettingsLayout,
115
waitForLoaderToBeRemoved,
126
} from "testHelpers/renderHelpers"
137
import * as API from "api/api"
148
import i18next from "i18next"
159
import TemplateVariablesPage from "./TemplateVariablesPage"
1610
import { Language as FooterFormLanguage } from "components/FormFooter/FormFooter"
11+
import {
12+
MockTemplate,
13+
MockTemplateVersion,
14+
MockTemplateVersionVariable1,
15+
MockTemplateVersionVariable2,
16+
MockTemplateVersion2,
17+
MockTemplateVersionVariable5,
18+
} from "testHelpers/entities"
1719

1820
const { t } = i18next
1921

‎site/src/pages/TemplateVersionPage/TemplateVersionEditorPage/TemplateVersionEditorPage.test.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import {
2-
MockTemplateVersion,
3-
MockWorkspaceBuildLogs,
4-
renderWithAuth,
5-
} from "testHelpers/renderHelpers"
1+
import { renderWithAuth } from "testHelpers/renderHelpers"
62
import TemplateVersionEditorPage from "./TemplateVersionEditorPage"
73
import { screen, waitFor, within } from "@testing-library/react"
84
import userEvent from "@testing-library/user-event"
95
import * as api from "api/api"
6+
import {
7+
MockTemplateVersion,
8+
MockWorkspaceBuildLogs,
9+
} from "testHelpers/entities"
1010

1111
// For some reason this component in Jest is throwing a MUI style warning so,
1212
// since we don't need it for this test, we can mock it out

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@ import "jest-canvas-mock"
33
import WS from "jest-websocket-mock"
44
import { rest } from "msw"
55
import { Route, Routes } from "react-router-dom"
6+
import { MockWorkspace, MockWorkspaceAgent } from "testHelpers/entities"
67
import { TextDecoder, TextEncoder } from "util"
78
import { ReconnectingPTYRequest } from "../../api/types"
8-
import {
9-
history,
10-
MockWorkspace,
11-
MockWorkspaceAgent,
12-
render,
13-
} from "../../testHelpers/renderHelpers"
9+
import { history, render } from "../../testHelpers/renderHelpers"
1410
import { server } from "../../testHelpers/server"
1511
import TerminalPage, { Language } from "./TerminalPage"
1612

‎site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.test.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import { fireEvent, screen, within } from "@testing-library/react"
22
import * as API from "../../../api/api"
3-
import {
4-
MockGitSSHKey,
5-
renderWithAuth,
6-
} from "../../../testHelpers/renderHelpers"
3+
import { renderWithAuth } from "../../../testHelpers/renderHelpers"
74
import { Language as SSHKeysPageLanguage, SSHKeysPage } from "./SSHKeysPage"
85
import { Language as SSHKeysPageViewLanguage } from "./SSHKeysPageView"
96
import { i18n } from "i18n"
7+
import { MockGitSSHKey } from "testHelpers/entities"
108

119
const { t } = i18n
1210

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ import { fireEvent, screen, waitFor, within } from "@testing-library/react"
22
import userEvent from "@testing-library/user-event"
33
import { i18n } from "i18n"
44
import { rest } from "msw"
5-
import { Language as usersXServiceLanguage } from "xServices/users/usersXService"
6-
import * as API from "../../api/api"
7-
import { Role } from "../../api/typesGenerated"
8-
import { Language as ResetPasswordDialogLanguage } from "../../components/Dialogs/ResetPasswordDialog/ResetPasswordDialog"
95
import {
10-
MockAuditorRole,
11-
MockOwnerRole,
126
MockUser,
137
MockUser2,
14-
renderWithAuth,
158
SuspendedMockUser,
16-
} from "../../testHelpers/renderHelpers"
9+
MockAuditorRole,
10+
MockOwnerRole,
11+
} from "testHelpers/entities"
12+
import { Language as usersXServiceLanguage } from "xServices/users/usersXService"
13+
import * as API from "../../api/api"
14+
import { Role } from "../../api/typesGenerated"
15+
import { Language as ResetPasswordDialogLanguage } from "../../components/Dialogs/ResetPasswordDialog/ResetPasswordDialog"
16+
import { renderWithAuth } from "../../testHelpers/renderHelpers"
1717
import { server } from "../../testHelpers/server"
1818
import { Language as UsersPageLanguage, UsersPage } from "./UsersPage"
1919

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,26 @@ import userEvent from "@testing-library/user-event"
33
import EventSourceMock from "eventsourcemock"
44
import i18next from "i18next"
55
import { rest } from "msw"
6-
import * as api from "../../api/api"
7-
import { Workspace } from "../../api/typesGenerated"
86
import {
9-
MockBuilds,
10-
MockCanceledWorkspace,
11-
MockCancelingWorkspace,
12-
MockDeletedWorkspace,
13-
MockDeletingWorkspace,
14-
MockFailedWorkspace,
15-
MockOutdatedWorkspace,
16-
MockStartingWorkspace,
17-
MockStoppedWorkspace,
18-
MockStoppingWorkspace,
197
MockTemplate,
20-
MockTemplateVersionParameter1,
21-
MockTemplateVersionParameter2,
228
MockWorkspace,
239
MockWorkspaceBuild,
10+
MockStoppedWorkspace,
11+
MockStartingWorkspace,
12+
MockOutdatedWorkspace,
13+
MockTemplateVersionParameter1,
14+
MockTemplateVersionParameter2,
15+
MockStoppingWorkspace,
16+
MockFailedWorkspace,
17+
MockCancelingWorkspace,
18+
MockCanceledWorkspace,
19+
MockDeletingWorkspace,
20+
MockDeletedWorkspace,
21+
MockBuilds,
22+
} from "testHelpers/entities"
23+
import * as api from "../../api/api"
24+
import { Workspace } from "../../api/typesGenerated"
25+
import {
2426
renderWithAuth,
2527
waitForLoaderToBeRemoved,
2628
} from "../../testHelpers/renderHelpers"

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import {
2-
MockUser,
3-
MockWorkspace,
4-
renderWithAuth,
5-
} from "testHelpers/renderHelpers"
1+
import { renderWithAuth } from "testHelpers/renderHelpers"
62
import userEvent from "@testing-library/user-event"
73
import { screen } from "@testing-library/react"
84
import {
@@ -23,6 +19,7 @@ import { WorkspaceSchedulePage } from "./WorkspaceSchedulePage"
2319
import i18next from "i18next"
2420
import { server } from "testHelpers/server"
2521
import { rest } from "msw"
22+
import { MockUser, MockWorkspace } from "testHelpers/entities"
2623

2724
const { t } = i18next
2825

0 commit comments

Comments
 (0)