Skip to content
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.

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

Bump kcd-scripts to 12.x #1208

Merged
merged 3 commits into from
Jan 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,18 @@
"jest-in-case": "^1.0.2",
"jest-snapshot-serializer-ansi": "^1.0.0",
"jest-watch-select-projects": "^2.0.0",
"jsdom": "^16.4.0",
"kcd-scripts": "^11.0.0",
"jsdom": "19.0.0",
"kcd-scripts": "^12.3.0",
"typescript": "^4.1.2"
},
"eslintConfig": {
"extends": [
"./node_modules/kcd-scripts/eslint.js",
"plugin:import/typescript"
],
"parserOptions": {
"ecmaVersion": 2020
},
"rules": {
"@typescript-eslint/prefer-optional-chain": "off",
"@typescript-eslint/no-explicit-any": "off",
Expand Down
7 changes: 4 additions & 3 deletions src/__tests__/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ describe('configuration API', () => {
return {}
})
})
afterEach(() => {
configure(originalConfig)
})

beforeEach(() => {
configure({other: 123})
})

afterEach(() => {
configure(originalConfig)
})

describe('getConfig', () => {
test('returns existing configuration', () => {
const conf = getConfig()
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/fake-timers.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ test('recursive timers do not cause issues', async () => {
let recurse = true
function startTimer() {
setTimeout(() => {
// eslint-disable-next-line jest/no-conditional-in-test -- false-positive
if (recurse) startTimer()
}, 1)
}
Expand Down
9 changes: 5 additions & 4 deletions src/__tests__/role.js
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ test('accessible name filter implements TextMatch', () => {
expect(
getByRole('heading', {
name: (name, element) => {
// eslint-disable-next-line jest/no-conditional-in-test -- false-positive
return element.nodeName === 'H2' && name === 'Your Signature'
},
}),
Expand Down Expand Up @@ -564,11 +565,11 @@ describe('configuration', () => {
queryByRole('button', {name: 'Hello, Dave!'})

expect(console.error).toHaveBeenCalledTimes(2)
expect(console.error.mock.calls[0][0]).toMatch(
'Error: Not implemented: window.computedStyle(elt, pseudoElt)',
expect(console.error.mock.calls[0][0].message).toMatch(
'Not implemented: window.computedStyle(elt, pseudoElt)',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JSDOM now calls console.error with the actual Error instance instead of its stringified version

)
expect(console.error.mock.calls[1][0]).toMatch(
'Error: Not implemented: window.computedStyle(elt, pseudoElt)',
expect(console.error.mock.calls[1][0].message).toMatch(
'Not implemented: window.computedStyle(elt, pseudoElt)',
)
} finally {
jest.restoreAllMocks()
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/wait-for-element-to-be-removed.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ test('rethrows non-testing-lib errors', () => {
const error = new Error('my own error')
return expect(
waitForElementToBeRemoved(() => {
// eslint-disable-next-line jest/no-conditional-in-test -- false-positive
if (throwIt) {
throw error
}
Expand Down
3 changes: 2 additions & 1 deletion src/__tests__/wait-for.js
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ test('does not work after it resolves', async () => {
context = 'act'
try {
const result = callback()
// eslint-disable-next-line jest/no-if
// eslint-disable-next-line jest/no-if, jest/no-conditional-in-test -- false-positive
if (typeof result?.then === 'function') {
const thenable = result
return {
Expand Down Expand Up @@ -319,6 +319,7 @@ test('does not work after it resolves', async () => {

await waitFor(
() => {
// eslint-disable-next-line jest/no-conditional-in-test -- false-positive
if (data === null) {
throw new Error('not found')
}
Expand Down
1 change: 1 addition & 0 deletions src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ function jestFakeTimersAreEnabled() {
// legacy timers
(setTimeout as any)._isMockFunction === true ||
// modern timers
// eslint-disable-next-line prefer-object-has-own -- not supported by our support matrix
Object.prototype.hasOwnProperty.call(setTimeout, 'clock')
)
}
Expand Down
12 changes: 8 additions & 4 deletions src/queries/label-text.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,23 @@ const queryAllByLabelText: AllByText = (
if (
matcher(label.content, label.formControl, text, matchNormalizer) &&
label.formControl
)
) {
labelledElements.push(label.formControl)
}
})
const labelsValue = labelList
.filter(label => Boolean(label.content))
.map(label => label.content)
if (
matcher(labelsValue.join(' '), labelledElement, text, matchNormalizer)
)
) {
labelledElements.push(labelledElement)
}
if (labelsValue.length > 1) {
labelsValue.forEach((labelValue, index) => {
if (matcher(labelValue, labelledElement, text, matchNormalizer))
if (matcher(labelValue, labelledElement, text, matchNormalizer)) {
labelledElements.push(labelledElement)
}

const labelsFiltered = [...labelsValue]
labelsFiltered.splice(index, 1)
Expand All @@ -97,8 +100,9 @@ const queryAllByLabelText: AllByText = (
text,
matchNormalizer,
)
)
) {
labelledElements.push(labelledElement)
}
}
})
}
Expand Down
16 changes: 8 additions & 8 deletions src/query-helpers.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type {
GetErrorFunction,
Matcher,
MatcherOptions,
QueryMethod,
Variant,
waitForOptions as WaitForOptions,
WithSuggest,
import {
type GetErrorFunction,
type Matcher,
type MatcherOptions,
type QueryMethod,
type Variant,
type waitForOptions as WaitForOptions,
type WithSuggest,
} from '../types'
import {getSuggestedQuery} from './suggestions'
import {fuzzyMatches, matches, makeNormalizer} from './matches'
Expand Down
2 changes: 1 addition & 1 deletion src/screen.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// WARNING: `lz-string` only has a default export but statically we assume named exports are allowd
// TODO: Statically verify we don't rely on NodeJS implicit named imports.
import lzString from 'lz-string'
import type {OptionsReceived} from 'pretty-format'
import {type OptionsReceived} from 'pretty-format'
import {getQueriesForElement} from './get-queries-for-element'
import {getDocument} from './helpers'
import {logDOM} from './pretty-dom'
Expand Down