Skip to content

Commit

Permalink
Bump kcd-scripts to 13.0.0 (#1170)
Browse files Browse the repository at this point in the history
* Bump kcd-scripts to 13.0.0

* Resolve lint issues
  • Loading branch information
eps1lon authored Feb 15, 2023
1 parent 9b7a1e2 commit 1934bf2
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 12 deletions.
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"@testing-library/jest-dom": "^5.11.6",
"chalk": "^4.1.2",
"dotenv-cli": "^4.0.0",
"jest-diff": "^27.5.1",
"kcd-scripts": "^11.1.0",
"jest-diff": "^29.4.1",
"kcd-scripts": "^13.0.0",
"npm-run-all": "^4.1.5",
"react": "^18.0.0",
"react-dom": "^18.0.0",
Expand All @@ -67,6 +67,9 @@
},
"eslintConfig": {
"extends": "./node_modules/kcd-scripts/eslint.js",
"parserOptions": {
"ecmaVersion": 2022
},
"globals": {
"globalThis": "readonly"
},
Expand All @@ -76,6 +79,7 @@
"import/no-unassigned-import": "off",
"import/named": "off",
"testing-library/no-container": "off",
"testing-library/no-debugging-utils": "off",
"testing-library/no-dom-import": "off",
"testing-library/no-unnecessary-act": "off",
"testing-library/prefer-user-event": "off"
Expand Down
3 changes: 2 additions & 1 deletion src/__tests__/cleanup.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ describe('fake timers and missing act warnings', () => {
let cancelled = false
Promise.resolve().then(() => {
microTaskSpy()
// eslint-disable-next-line jest/no-if -- false positive
// eslint-disable-next-line jest/no-if, jest/no-conditional-in-test -- false positive
if (!cancelled) {
setDeferredCounter(counter)
}
Expand Down Expand Up @@ -96,6 +96,7 @@ describe('fake timers and missing act warnings', () => {
let cancelled = false
setTimeout(() => {
deferredStateUpdateSpy()
// eslint-disable-next-line jest/no-conditional-in-test -- false-positive
if (!cancelled) {
setDeferredCounter(counter)
}
Expand Down
3 changes: 1 addition & 2 deletions src/__tests__/debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ test('allows same arguments as prettyDOM', () => {
debug(container, 6, {highlight: false})
expect(console.log).toHaveBeenCalledTimes(1)
expect(console.log.mock.calls[0]).toMatchInlineSnapshot(`
Array [
[
<div>
...,
]
Expand All @@ -52,5 +52,4 @@ test('allows same arguments as prettyDOM', () => {
/*
eslint
no-console: "off",
testing-library/no-debug: "off",
*/
8 changes: 4 additions & 4 deletions src/__tests__/new-act.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ test('async act recovers from errors', async () => {
}
expect(console.error).toHaveBeenCalledTimes(1)
expect(console.error.mock.calls).toMatchInlineSnapshot(`
Array [
Array [
[
[
call console.error,
],
]
Expand All @@ -65,8 +65,8 @@ test('async act recovers from sync errors', async () => {
}
expect(console.error).toHaveBeenCalledTimes(1)
expect(console.error.mock.calls).toMatchInlineSnapshot(`
Array [
Array [
[
[
call console.error,
],
]
Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/renderHook.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ test('allows rerendering', () => {
const [left, setLeft] = React.useState('left')
const [right, setRight] = React.useState('right')

// eslint-disable-next-line jest/no-if
// eslint-disable-next-line jest/no-if, jest/no-conditional-in-test -- false-positive
switch (branch) {
case 'left':
return [left, setLeft]
Expand Down
3 changes: 3 additions & 0 deletions tests/setup-env.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
import '@testing-library/jest-dom/extend-expect'
import './failOnUnexpectedConsoleCalls'
import {TextEncoder} from 'util'

global.TextEncoder = TextEncoder
2 changes: 1 addition & 1 deletion tests/toWarnDev.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SOFTWARE.
*/
/* eslint-disable no-unsafe-finally */
/* eslint-disable no-negated-condition */
/* eslint-disable @babel/no-invalid-this */
/* eslint-disable no-invalid-this */
/* eslint-disable prefer-template */
/* eslint-disable func-names */
/* eslint-disable complexity */
Expand Down
1 change: 0 additions & 1 deletion types/test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ export function testRenderHookProps() {
eslint
testing-library/prefer-explicit-assert: "off",
testing-library/no-wait-for-empty-callback: "off",
testing-library/no-debug: "off",
testing-library/prefer-screen-queries: "off"
*/

Expand Down

0 comments on commit 1934bf2

Please sign in to comment.