Skip to content

Commit 175dde1

Browse files
BrunoQuaresmaBrunoQuaresma
authored
chore(site): Try to fix flake test (#6848)
1 parent 90d18dd commit 175dde1

File tree

45 files changed

+317
-528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+317
-528
lines changed

‎site/.eslintrc.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@ plugins:
3232
- react-hooks
3333
- jest
3434
- unicorn
35+
- testing-library
36+
overrides:
37+
- files: ["**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[jt]s?(x)"]
38+
extends: ["plugin:testing-library/react", "plugin:testing-library/dom"]
39+
rules:
40+
# Occasionally, we must traverse the DOM when querying for an element to
41+
# avoid the performance costs that come with using selectors like ByRole.
42+
# You can read more about these performance costs here:
43+
# https://coder.com/docs/v2/latest/contributing/frontend#tests-getting-too-slow.
44+
testing-library/no-node-access: off
45+
testing-library/no-container: off
3546
root: true
3647
rules:
3748
"@typescript-eslint/brace-style":
@@ -145,6 +156,7 @@ rules:
145156
message: "Default React import not allowed",
146157
},
147158
]
159+
148160
settings:
149161
react:
150162
version: detect

‎site/.storybook/preview.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { addDecorator } from "node_modules/@storybook/react"
55
import { unstable_HistoryRouter as HistoryRouter } from "react-router-dom"
66
import { dark } from "../src/theme"
77
import "../src/theme/globalFonts"
8+
import "../src/i18n"
89

910
addDecorator((story) => (
1011
<ThemeProvider theme={dark}>

‎site/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
"date-fns": "2.29.3",
5454
"dayjs": "1.11.4",
5555
"emoji-mart": "5.4.0",
56+
"eslint-plugin-testing-library": "^5.10.2",
5657
"eventsourcemock": "2.0.0",
5758
"formik": "2.2.9",
5859
"front-matter": "4.0.2",
@@ -97,8 +98,8 @@
9798
"@storybook/react": "6.5.12",
9899
"@swc/core": "1.3.38",
99100
"@swc/jest": "0.2.24",
100-
"@testing-library/jest-dom": "5.16.4",
101-
"@testing-library/react": "13.4.0",
101+
"@testing-library/jest-dom": "5.16.5",
102+
"@testing-library/react": "14.0.0",
102103
"@testing-library/user-event": "14.4.3",
103104
"@types/jest": "29.4.0",
104105
"@types/node": "14.18.22",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
MockWorkspace,
44
MockWorkspaceAgent,
55
MockWorkspaceApp,
6-
} from "testHelpers/renderHelpers"
6+
} from "testHelpers/entities"
77
import { AppLink, AppLinkProps } from "./AppLink"
88

99
export default {

‎site/src/components/Dialogs/ConfirmDialog/ConfirmDialog.test.tsx

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { fireEvent, render } from "@testing-library/react"
1+
import { fireEvent, render, screen } from "@testing-library/react"
22
import { FC } from "react"
33
import { WrapperComponent } from "../../../testHelpers/renderHelpers"
44
import { ConfirmDialog, ConfirmDialogProps } from "./ConfirmDialog"
@@ -26,10 +26,10 @@ describe("ConfirmDialog", () => {
2626
}
2727

2828
// When
29-
const { getByRole } = render(<Helpers.Component {...props} />)
29+
render(<Helpers.Component {...props} />)
3030

3131
// Then
32-
expect(getByRole("dialog")).toBeDefined()
32+
expect(screen.getByRole("dialog")).toBeDefined()
3333
})
3434

3535
it("does not display cancel for info dialogs", () => {
@@ -43,10 +43,10 @@ describe("ConfirmDialog", () => {
4343
}
4444

4545
// When
46-
const { queryByText } = render(<Helpers.Component {...props} />)
46+
render(<Helpers.Component {...props} />)
4747

4848
// Then
49-
expect(queryByText("CANCEL")).toBeNull()
49+
expect(screen.queryByText("CANCEL")).toBeNull()
5050
})
5151

5252
it("can display cancel when normally hidden", () => {
@@ -61,10 +61,10 @@ describe("ConfirmDialog", () => {
6161
}
6262

6363
// When
64-
const { getByText } = render(<Helpers.Component {...props} />)
64+
render(<Helpers.Component {...props} />)
6565

6666
// Then
67-
expect(getByText("CANCEL")).toBeDefined()
67+
expect(screen.getByText("CANCEL")).toBeDefined()
6868
})
6969

7070
it("displays cancel for delete dialogs", () => {
@@ -79,10 +79,10 @@ describe("ConfirmDialog", () => {
7979
}
8080

8181
// When
82-
const { getByText } = render(<Helpers.Component {...props} />)
82+
render(<Helpers.Component {...props} />)
8383

8484
// Then
85-
expect(getByText("CANCEL")).toBeDefined()
85+
expect(screen.getByText("CANCEL")).toBeDefined()
8686
})
8787

8888
it("can hide cancel when normally visible", () => {
@@ -98,10 +98,10 @@ describe("ConfirmDialog", () => {
9898
}
9999

100100
// When
101-
const { queryByText } = render(<Helpers.Component {...props} />)
101+
render(<Helpers.Component {...props} />)
102102

103103
// Then
104-
expect(queryByText("CANCEL")).toBeNull()
104+
expect(screen.queryByText("CANCEL")).toBeNull()
105105
})
106106

107107
it("onClose is called when cancelled", () => {
@@ -116,8 +116,8 @@ describe("ConfirmDialog", () => {
116116
}
117117

118118
// When
119-
const { getByText } = render(<Helpers.Component {...props} />)
120-
fireEvent.click(getByText("CANCEL"))
119+
render(<Helpers.Component {...props} />)
120+
fireEvent.click(screen.getByText("CANCEL"))
121121

122122
// Then
123123
expect(onCloseMock).toBeCalledTimes(1)
@@ -138,8 +138,8 @@ describe("ConfirmDialog", () => {
138138
}
139139

140140
// When
141-
const { getByText } = render(<Helpers.Component {...props} />)
142-
fireEvent.click(getByText("CONFIRM"))
141+
render(<Helpers.Component {...props} />)
142+
fireEvent.click(screen.getByText("CONFIRM"))
143143

144144
// Then
145145
expect(onCloseMock).toBeCalledTimes(0)

‎site/src/components/Dialogs/ResetPasswordDialog/ResetPasswordDialog.stories.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { action } from "@storybook/addon-actions"
22
import { Story } from "@storybook/react"
3-
import { MockUser } from "../../../testHelpers/renderHelpers"
3+
import { MockUser } from "testHelpers/entities"
4+
45
import {
56
ResetPasswordDialog,
67
ResetPasswordDialogProps,

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

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)