@wdio/runner 8.0.0-alpha.607 → 8.0.0-alpha.620

package/build/browser.d.ts

@@ -16,14 +16,16 @@ export default class BrowserFramework implements Omit<TestFramework, 'init'> {
     private _specs;
     private _capabilities;
     private _reporter;
-    constructor(_cid: string, _config: unknown, _specs: string[], _capabilities: Capabilities.RemoteCapability, _reporter: BaseReporter);
+    constructor(_cid: string, _config: {
+        sessionId?: string;
+    }, _specs: string[], _capabilities: Capabilities.RemoteCapability, _reporter: BaseReporter);
     /**
      * always return true as it is unrelevant for component testing
      */
     hasTests(): boolean;
     init(): TestFramework;
     run(): Promise<number>;
-    static init(cid: string, config: unknown, specs: string[], caps: Capabilities.RemoteCapability, reporter: BaseReporter): BrowserFramework;
+    static init(cid: string, config: any, specs: string[], caps: Capabilities.RemoteCapability, reporter: BaseReporter): BrowserFramework;
 }
 export {};
 //# sourceMappingURL=browser.d.ts.map

package/build/browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,KAAK,YAAY,MAAM,YAAY,CAAA;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAK5C,KAAK,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC,CAAA;AAE9D,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,cAAc,EAAE,cAAc,EAAE,CAAA;QAChC,cAAc,EAAE,GAAG,EAAE,CAAA;QACrB,gBAAgB,EAAE,MAAM,CAAA;KAC3B;CACJ;AAID,MAAM,CAAC,OAAO,OAAO,gBAAiB,YAAW,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC;;IAEpE,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;gBAJT,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EAAE,EAChB,aAAa,EAAE,YAAY,CAAC,gBAAgB,EAC5C,SAAS,EAAE,YAAY;IAGnC;;OAEG;IACH,QAAQ;IAIR,IAAI;IAIE,GAAG;IAiFT,MAAM,CAAC,IAAI,CAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,gBAAgB,EAAE,QAAQ,EAAE,YAAY;CAI1H"}
+{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,KAAK,YAAY,MAAM,YAAY,CAAA;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAK5C,KAAK,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC,CAAA;AAE9D,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ,cAAc,EAAE,cAAc,EAAE,CAAA;QAChC,cAAc,EAAE,GAAG,EAAE,CAAA;QACrB,gBAAgB,EAAE,MAAM,CAAA;KAC3B;CACJ;AAID,MAAM,CAAC,OAAO,OAAO,gBAAiB,YAAW,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC;;IAEpE,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,SAAS;gBAJT,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,EAC/B,MAAM,EAAE,MAAM,EAAE,EAChB,aAAa,EAAE,YAAY,CAAC,gBAAgB,EAC5C,SAAS,EAAE,YAAY;IAGnC;;OAEG;IACH,QAAQ;IAIR,IAAI;IAIE,GAAG;IA0FT,MAAM,CAAC,IAAI,CAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,gBAAgB,EAAE,QAAQ,EAAE,YAAY;CAItH"}

package/build/browser.js

@@ -44,7 +44,14 @@ export default class BrowserFramework {
         let failures = 0;
         for (const spec of this._specs) {
             log.info(`Run spec file ${spec} for cid ${this._cid}`);
-            await browser.url(`/${this._cid}/test.html?spec=${url.fileURLToPath(spec)}`);
+            /**
+             * if a `sessionId` is part of `this._config` it means we are in watch mode and are
+             * re-using a previous session. Since Vite has already a hotreload feature, there
+             * is no need to call the url command again
+             */
+            if (!this._config.sessionId) {
+                await browser.url(`/${this._cid}/test.html?spec=${url.fileURLToPath(spec)}`);
+            }
             // await browser.debug()
             /**
              * fetch page errors that are thrown during rendering and let spec file fail
@@ -52,11 +59,11 @@ export default class BrowserFramework {
             const jsErrors = (await browser.execute(() => window.__wdioErrors__)) || ([]);
             if (jsErrors.length) {
                 const errors = jsErrors.map((ev) => `${path.basename(ev.filename)}: ${ev.message}`);
-                const envError = new Error(`Test failed due to following error(s):${sep}${errors.join(sep)}`);
-                this._reporter.emit('error', {
-                    cid: this._cid,
+                const { name, message, stack } = new Error(`Test failed due to following error(s):${sep}${errors.join(sep)}`);
+                process.send({
+                    origin: 'worker',
                     name: 'error',
-                    content: envError.message
+                    content: { name, message, stack }
                 });
                 failures += 1;
                 continue;
@@ -79,7 +86,8 @@ export default class BrowserFramework {
             }
             return true;
         }, {
-            timeoutMsg: 'browser test timed out'
+            timeoutMsg: 'browser test timed out',
+            timeout: 15 * 1000
         });
         /**
          * populate events to the reporter

package/build/index.d.ts

@@ -52,7 +52,7 @@ export default class Runner extends EventEmitter {
      * end WebDriver session, a config object can be applied if object has changed
      * within a hook by the user
      */
-    endSession(): Promise<void>;
+    endSession(payload?: any): Promise<void>;
 }
 export { default as BaseReporter } from './reporter.js';
 export * from './types.js';

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAa1C,OAAO,KAAK,EACoD,SAAS,EAGxE,MAAM,SAAS,CAAA;AAIhB,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,YAAY;;IAC5C,OAAO,CAAC,QAAQ,CAAC,CAAgD;IACjE,OAAO,CAAC,aAAa,CAAC,CAAc;IACpC,OAAO,CAAC,gBAAgB,CAAQ;IAChC,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,sBAAsB,CAAI;IAElC,OAAO,CAAC,SAAS,CAAC,CAAc;IAChC,OAAO,CAAC,UAAU,CAAC,CAAe;IAClC,OAAO,CAAC,OAAO,CAAC,CAAoB;IACpC,OAAO,CAAC,IAAI,CAAC,CAAQ;IACrB,OAAO,CAAC,MAAM,CAAC,CAAU;IACzB,OAAO,CAAC,KAAK,CAAC,CAA+B;IAE7C;;;;;;;;;OASG;IACG,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,SAAS;IAgLpE;;;;;;OAMG;YACW,YAAY;IA6C1B;;;;;OAKG;YACW,aAAa;IAiC3B;;OAEG;YACW,gBAAgB;IA8D9B;;OAEG;YACW,SAAS;IAmCvB;;;OAGG;IACG,UAAU;CA2DnB;AAED,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,eAAe,CAAA;AACvD,cAAc,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAa1C,OAAO,KAAK,EACoD,SAAS,EAGxE,MAAM,SAAS,CAAA;AAIhB,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,YAAY;;IAC5C,OAAO,CAAC,QAAQ,CAAC,CAAgD;IACjE,OAAO,CAAC,aAAa,CAAC,CAAc;IACpC,OAAO,CAAC,gBAAgB,CAAQ;IAChC,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,sBAAsB,CAAI;IAElC,OAAO,CAAC,SAAS,CAAC,CAAc;IAChC,OAAO,CAAC,UAAU,CAAC,CAAe;IAClC,OAAO,CAAC,OAAO,CAAC,CAAoB;IACpC,OAAO,CAAC,IAAI,CAAC,CAAQ;IACrB,OAAO,CAAC,MAAM,CAAC,CAAU;IACzB,OAAO,CAAC,KAAK,CAAC,CAA+B;IAE7C;;;;;;;;;OASG;IACG,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,SAAS;IAgLpE;;;;;;OAMG;YACW,YAAY;IAkC1B;;;;;OAKG;YACW,aAAa;IAkD3B;;OAEG;YACW,gBAAgB;IA8D9B;;OAEG;YACW,SAAS;IAmCvB;;;OAGG;IACG,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG;CAsEjC;AAED,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,eAAe,CAAA;AACvD,cAAc,YAAY,CAAA"}

package/build/index.js

@@ -6,6 +6,7 @@ import { initialiseWorkerService, initialisePlugin, executeHooksWithArgs } from
 import { ConfigParser } from '@wdio/config';
 import { _setGlobal } from '@wdio/globals';
 import { expect, setOptions } from 'expect-webdriverio';
+import { attach } from 'webdriverio';
 import BrowserFramework from './browser.js';
 import BaseReporter from './reporter.js';
 import { initialiseInstance, filterLogTypes, getInstancesData } from './utils.js';
@@ -73,7 +74,7 @@ export default class Runner extends EventEmitter {
         if (!this._framework.hasTests()) {
             return this._shutdown(0, retries, true);
         }
-        browser = await this._initSession(this._config, this._caps, browser);
+        browser = await this._initSession(this._config, this._caps);
         /**
          * return if session initialisation failed
          */
@@ -182,21 +183,12 @@ export default class Runner extends EventEmitter {
      * @param  {Object}  browserStub   stubbed `browser` object with only capabilities, config and env flags
      * @return {Promise}               resolves with browser object or null if session couldn't get established
      */
-    async _initSession(config, caps, browserStub) {
+    async _initSession(config, caps) {
         const browser = await this._startSession(config, caps);
         // return null if session couldn't get established
         if (!browser) {
             return;
         }
-        // add flags declared by user to browser object
-        if (browserStub) {
-            Object.entries(browserStub).forEach(([key, value]) => {
-                if (typeof browser[key] === 'undefined') {
-                    // @ts-ignore allow to set value for undefined props
-                    browser[key] = value;
-                }
-            });
-        }
         /**
          * register global helper method to fetch elements
          */
@@ -220,10 +212,25 @@ export default class Runner extends EventEmitter {
      */
     async _startSession(config, caps) {
         try {
+            /**
+             * get all custom or overwritten commands users tried to register before the
+             * test started, e.g. after all imports
+             */
+            const customStubCommands = this._browser?.customCommands || [];
+            const overwrittenCommands = this._browser?.overwrittenCommands || [];
             this._browser = await initialiseInstance(config, caps, this._isMultiremote);
             _setGlobal('browser', this._browser, config.injectGlobals);
             _setGlobal('driver', this._browser, config.injectGlobals);
             _setGlobal('expect', expect, config.injectGlobals);
+            /**
+             * re-assign previously registered custom commands to the actual instance
+             */
+            for (const params of customStubCommands) {
+                this._browser.addCommand(...params);
+            }
+            for (const params of overwrittenCommands) {
+                this._browser.overwriteCommand(...params);
+            }
             /**
              * import and set options for `expect-webdriverio` assertion lib once
              * the browser was initiated
@@ -334,7 +341,7 @@ export default class Runner extends EventEmitter {
      * end WebDriver session, a config object can be applied if object has changed
      * within a hook by the user
      */
-    async endSession() {
+    async endSession(payload) {
         /**
          * make sure instance(s) exist and have `sessionId`
          */
@@ -350,10 +357,21 @@ export default class Runner extends EventEmitter {
              */
             : this._browser?.sessionId);
         /**
-         * don't do anything if test framework returns after SIGINT
-         * if endSession is called without payload we expect a session id
+         * in watch mode we create a new child process to kill the
+         * session, see packages/wdio-local-runner/src/index.ts,
+         * therefore we need to attach to the session to kill it
          */
-        if (!hasSessionId) {
+        if (!hasSessionId && payload?.args.config.sessionId) {
+            this._browser = await attach({
+                ...payload.args.config,
+                capabilities: payload?.args.capabilities
+            });
+        }
+        else if (!hasSessionId) {
+            /**
+             * don't do anything if test framework returns after SIGINT
+             * if endSession is called without payload we expect a session id
+             */
             return;
         }
         /**

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAI9D,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC,gBAAgB,CAAA;CAC9C;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CACxB,IAAI,EAAE,YAAY,CAAC,gBAAgB,EACnC,SAAS,CAAC,EAAE,OAAO,GACpB,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAoBjD;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACpC,MAAM,EAAE,mBAAmB,EAC3B,YAAY,EAAE,YAAY,CAAC,gBAAgB,EAC3C,aAAa,CAAC,EAAE,OAAO,GACxB,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,CA2CzD;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC1B,iBAAiB,EAAE,MAAM,EAAE,EAC3B,cAAc,EAAE,MAAM,EAAE,YAiB3B;AAED,KAAK,WAAW,GAAG;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,OAAO,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACtC,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC5B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,EACvD,aAAa,EAAE,OAAO,oDAgBzB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAI9D,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC,gBAAgB,CAAA;CAC9C;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CACxB,IAAI,EAAE,YAAY,CAAC,gBAAgB,EACnC,SAAS,CAAC,EAAE,OAAO,GACpB,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAoBjD;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACpC,MAAM,EAAE,mBAAmB,EAC3B,YAAY,EAAE,YAAY,CAAC,gBAAgB,EAC3C,aAAa,CAAC,EAAE,OAAO,GACxB,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAgDzD;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC1B,iBAAiB,EAAE,MAAM,EAAE,EAC3B,cAAc,EAAE,MAAM,EAAE,YAiB3B;AAED,KAAK,WAAW,GAAG;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,OAAO,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACtC,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC5B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,EACvD,aAAa,EAAE,OAAO,oDAgBzB"}

package/build/utils.js

@@ -43,7 +43,7 @@ export async function initialiseInstance(config, capabilities, isMultiremote) {
          * propagate connection details defined by services or user in capabilities
          */
         const { protocol, hostname, port, path } = capabilities;
-        return attach({ ...config, ...{ protocol, hostname, port, path } });
+        return attach({ ...config, ...{ protocol, hostname, port, path }, capabilities });
     }
     if (!isMultiremote) {
         log.debug('init remote session');
@@ -62,7 +62,11 @@ export async function initialiseInstance(config, capabilities, isMultiremote) {
         options[browserName] = deepmerge(config, capabilities[browserName]);
     }
     const browser = await multiremote(options, config);
-    for (let browserName of Object.keys(capabilities)) {
+    /**
+     * only attach to global environment if `injectGlobals` is set to true
+     */
+    const browserNames = config.injectGlobals ? Object.keys(capabilities) : [];
+    for (let browserName of browserNames) {
         // @ts-ignore allow random global browser names
         global[browserName] = browser[browserName];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/runner",
-  "version": "8.0.0-alpha.607+dac623702",
+  "version": "8.0.0-alpha.620+56a4ae1f2",
   "description": "A WebdriverIO service that runs tests in arbitrary environments",
   "author": "Christian Bromann <mail@bromann.dev>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-runner",
@@ -26,19 +26,19 @@
   "types": "./build/index.d.ts",
   "typeScriptVersion": "3.8.3",
   "dependencies": {
-    "@wdio/config": "8.0.0-alpha.607+dac623702",
-    "@wdio/globals": "8.0.0-alpha.607+dac623702",
-    "@wdio/logger": "8.0.0-alpha.607+dac623702",
-    "@wdio/types": "8.0.0-alpha.607+dac623702",
-    "@wdio/utils": "8.0.0-alpha.607+dac623702",
+    "@wdio/config": "8.0.0-alpha.620+56a4ae1f2",
+    "@wdio/globals": "8.0.0-alpha.620+56a4ae1f2",
+    "@wdio/logger": "8.0.0-alpha.620+56a4ae1f2",
+    "@wdio/types": "8.0.0-alpha.620+56a4ae1f2",
+    "@wdio/utils": "8.0.0-alpha.620+56a4ae1f2",
     "deepmerge-ts": "^4.2.2",
     "expect-webdriverio": "^4.0.0-alpha.3",
     "gaze": "^1.1.2",
-    "webdriver": "8.0.0-alpha.607+dac623702",
-    "webdriverio": "8.0.0-alpha.607+dac623702"
+    "webdriver": "8.0.0-alpha.620+56a4ae1f2",
+    "webdriverio": "8.0.0-alpha.620+56a4ae1f2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dac62370266d145eeeafbfbea7e470d65a7ab663"
+  "gitHead": "56a4ae1f236fc71721e15c077cdc35964093bbe4"
 }