Skip to content

Commit

Permalink
Fix lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
eps1lon committed Jan 29, 2023
1 parent a3a9cd5 commit e5efaa8
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 8 deletions.
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@
"./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
1 change: 1 addition & 0 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
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

0 comments on commit e5efaa8

Please sign in to comment.