Skip to content

fix(webdriver): click iOS elements with the W3C elementClick command #5757

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

Open
elliotsabitov wants to merge 1 commit into
base: 4.x
Choose a base branch
from
+3 −6
Open

fix(webdriver): click iOS elements with the W3C elementClick command #5757

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
9 changes: 3 additions & 6 deletions lib/helper/WebDriver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,6 @@ class WebDriver extends Helper {
*
*/
async click(locator, context = null) {
const clickMethod = this.browser.isMobile && this.browser.capabilities.platformName !== 'android' ? 'touchClick' : 'elementClick'
const locateFn = prepareLocateFn.call(this, context)

const res = await findClickable.call(this, locator, locateFn)
Expand All @@ -1090,7 +1089,7 @@ class WebDriver extends Helper {
}
const elem = selectElement(res, locator, this)
highlightActiveElement.call(this, elem)
return this.browser[clickMethod](getElementId(elem))
return this.browser.elementClick(getElementId(elem))
}

/**
Expand Down Expand Up @@ -1390,7 +1389,6 @@ class WebDriver extends Helper {
* {{> checkOption }}
*/
async checkOption(field, context = null) {
const clickMethod = this.browser.isMobile && this.browser.capabilities.platformName !== 'android' ? 'touchClick' : 'elementClick'
const locateFn = prepareLocateFn.call(this, context)

const res = await findCheckable.call(this, field, locateFn)
Expand All @@ -1403,15 +1401,14 @@ class WebDriver extends Helper {
const isSelected = await isElementChecked(this.browser, elementId)

if (isSelected) return Promise.resolve(true)
return this.browser[clickMethod](elementId)
return this.browser.elementClick(elementId)
}

/**
* Appium: not tested
* {{> uncheckOption }}
*/
async uncheckOption(field, context = null) {
const clickMethod = this.browser.isMobile && this.browser.capabilities.platformName !== 'android' ? 'touchClick' : 'elementClick'
const locateFn = prepareLocateFn.call(this, context)

const res = await findCheckable.call(this, field, locateFn)
Expand All @@ -1424,7 +1421,7 @@ class WebDriver extends Helper {
const isSelected = await isElementChecked(this.browser, elementId)

if (!isSelected) return Promise.resolve(true)
return this.browser[clickMethod](elementId)
return this.browser.elementClick(elementId)
}

/**
Expand Down
Loading