Skip to content

Commit 338aec2

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix-setup-async-methods
2 parents 347b2cd + 086eab9 commit 338aec2

File tree

73 files changed

+3925
-2235
lines changed

Some content is hidden

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

73 files changed

+3925
-2235
lines changed

.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ jobs:
1515
timeout-minutes: 3
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919

2020
- name: Install pnpm
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ jobs:
2929
if: github.repository == 'testing-library/eslint-plugin-testing-library'
3030
steps:
3131
- name: Checkout
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333

3434
- name: Install pnpm
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616

1717
- name: Install pnpm
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
['lint', 'type-check', 'format:check', 'generate-all:check']
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
- name: Install pnpm
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'
@@ -42,13 +42,13 @@ jobs:
4242
eslint: [8.57.0, 8, 9]
4343
steps:
4444
- name: Checkout
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v5
4646

4747
- name: Install pnpm
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: 2 additions & 2 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][] | | |
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][] | | 🔧 |
329329
| [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][] | | 🔧 |

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` method
26+
- chaining the `then` or `catch` 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)

docs/rules/await-async-utils.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ problems in the tests. The promise will be considered as handled when:
1919

2020
- using the `await` operator
2121
- wrapped within `Promise.all` or `Promise.allSettled` methods
22-
- chaining the `then` method
22+
- chaining the `then` or `catch` method
2323
- chaining `resolves` or `rejects` from jest
2424
- chaining `toResolve()` or `toReject()` from [jest-extended](https://github.com/jest-community/jest-extended#promise)
2525
- chaining jasmine [async matchers](https://jasmine.github.io/api/edge/async-matchers.html)

0 commit comments

Comments
 (0)