8000 chore(site): Try to fix flake test by BrunoQuaresma · Pull Request #6848 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

chore(site): Try to fix flake test #6848

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 9 commits into from
Mar 29, 2023
Merged

chore(site): Try to fix flake test #6848

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2822864
Fix lint
BrunoQuaresma Mar 28, 2023
9c013a6
chore(site): Try to fix flake tests and improve quality
BrunoQuaresma Mar 28, 2023
3cc5a58
Fix stories
BrunoQuaresma Mar 28, 2023
591284d
Change mock user
BrunoQuaresma Mar 28, 2023
84c8122
Refactor mocks
BrunoQuaresma Mar 28, 2023
b72c9dd
Fix imports
BrunoQuaresma Mar 28, 2023
3f41738
Fix imports
BrunoQuaresma Mar 28, 2023
6ce23a4
Fix i18n on storybook
BrunoQuaresma Mar 29, 2023
a237784
Update comment
BrunoQuaresma Mar 29, 2023
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
Fix imports
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Mar 28, 2023
commit b72c9dd5a046f88f5ec99153172cb55675be2927
2 changes: 1 addition & 1 deletion site/src/components/Navbar/Navbar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { rest } from "msw"
import {
MockEntitlementsWithAuditLog,
MockMemberPermissions,
} from "testHelpers/renderHelpers"
} from "testHelpers/entities"
import { server } from "testHelpers/server"

