Improve stability of e2e tests for new VS Code release (#2897)

mattseddon · web-flow · commit 569571514f03 · 2022-12-07T23:25:57.000Z
diff --git a/extension/src/test/e2e/pageObjects/baseWebview.ts b/extension/src/test/e2e/pageObjects/baseWebview.ts
@@ -18,16 +18,17 @@ export class BaseWebview extends BasePage<
   }
 
   public async focus() {
-    const webviewContainer = await this.outerFrame$
+    await this.outerFrame$.waitForExist()
 
-    await this.outerFrame$.waitForDisplayed()
+    await browser.switchToFrame(await this.outerFrame$)
+
+    await this.innerFrame$.waitForExist()
 
-    await browser.switchToFrame(webviewContainer)
-    await this.innerFrame$.waitForDisplayed()
     const webviewInner = await browser.findElement(
       'css selector',
       this.locators.innerFrame
     )
+
     return browser.switchToFrame(webviewInner)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -18,16 +18,17 @@ export class BaseWebview extends BasePage<`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public async focus() {`
`21`		`- const webviewContainer = await this.outerFrame$`
	`21`	`+ await this.outerFrame$.waitForExist()`
`22`	`22`
`23`		`- await this.outerFrame$.waitForDisplayed()`
	`23`	`+ await browser.switchToFrame(await this.outerFrame$)`
	`24`	`+`
	`25`	`+ await this.innerFrame$.waitForExist()`
`24`	`26`
`25`		`- await browser.switchToFrame(webviewContainer)`
`26`		`- await this.innerFrame$.waitForDisplayed()`
`27`	`27`	`const webviewInner = await browser.findElement(`
`28`	`28`	`'css selector',`
`29`	`29`	`this.locators.innerFrame`
`30`	`30`	`)`
	`31`	`+`
`31`	`32`	`return browser.switchToFrame(webviewInner)`
`32`	`33`	`}`
`33`	`34`