Skip to content

Commit

Permalink
resize more aggressively + driver stabilization
Browse files Browse the repository at this point in the history
  • Loading branch information
toddtarsi committed Jan 26, 2024
1 parent 100f4c8 commit 6477adf
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
4 changes: 2 additions & 2 deletions packages/selenium-ide/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "selenium-ide",
"version": "4.0.1-alpha.80",
"version": "4.0.1-alpha.81",
"private": false,
"description": "Selenium IDE electron app",
"author": "Todd <[email protected]>",
Expand Down Expand Up @@ -116,7 +116,7 @@
"@seleniumhq/side-api": "^4.0.0-alpha.45",
"@seleniumhq/side-commons": "^4.0.0-alpha.2",
"@seleniumhq/side-model": "^4.0.0-alpha.5",
"@seleniumhq/side-runtime": "^4.0.0-alpha.35",
"@seleniumhq/side-runtime": "^4.0.0-alpha.36",
"dnd-core": "^16.0.1",
"electron-chromedriver": "^28.0.0",
"electron-log": "^5.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,9 @@ export default class WindowsController extends BaseController {
this.session.store.set(sizeKey as any, size)
}
window.on('move', recalculateEverything)
window.on('moved', recalculateEverything)
window.on('resize', recalculateEverything)
window.on('resized', recalculateEverything)
}

async onProjectLoaded() {
Expand Down
2 changes: 1 addition & 1 deletion packages/side-runner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"license": "Apache-2.0",
"dependencies": {
"@seleniumhq/side-model": "^4.0.0-alpha.5",
"@seleniumhq/side-runtime": "^4.0.0-alpha.35",
"@seleniumhq/side-runtime": "^4.0.0-alpha.36",
"commander": "^11.0.0",
"glob": "^10.3.1",
"jest": "^29.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/side-runtime/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@seleniumhq/side-runtime",
"version": "4.0.0-alpha.35",
"version": "4.0.0-alpha.36",
"private": false,
"description": "Selenium IDE playback and execution",
"author": "Tomer <[email protected]>",
Expand Down
12 changes: 8 additions & 4 deletions packages/side-runtime/src/webdriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1474,10 +1474,14 @@ export default class WebDriverExecutor {
const visibleCondition = new WebElementCondition(
'for element to be visible',
this.withCancel(async () => {
const el = await this.elementIsLocated(locator, ...fallbacks)
if (!el) return null
if (!(await el.isDisplayed())) return null
return el
try {
const el = await this.elementIsLocated(locator, ...fallbacks)
if (!el) return null
if (!(await el.isDisplayed())) return null
return el
} catch (e) {
return null
}
})
)
return await this.driver.wait<WebElementShape>(visibleCondition, timeout)
Expand Down

0 comments on commit 6477adf

Please sign in to comment.