/**
Expand Down
6 changes: 4 additions & 2 deletions site/src/pages/AuditPage/AuditPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ import userEvent from "@testing-library/user-event"
import * as API from "api/api"
import { rest } from "msw"
import {
renderWithAuth,
MockAuditLog,
MockAuditLog2,
waitForLoaderToBeRemoved,
MockEntitlementsWithAuditLog,
} from "testHelpers/entities"
import {
renderWithAuth,
waitForLoaderToBeRemoved,
} from "testHelpers/renderHelpers"
import { server } from "testHelpers/server"

Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/StarterTemplatePage/StarterTemplatePage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { screen } from "@testing-library/react"
import { MockTemplateExample } from "testHelpers/entities"
import {
MockTemplateExample,
renderWithAuth,
waitForLoaderToBeRemoved,
} from "testHelpers/renderHelpers"
Expand Down
8 changes: 4 additions & 4 deletions site/src/pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import { TemplateLayout } from "components/TemplateLayout/TemplateLayout"
import { rest } from "msw"
import { ResizeObserver } from "resize-observer"
import {
MockMemberPermissions,
MockTemplate,
MockTemplateVersion,
MockWorkspaceResource,
renderWithAuth,
} from "testHelpers/renderHelpers"
MockTemplateVersion,
MockMemberPermissions,
} from "testHelpers/entities"
import { renderWithAuth } from "testHelpers/renderHelpers"
import { server } from "testHelpers/server"
import * as CreateDayString from "util/createDayString"
import { TemplateSummaryPage } from "./TemplateSummaryPage"
Expand Down
14 changes: 8 additions & 6 deletions site/src/pages/TemplateSettingsPage/TemplateVariablesPage/TemplateVariablesPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import { screen } from "@testing-library/react"
import userEvent from "@testing-library/user-event"
import {
MockTemplate,
MockTemplateVersion2,
MockTemplateVersion,
MockTemplateVersionVariable1,
MockTemplateVersionVariable2,
MockTemplateVersionVariable5,
renderWithTemplateSettingsLayout,
waitForLoaderToBeRemoved,
} from "testHelpers/renderHelpers"
import * as API from "api/api"
import i18next from "i18next"
import TemplateVariablesPage from "./TemplateVariablesPage"
import { Language as FooterFormLanguage } from "components/FormFooter/FormFooter"
import {
MockTemplate,
MockTemplateVersion,
MockTemplateVersionVariable1,
MockTemplateVersionVariable2,
MockTemplateVersion2,
MockTemplateVersionVariable5,
} from "testHelpers/entities"

const { t } = i18next

Expand Down
10 changes: 5 additions & 5 deletions ...rc/pages/TemplateVersionPage/TemplateVersionEditorPage/TemplateVersionEditorPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {
MockTemplateVersion,
MockWorkspaceBuildLogs,
renderWithAuth,
} from "testHelpers/renderHelpers"
import { renderWithAuth } from "testHelpers/renderHelpers"
import TemplateVersionEditorPage from "./TemplateVersionEditorPage"
import { screen, waitFor, within } from "@testing-library/react"
import userEvent from "@testing-library/user-event"
import * as api from "api/api"
import {
MockTemplateVersion,
MockWorkspaceBuildLogs,
} from "testHelpers/entities"

// For some reason this component in Jest is throwing a MUI style warning so,
// since we don't need it for this test, we can mock it out
Expand Down
8 changes: 2 additions & 6 deletions site/src/pages/TerminalPage/TerminalPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,10 @@ import "jest-canvas-mock"
import WS from "jest-websocket-mock"
import { rest } from "msw"
import { Route, Routes } from "react-router-dom"
import { MockWorkspace, MockWorkspaceAgent } from "testHelpers/entities"
import { TextDecoder, TextEncoder } from "util"
import { ReconnectingPTYRequest } from "../../api/types"
import {
history,
MockWorkspace,
MockWorkspaceAgent,
render,
} from "../../testHelpers/renderHelpers"
import { history, render } from "../../testHelpers/renderHelpers"
import { server } from "../../testHelpers/server"
import TerminalPage, { Language } from "./TerminalPage"

Expand Down
6 changes: 2 additions & 4 deletions site/src/pages/UserSettingsPage/SSHKeysPage/SSHKeysPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { fireEvent, screen, within } from "@testing-library/react"
import * as API from "../../../api/api"
import {
MockGitSSHKey,
renderWithAuth,
} from "../../../testHelpers/renderHelpers"
import { renderWithAuth } from "../../../testHelpers/renderHelpers"
import { Language as SSHKeysPageLanguage, SSHKeysPage } from "./SSHKeysPage"
import { Language as SSHKeysPageViewLanguage } from "./SSHKeysPageView"
import { i18n } from "i18n"
import { MockGitSSHKey } from "testHelpers/entities"

const { t } = i18n

Expand Down
16 changes: 8 additions & 8 deletions site/src/pages/UsersPage/UsersPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ import { fireEvent, screen, waitFor, within } from "@testing-library/react"
import userEvent from "@testing-library/user-event"
import { i18n } from "i18n"
import { rest } from "msw"
import { Language as usersXServiceLanguage } from "xServices/users/usersXService"
import * as API from "../../api/api"
import { Role } from "../../api/typesGenerated"
import { Language as ResetPasswordDialogLanguage } from "../../components/Dialogs/ResetPasswordDialog/ResetPasswordDialog"
import {
MockAuditorRole,
MockOwnerRole,
MockUser,
MockUser2,
renderWithAuth,
SuspendedMockUser,
} from "../../testHelpers/renderHelpers"
MockAuditorRole,
MockOwnerRole,
} from "testHelpers/entities"
import { Language as usersXServiceLanguage } from "xServices/users/usersXService"
import * as API from "../../api/api"
import { Role } from "../../api/typesGenerated"
import { Language as ResetPasswordDialogLanguage } from "../../components/Dialogs/ResetPasswordDialog/ResetPasswordDialog"
import { renderWithAuth } from "../../testHelpers/renderHelpers"
import { server } from "../../testHelpers/server"
import { Language as UsersPageLanguage, UsersPage } from "./UsersPage"

Expand Down
30 changes: 16 additions & 14 deletions site/src/pages/WorkspacePage/WorkspacePage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,26 @@ import userEvent from "@testing-library/user-event"
import EventSourceMock from "eventsourcemock"
import i18next from "i18next"
import { rest } from "msw"
import * as api from "../../api/api"
import { Workspace } from "../../api/typesGenerated"
import {
MockBuilds,
MockCanceledWorkspace,
MockCancelingWorkspace,
MockDeletedWorkspace,
MockDeletingWorkspace,
MockFailedWorkspace,
MockOutdatedWorkspace,
MockStartingWorkspace,
MockStoppedWorkspace,
MockStoppingWorkspace,
MockTemplate,
MockTemplateVersionParameter1,
MockTemplateVersionParameter2,
MockWorkspace,
MockWorkspaceBuild,
MockStoppedWorkspace,
MockStartingWorkspace,
MockOutdatedWorkspace,
MockTemplateVersionParameter1,
MockTemplateVersionParameter2,
MockStoppingWorkspace,
MockFailedWorkspace,
MockCancelingWorkspace,
MockCanceledWorkspace,
MockDeletingWorkspace,
MockDeletedWorkspace,
MockBuilds,
} from "testHelpers/entities"
import * as api from "../../api/api"
import { Workspace } from "../../api/typesGenerated"
import {
renderWithAuth,
waitForLoaderToBeRemoved,
} from "../../testHelpers/renderHelpers"
Expand Down
7 changes: 2 additions & 5 deletions site/src/pages/WorkspaceSchedulePage/WorkspaceSchedulePage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import {
MockUser,
MockWorkspace,
renderWithAuth,
} from "testHelpers/renderHelpers"
import { renderWithAuth } from "testHelpers/renderHelpers"
import userEvent from "@testing-library/user-event"
import { screen } from "@testing-library/react"
import {
Expand All @@ -23,6 +19,7 @@ import { WorkspaceSchedulePage } from "./WorkspaceSchedulePage"
import i18next from "i18next"
import { server } from "testHelpers/server"
import { rest } from "msw"
import { MockUser, MockWorkspace } from "testHelpers/entities"

const { t } = i18next

Expand Down
0