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.

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

Jump to bottom

[js] Ensure parity in the locators used by methods #13902

Merged
merged 2 commits into from
May 8, 2024
Merged

[js] Ensure parity in the locators used by methods #13902

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4682486
[js] Ensure parity in the locators used by methods
pujagani May 2, 2024
34f9ac3
Fix linting error
pujagani May 8, 2024
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
44 changes: 14 additions & 30 deletions javascript/node/selenium-webdriver/lib/select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

'use strict'

const { By, escapeCss } = require('./by')
const { By } = require('./by')
const error = require('./error')

/**
Expand Down Expand Up @@ -146,6 +146,10 @@ class Select {
* @param {WebElement} element Select WebElement.
*/
constructor(element) {
if (element === null) {
throw new Error(`Element must not be null. Please provide a valid <select> element.`)
}

this.element = element

this.element.getAttribute('tagName').then(function (tagName) {
Expand Down Expand Up @@ -220,9 +224,7 @@ class Select {
let matched = false
let isMulti = await this.isMultiple()

let options = await this.element.findElements({
css: 'option[value =' + escapeCss(value) + ']',
})
let options = await this.element.findElements(By.xpath('.//option[@value = ' + escapeQuotes(value) + ']'))

for (let option of options) {
await this.setSelected(option)
Expand Down Expand Up @@ -373,29 +375,9 @@ class Select {
*/
text = typeof text === 'number' ? text.toString() : text

const normalized = text
.trim() // strip leading and trailing white-space characters
.replace(/\s+/, ' ') // replace sequences of whitespace characters by a single space

/**
* find option element using xpath
*/
const formatted = /"/.test(normalized)
? 'concat("' + normalized.split('"').join('", \'"\', "') + '")'
: `"${normalized}"`
const dotFormat = `[. = ${formatted}]`
const spaceFormat = `[normalize-space(text()) = ${formatted}]`

const selections = [
`./option${dotFormat}`,
`./option${spaceFormat}`,
`./optgroup/option${dotFormat}`,
`./optgroup/option${spaceFormat}`,
]

const optionElement = await this.element.findElement({
xpath: selections.join('|'),
})
const optionElement = await this.element.findElement(
By.xpath('.//option[normalize-space(.) = ' + escapeQuotes(text) + ']'),
)
if (await optionElement.isSelected()) {
await optionElement.click()
}
Expand Down Expand Up @@ -451,9 +433,11 @@ class Select {

let matched = false

let options = await this.element.findElements({
css: 'option[value =' + escapeCss(value) + ']',
})
let options = await this.element.findElements(By.xpath('.//option[@value = ' + escapeQuotes(value) + ']'))

if (options.length === 0) {
throw new Error(`Cannot locate option with value: ${value}`)
}

for (let option of options) {
if (await option.isSelected()) {
Expand Down
Loading