Skip to content

Fixed ByLabel queries to work with selects #451

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 4, 2020
Merged

Fixed ByLabel queries to work with selects #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions src/__tests__/element-queries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,3 +830,16 @@ test('can get a textarea with children', () => {
`)
getByLabelText('Label')
})

test('can get a select with options', () => {
const {getByLabelText} = renderIntoDocument(`
<label>
Label
<select>
<option>Some</option>
<option>Options</option>
</select>
</label>
`)
getByLabelText('Label')
})
6 changes: 6 additions & 0 deletions src/queries/label-text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ function queryAllLabelsByText(
textToMatch = textToMatch.replace(textarea.value, '')
})

// The children of a select are also part of `textContent`, so we
// need also to remove their text.
Array.from(label.querySelectorAll('select')).forEach(select => {
textToMatch = textToMatch.replace(select.textContent, '')
})

return matcher(textToMatch, label, text, matchNormalizer)
})
}
Expand Down