Skip to content

Commit 98e2650

Browse files
authored
Merge branch 'main' into fix/await-async-events
2 parents 5d0ec0d + 1477f21 commit 98e2650

File tree

76 files changed

+3425
-1907
lines changed

Some content is hidden

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

76 files changed

+3425
-1907
lines changed

.all-contributorsrc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,8 @@
726726
"profile": "https://github.com/y-hsgw",
727727
"contributions": [
728728
"code",
729-
"test"
729+
"test",
730+
"ideas"
730731
]
731732
},
732733
{
@@ -747,6 +748,16 @@
747748
"contributions": [
748749
"code"
749750
]
751+
},
752+
{
753+
"login": "bonkevin",
754+
"name": "Kevin Bon",
755+
"avatar_url": "https://avatars.githubusercontent.com/u/228623539?v=4",
756+
"profile": "https://github.com/bonkevin",
757+
"contributions": [
758+
"code",
759+
"test"
760+
]
750761
}
751762
],
752763
"contributorsPerLine": 7,

.eslint-doc-generatorrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
const prettier = require('prettier');
2+
23
const prettierConfig = require('./.prettierrc.js');
34

45
/** @type {import('eslint-doc-generator').GenerateOptions} */

.eslintignore

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

.eslintrc.js

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

.github/workflows/main-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: pnpm/action-setup@v4
2222

2323
- name: Set up Node
24-
uses: actions/setup-node@v4
24+
uses: actions/setup-node@v5
2525
with:
2626
cache: 'pnpm'
2727
node-version-file: '.nvmrc'

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: pnpm/action-setup@v4
3636

3737
- name: Set up Node
38-
uses: actions/setup-node@v4
38+
uses: actions/setup-node@v5
3939
with:
4040
cache: 'pnpm'
4141
node-version-file: '.nvmrc'

.github/workflows/smoke-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: pnpm/action-setup@v4
1919

2020
- name: Use Node
21-
uses: actions/setup-node@v4
21+
uses: actions/setup-node@v5
2222
with:
2323
cache: 'pnpm'
2424
node-version-file: '.nvmrc'

.github/workflows/verifications.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: pnpm/action-setup@v4
2121

2222
- name: Set up Node
23-
uses: actions/setup-node@v4
23+
uses: actions/setup-node@v5
2424
with:
2525
cache: 'pnpm'
2626
node-version-file: '.nvmrc'
@@ -48,7 +48,7 @@ jobs:
4848
uses: pnpm/action-setup@v4
4949

