changed behavior of _I switch to {string} window_ step (now it is wait for window existence) (#91)

changed behavior of _I switch to {string} window_ step (now it is wait for window existence) (#91)
fixed getting of electron context

Author: AlexGalichenko

CHANGELOG.md

@@ -10,8 +10,10 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 ## [0.40.0]
 - :rocket: changed simple expects to poll expects
-- :rocket: replaced _wdioValueWait_ type with more generic _wdioValidation_ allowing more wait types
+- :rocket: changed behavior of _I switch to {string} window_ step (now it is wait for window existence)
+- :rocket: replaced _playwrightValueWait_ type with more generic _playwrightValueWait_ allowing more wait types
   Breaking change: value waits now depends on _value_ timeout
+- :beetle: fixed getting of electron context
 
 ## [0.39.0]
 - :rocket: enabled logger for page objects

src/actions.ts

@@ -3,7 +3,7 @@ import { getValue, getElement } from './transformers';
 import { po } from '@qavajs/po-playwright';
 import { expect } from '@playwright/test';
 import { parseCoords, parseCoordsAsObject } from './utils/utils';
-import {Browser, BrowserContext, Page} from 'playwright';
+import { Browser, BrowserContext, Page } from 'playwright';
 
 declare global {
     var browser: Browser;
@@ -144,17 +144,25 @@ When('I switch to {int} window', async function (index: number) {
  */
 When('I switch to {string} window', async function (matcher: string) {
     const urlOrTitle = await getValue(matcher);
-    const pages = context.pages();
-    for (const p of pages) {
-        if (p.url().includes(urlOrTitle) || (await p.title()).includes(urlOrTitle)) {
-            global.page = p;
-            //@ts-ignore
-            po.driver = p;
-            await page.bringToFront();
-            return;
+    const poll = async () => {
+        const pages = context.pages();
+        for (const currentPage of pages) {
+            if (currentPage.url().includes(urlOrTitle) || (await currentPage.title()).includes(urlOrTitle)) {
+                return currentPage
+            }
         }
     }
-    throw new Error(`Page matching '${matcher}' is not found`);
+    await expect.poll(
+        poll,
+        {
+            timeout: config.browser.timeout.page,
+            message: `Page matching ${urlOrTitle} was not found`
+        }
+    ).toBeDefined();
+    const targetPage = await poll() as Page;
+    global.page = targetPage;
+    (po as any).driver = targetPage;
+    await targetPage.bringToFront();
 });
 
 /**

src/hooks.ts

@@ -9,7 +9,7 @@ import {
     ITestStepHookParameter
 } from '@cucumber/cucumber';
 import defaultTimeouts from './defaultTimeouts';
-import { Browser, BrowserContext, Page } from 'playwright';
+import { Browser, BrowserContext, Page, ElectronApplication } from 'playwright';
 import { po } from '@qavajs/po-playwright';
 import { driverProvider } from './driverProvider';
 import {
@@ -50,8 +50,7 @@ Before({name: 'context init'}, async function () {
         config.driverConfig.capabilities.recordVideo = config.driverConfig.video;
     }
     global.context = driverConfig.isElectron
-        //@ts-ignore
-        ? browser.context()
+        ? (browser as any as ElectronApplication).context()
         : await browser.newContext(config?.driverConfig?.capabilities);
     if (config.driverConfig.trace) {
         await context.tracing.start({
@@ -60,8 +59,7 @@ Before({name: 'context init'}, async function () {
         });
     }
     global.page = driverConfig.isElectron
-        //@ts-ignore
-        ? browser.firstWindow()
+        ? await (browser as any as ElectronApplication).firstWindow()
         : await context.newPage();
     global.driver = global.browser;
     po.init(page, { timeout: config.driverConfig.timeout.present, logger: this });
@@ -106,8 +104,16 @@ After({name: 'context teardown'}, async function (scenario: ITestCaseHookParamet
             }
             global.contexts = null;
         } else {
-            await context.close();
-            this.log('context closed');
+            if (!config.driverConfig.isElectron) {
+                await context.close();
+                this.log('context closed');
+            } else {
+                await (browser as any as ElectronApplication)
+                    .evaluate((main: any) => { main.app.exit(0) });
+                // @ts-ignore
+                global.browser = null;
+                this.log('electron app closed');
+            }
         }
     }
     if (saveVideo(config.driverConfig, scenario)) {
@@ -121,6 +127,8 @@ After({name: 'context teardown'}, async function (scenario: ITestCaseHookParamet
 
 AfterAll(async function () {
     if (global.browser) {
-        await browser.close();
+        if (!config.driverConfig.isElectron) {
+            await browser.close();
+        }
     }
 });