5050
- name: Set up Node
51-
uses: actions/setup-node@v4
51+
uses: actions/setup-node@v5
5252
with:
5353
cache: 'pnpm'
5454
node-version: ${{ matrix.node }}

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,11 +325,11 @@ module.exports = [
325325
| Name                            | Description | 💼 | ⚠️ | 🔧 |
326326
| :------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------ | :-- |
327327
| [await-async-events](docs/rules/await-async-events.md) | Enforce promises from async event methods are handled | ![badge-angular][] ![badge-dom][] ![badge-marko][] ![badge-react][] ![badge-svelte][] ![badge-vue][] | | 🔧 |
328-
| [await-async-queries](docs/rules/await-async-queries.md) | Enforce promises from async queries to be handled | ![badge-angular][] ![badge-dom][] ![badge-marko][] ![badge-react][] ![badge-svelte][] ![badge-vue][] | | |
329-
| [await-async-utils](docs/rules/await-async-utils.md) | Enforce promises from async utils to be awaited properly | ![badge-angular][] ![badge-dom][] ![badge-marko][] ![badge-react][] ![badge-svelte][] ![badge-vue][] | | |
328+
| [await-async-queries](docs/rules/await-async-queries.md) | Enforce promises from async queries to be handled | ![badge-angular][] ![badge-dom][] ![badge-marko][] ![badge-react][] ![badge-svelte][] ![badge-vue][] | | 🔧 |
329+
| [await-async-utils](docs/rules/await-async-utils.md) | Enforce promises from async utils to be awaited properly | ![badge-angular][] ![badge-dom][] ![badge-marko][] ![badge-react][] ![badge-svelte][] ![badge-vue][] | | 🔧 |
330330
| [consistent-data-testid](docs/rules/consistent-data-testid.md) | Ensures consistent usage of `data-testid` | | | |
331331
| [no-await-sync-events](docs/rules/no-await-sync-events.md) | Disallow unnecessary `await` for sync events | ![badge-angular][] ![badge-dom][] ![badge-react][] | | |
332-
| [no-await-sync-queries](docs/rules/no-await-sync-queries.md) | Disallow unnecessary `await` for sync queries | ![badge-angular][] ![badge-dom][] ![badge-marko][] ![badge-react][] ![badge-svelte][] ![badge-vue][] | | |
332+
| [no-await-sync-queries](docs/rules/no-await-sync-queries.md) | Disallow unnecessary `await` for sync queries | ![badge-angular][] ![badge-dom][] ![badge-marko][] ![badge-react][] ![badge-svelte][] ![badge-vue][] | | 🔧 |
333333
| [no-container](docs/rules/no-container.md) | Disallow the use of `container` methods | ![badge-angular][] ![badge-marko][] ![badge-react][] ![badge-svelte][] ![badge-vue][] | | |
334334
| [no-debugging-utils](docs/rules/no-debugging-utils.md) | Disallow the use of debugging utilities like `debug` | | ![badge-angular][] ![badge-marko][] ![badge-react][] ![badge-svelte][] ![badge-vue][] | |
335335
| [no-dom-import](docs/rules/no-dom-import.md) | Disallow importing from DOM Testing Library | ![badge-angular][] ![badge-marko][] ![badge-react][] ![badge-svelte][] ![badge-vue][] | | 🔧 |
@@ -552,11 +552,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
552552
<td align="center" valign="top" width="14.28%"><a href="https://github.com/nostrorom"><img src="https://avatars.githubusercontent.com/u/49858211?v=4?s=100" width="100px;" alt="nostro"/><br /><sub><b>nostro</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=nostrorom" title="Code">💻</a></td>
553553
<td align="center" valign="top" width="14.28%"><a href="https://github.com/danielrentz"><img src="https://avatars.githubusercontent.com/u/5064304?v=4?s=100" width="100px;" alt="Daniel Rentz"/><br /><sub><b>Daniel Rentz</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=danielrentz" title="Documentation">📖</a></td>
554554
<td align="center" valign="top" width="14.28%"><a href="https://github.com/StyleShit"><img src="https://avatars.githubusercontent.com/u/32631382?v=4?s=100" width="100px;" alt="StyleShit"/><br /><sub><b>StyleShit</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=StyleShit" title="Code">💻</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=StyleShit" title="Tests">⚠️</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=StyleShit" title="Documentation">📖</a></td>
555-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/y-hsgw"><img src="https://avatars.githubusercontent.com/u/49516827?v=4?s=100" width="100px;" alt="Yukihiro Hasegawa"/><br /><sub><b>Yukihiro Hasegawa</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=y-hsgw" title="Code">💻</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=y-hsgw" title="Tests">⚠️</a></td>
555+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/y-hsgw"><img src="https://avatars.githubusercontent.com/u/49516827?v=4?s=100" width="100px;" alt="Yukihiro Hasegawa"/><br /><sub><b>Yukihiro Hasegawa</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=y-hsgw" title="Code">💻</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=y-hsgw" title="Tests">⚠️</a> <a href="#ideas-y-hsgw" title="Ideas, Planning, & Feedback">🤔</a></td>
556556
<td align="center" valign="top" width="14.28%"><a href="https://www.charleypugmire.me"><img src="https://avatars.githubusercontent.com/u/3228931?v=4?s=100" width="100px;" alt="Charley Pugmire"/><br /><sub><b>Charley Pugmire</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=puglyfe" title="Code">💻</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=puglyfe" title="Tests">⚠️</a></td>
557557
</tr>
558558
<tr>
559559
<td align="center" valign="top" width="14.28%"><a href="https://github.com/andreww2012"><img src="https://avatars.githubusercontent.com/u/6554045?v=4?s=100" width="100px;" alt="Andrew Kazakov"/><br /><sub><b>Andrew Kazakov</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=andreww2012" title="Code">💻</a></td>
560+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bonkevin"><img src="https://avatars.githubusercontent.com/u/228623539?v=4?s=100" width="100px;" alt="Kevin Bon"/><br /><sub><b>Kevin Bon</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=bonkevin" title="Code">💻</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=bonkevin" title="Tests">⚠️</a></td>
560561
</tr>
561562
</tbody>
562563
</table>

docs/rules/await-async-queries.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
💼 This rule is enabled in the following configs: `angular`, `dom`, `marko`, `react`, `svelte`, `vue`.
44

5+
🔧 This rule is automatically fixable by the [`--fix` CLI option](https://eslint.org/docs/latest/user-guide/command-line-interface#--fix).
6+
57
<!-- end auto-generated rule header -->
68

79
Ensure that promises returned by async queries are handled properly.
@@ -21,7 +23,7 @@ problems in the tests. The promise will be considered as handled when:
2123

2224
- using the `await` operator
2325
- wrapped within `Promise.all` or `Promise.allSettled` methods
24-
- chaining the `then` or `catch` method
26+
- chaining the `then`, `catch`, `finally` method
2527
- chaining `resolves` or `rejects` from jest
2628
- chaining `toResolve()` or `toReject()` from [jest-extended](https://github.com/jest-community/jest-extended#promise)
2729
- chaining jasmine [async matchers](https://jasmine.github.io/api/edge/async-matchers.html)

0 commit comments

Comments
 (0)