@appium/driver-test-support 1.0.6 → 1.1.0

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright OpenJS Foundation and other contributors, https://openjsf.org/
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/build/lib/e2e-suite.d.ts

@@ -1,80 +1,11 @@
+import type { BaseNSCapabilities, Driver, DriverClass } from '@appium/types';
+import type { SessionHelpers } from './types';
 /**
  * Creates some helper functions for E2E tests to manage sessions.
- * @template [CommandData=unknown]
- * @template [ResponseData=any]
- * @param {number} port - Port on which the server is running. Typically this will be retrieved via `get-port` beforehand
- * @param {string} [address] - Address/host on which the server is running. Defaults to {@linkcode TEST_HOST}
- * @returns {SessionHelpers<CommandData, ResponseData>}
  */
-export function createSessionHelpers<CommandData = unknown, ResponseData = any>(port: number, address?: string): SessionHelpers<CommandData, ResponseData>;
+export declare function createSessionHelpers<CommandData = unknown, ResponseData = any>(port: number, address?: string): SessionHelpers<CommandData, ResponseData>;
 /**
  * Creates E2E test suites for a driver.
- * @param {DriverClass} DriverClass
- * @param {Partial<BaseNSCapabilities>} [defaultCaps]
  */
-export function driverE2ETestSuite(DriverClass: DriverClass, defaultCaps?: Partial<BaseNSCapabilities>): void;
-export type DriverClass = import("@appium/types").DriverClass;
-export type Driver = import("@appium/types").Driver;
-export type Constraints = import("@appium/types").Constraints;
-export type StringRecord = import("@appium/types").StringRecord;
-export type BaseDriverCapConstraints = import("@appium/types").BaseDriverCapConstraints;
-export type BaseNSCapabilities = import("@appium/types").BaseNSCapabilities;
-export type RawAxiosRequestConfig = import("axios").RawAxiosRequestConfig;
-/**
- * `Constraints` is purposefully loose here
- */
-export type SingularSessionData<C extends Constraints = import("@appium/types").Constraints> = import("@appium/types").SingularSessionData<C>;
-export type AxiosResponse<T, D> = import("axios").AxiosResponse<T, D>;
-/**
- * `Constraints` is purposefully loose here
- */
-export type NewSessionData<C extends Constraints = import("@appium/types").Constraints> = {
-    capabilities: import("type-fest").RequireAtLeastOne<import("@appium/types").W3CCapabilities<C>, "firstMatch" | "alwaysMatch">;
-};
-/**
- * `Constraints` is purposefully loose here
- */
-export type NewSessionResponse<C extends Constraints = import("@appium/types").Constraints> = {
-    /**
-     * ,
-     */
-    sessionId: string;
-    capabilities: import("@appium/types").Capabilities<C>;
-};
-/**
- * Some E2E helpers for making requests and managing sessions
- * See {@linkcode createSessionHelpers}
- */
-export type SessionHelpers<CommandData = unknown, ResponseData = any> = {
-    /**
-     * - URL to create a new session. Can be used with raw `axios` requests to fully inspect raw response.  Mostly, this will not be used.
-     */
-    newSessionURL: string;
-    /**
-     * - Begin a session
-     */
-    startSession: (data: NewSessionData, config?: RawAxiosRequestConfig) => Promise<NewSessionResponse>;
-    /**
-     * - End a session. _Note: resolves with raw response object_
-     */
-    endSession: (sessionId: string) => Promise<AxiosResponse<{
-        value: {
-            error?: string;
-        } | null;
-    }, {
-        validateStatus: null;
-    }>>;
-    /**
-     * - Get info about a session
-     */
-    getSession: (sessionId: string) => Promise<SingularSessionData>;
-    /**
-     * - Send an arbitrary command via `POST`.
-     */
-    postCommand: (sessionId: string, cmdName: string, data?: CommandData, config?: RawAxiosRequestConfig) => Promise<ResponseData>;
-    /**
-     * - Send an arbitrary command via `GET`. Optional `sessionId`.
-     */
-    getCommand: (sessionIdOrCmdName: string, cmdNameOrConfig: string | RawAxiosRequestConfig, config?: RawAxiosRequestConfig) => Promise<ResponseData>;
-};
+export declare function driverE2ETestSuite(DriverClass: DriverClass<Driver>, defaultCaps?: Partial<BaseNSCapabilities>): void;
 //# sourceMappingURL=e2e-suite.d.ts.map

package/build/lib/e2e-suite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"e2e-suite.d.ts","sourceRoot":"","sources":["../../lib/e2e-suite.js"],"names":[],"mappings":"AAQA;;;;;;;GAOG;AACH,qCANc,WAAW,YACX,YAAY,cACf,MAAM,YACN,MAAM,GACJ,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC,CAiFrD;AAED;;;;GAIG;AACH,gDAHW,WAAW,gBACX,OAAO,CAAC,kBAAkB,CAAC,QAuWrC;0BAGY,OAAO,eAAe,EAAE,WAAW;qBACnC,OAAO,eAAe,EAAE,MAAM;0BAC9B,OAAO,eAAe,EAAE,WAAW;2BACnC,OAAO,eAAe,EAAE,YAAY;uCACpC,OAAO,eAAe,EAAE,wBAAwB;iCAChD,OAAO,eAAe,EAAE,kBAAkB;oCAC1C,OAAO,OAAO,EAAE,qBAAqB;;;;gCAKtB,CAAC,SAAf,WAAY,0CACb,OAAO,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC;0BAI9C,CAAC,EAAC,CAAC,IACH,OAAO,OAAO,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC;;;;2BAKpB,CAAC,SAAf,WAAY;kBAEZ,OAAO,WAAW,EAAE,iBAAiB,CAAC,OAAO,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,YAAY,GAAC,aAAa,CAAC;;;;;+BAK/F,CAAC,SAAf,WAAY;;;;eAEZ,MAAM;kBACN,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC;;;;;;2BAMvC,WAAW,YACX,YAAY;;;;mBAEZ,MAAM;;;;kBACN,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,qBAAqB,KAAK,OAAO,CAAC,kBAAkB,CAAC;;;;gBACrF,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC;QAAC,KAAK,EAAE;YAAC,KAAK,CAAC,EAAE,MAAM,CAAA;SAAC,OAAC,CAAA;KAAC,EAAE;QAAC,cAAc,EAAE,IAAI,CAAA;KAAC,CAAC,CAAC;;;;gBACjG,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,mBAAmB,CAAC;;;;iBACnD,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,qBAAqB,KAAK,OAAO,CAAC,YAAY,CAAC;;;;gBACjH,CAAC,kBAAkB,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAC,qBAAqB,EAAE,MAAM,CAAC,EAAE,qBAAqB,KAAK,OAAO,CAAC,YAAY,CAAC"}
+{"version":3,"file":"e2e-suite.d.ts","sourceRoot":"","sources":["../../lib/e2e-suite.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,kBAAkB,EAAE,MAAM,EAAE,WAAW,EAAsB,MAAM,eAAe,CAAC;AAChG,OAAO,KAAK,EAAqB,cAAc,EAAC,MAAM,SAAS,CAAC;AAEhE;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,GAAG,OAAO,EAAE,YAAY,GAAG,GAAG,EAC5E,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,MAAkB,GAC1B,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC,CAgD3C;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,EAChC,WAAW,GAAE,OAAO,CAAC,kBAAkB,CAAM,GAC5C,IAAI,CAkVN"}

package/build/lib/e2e-suite.js

@@ -8,46 +8,25 @@ exports.driverE2ETestSuite = driverE2ETestSuite;
 const lodash_1 = __importDefault(require("lodash"));
 const driver_1 = require("appium/driver");
 const axios_1 = __importDefault(require("axios"));
-const bluebird_1 = __importDefault(require("bluebird"));
+const asyncbox_1 = require("asyncbox");
 const helpers_1 = require("./helpers");
 const sinon_1 = __importDefault(require("sinon"));
 const node_http_1 = require("node:http");
 /**
  * Creates some helper functions for E2E tests to manage sessions.
- * @template [CommandData=unknown]
- * @template [ResponseData=any]
- * @param {number} port - Port on which the server is running. Typically this will be retrieved via `get-port` beforehand
- * @param {string} [address] - Address/host on which the server is running. Defaults to {@linkcode TEST_HOST}
- * @returns {SessionHelpers<CommandData, ResponseData>}
  */
 function createSessionHelpers(port, address = helpers_1.TEST_HOST) {
-    const createAppiumTestURL = 
-    /** @type {import('lodash').CurriedFunction2<string,string,string>} */ ((0, helpers_1.createAppiumURL)(address, port));
-    const createSessionURL = createAppiumTestURL(lodash_1.default, '');
+    const createAppiumTestURL = (0, helpers_1.createAppiumURL)(address, port);
+    const createSessionURL = (sessionId) => createAppiumTestURL(sessionId, '');
     const newSessionURL = createAppiumTestURL('', 'session');
-    return /** @type {SessionHelpers<CommandData, ResponseData>} */ ({
+    return {
         newSessionURL,
         createAppiumTestURL,
-        /**
-         *
-         * @param {string} sessionId
-         * @param {string} cmdName
-         * @param {any} [data]
-         * @param {RawAxiosRequestConfig} [config]
-         * @returns {Promise<any>}
-         */
         postCommand: async (sessionId, cmdName, data = {}, config = {}) => {
             const url = createAppiumTestURL(sessionId, cmdName);
             const response = await axios_1.default.post(url, data, config);
             return response.data?.value;
         },
-        /**
-         *
-         * @param {string} sessionIdOrCmdName
-         * @param {string|RawAxiosRequestConfig} cmdNameOrConfig
-         * @param {RawAxiosRequestConfig} [config]
-         * @returns {Promise<any>}
-         */
         getCommand: async (sessionIdOrCmdName, cmdNameOrConfig, config = {}) => {
             if (!lodash_1.default.isString(cmdNameOrConfig)) {
                 config = cmdNameOrConfig;
@@ -61,11 +40,6 @@ function createSessionHelpers(port, address = helpers_1.TEST_HOST) {
             });
             return response.data?.value;
         },
-        /**
-         *
-         * @param {NewSessionData} data
-         * @param {RawAxiosRequestConfig} [config]
-         */
         startSession: async (data, config = {}) => {
             data = lodash_1.default.defaultsDeep(data, {
                 capabilities: {
@@ -76,17 +50,9 @@ function createSessionHelpers(port, address = helpers_1.TEST_HOST) {
             const response = await axios_1.default.post(newSessionURL, data, config);
             return response.data?.value;
         },
-        /**
-         *
-         * @param {string} sessionId
-         */
         endSession: async (sessionId) => await axios_1.default.delete(createSessionURL(sessionId), {
             validateStatus: null,
         }),
-        /**
-         * @param {string} sessionId
-         * @returns {Promise<any>}
-         */
         getSession: async (sessionId) => {
             const response = await (0, axios_1.default)({
                 url: createSessionURL(sessionId),
@@ -94,35 +60,23 @@ function createSessionHelpers(port, address = helpers_1.TEST_HOST) {
             });
             return response.data?.value;
         },
-    });
+    };
 }
 /**
  * Creates E2E test suites for a driver.
- * @param {DriverClass} DriverClass
- * @param {Partial<BaseNSCapabilities>} [defaultCaps]
  */
 function driverE2ETestSuite(DriverClass, defaultCaps = {}) {
-    let address = defaultCaps['appium:address'] ?? helpers_1.TEST_HOST;
+    const address = defaultCaps['appium:address'] ?? helpers_1.TEST_HOST;
     let port = defaultCaps['appium:port'];
     const className = DriverClass.name || '(unknown driver)';
     describe(`BaseDriver E2E (as ${className})`, function () {
         let baseServer;
-        /** @type {Driver} */
         let d;
-        /**
-         * This URL creates a new session
-         * @type {string}
-         **/
         let newSessionURL;
-        /** @type {SessionHelpers['startSession']} */
         let startSession;
-        /** @type {SessionHelpers['getSession']} */
         let getSession;
-        /** @type {SessionHelpers['endSession']} */
         let endSession;
-        /** @type {SessionHelpers['getCommand']} */
         let getCommand;
-        /** @type {SessionHelpers['postCommand']} */
         let postCommand;
         let expect;
         before(async function () {
@@ -135,13 +89,17 @@ function driverE2ETestSuite(DriverClass, defaultCaps = {}) {
             d = new DriverClass({ port, address });
             baseServer = await (0, driver_1.server)({
                 routeConfiguringFunction: (0, driver_1.routeConfiguringFunction)(d),
-                port,
+                port: port,
                 hostname: address,
-                // @ts-expect-error
                 cliArgs: {},
             });
-            ({ startSession, getSession, endSession, newSessionURL, getCommand, postCommand } =
-                createSessionHelpers(port, address));
+            const helpers = createSessionHelpers(port, address);
+            startSession = helpers.startSession;
+            getSession = helpers.getSession;
+            endSession = helpers.endSession;
+            getCommand = helpers.getCommand;
+            postCommand = helpers.postCommand;
+            newSessionURL = helpers.newSessionURL;
         });
         after(async function () {
             await baseServer?.close();
@@ -195,7 +153,7 @@ function driverE2ETestSuite(DriverClass, defaultCaps = {}) {
                     }));
                     times++;
                 } while (times < 2);
-                const sessionIds = lodash_1.default.map(await bluebird_1.default.all(reqs), 'sessionId');
+                const sessionIds = lodash_1.default.map(await Promise.all(reqs), 'sessionId');
                 expect(lodash_1.default.uniq(sessionIds)).to.have.lengthOf(1);
                 const { status, data } = await endSession(sessionIds[0]);
                 expect(status).to.equal(200);
@@ -211,17 +169,15 @@ function driverE2ETestSuite(DriverClass, defaultCaps = {}) {
                 expect(data.value.sessionId).to.exist;
                 expect(data.value.capabilities.platformName).to.equal(defaultCaps.platformName);
                 expect(data.value.capabilities.deviceName).to.equal(defaultCaps['appium:deviceName']);
-                ({ status, data } = await endSession(/** @type {string} */ (d.sessionId)));
+                ({ status, data } = await endSession(d.sessionId));
                 expect(status).to.equal(200);
                 expect(data.value).to.be.null;
                 expect(d.sessionId).to.be.null;
             });
         });
         describe('command timeouts', function () {
-            let originalFindElement, originalFindElements;
-            /**
-             * @param {number} [timeout]
-             */
+            let originalFindElement;
+            let originalFindElements;
             async function startTimeoutSession(timeout) {
                 const caps = lodash_1.default.cloneDeep(defaultCaps);
                 caps['appium:newCommandTimeout'] = timeout;
@@ -234,7 +190,7 @@ function driverE2ETestSuite(DriverClass, defaultCaps = {}) {
                 }.bind(d);
                 originalFindElements = d.findElements;
                 d.findElements = async function () {
-                    await bluebird_1.default.delay(200);
+                    await (0, asyncbox_1.sleep)(200);
                     return ['foo'];
                 }.bind(d);
             });
@@ -243,18 +199,18 @@ function driverE2ETestSuite(DriverClass, defaultCaps = {}) {
                 d.findElements = originalFindElements;
             });
             it('should set a default commandTimeout', async function () {
-                let newSession = await startTimeoutSession();
+                const newSession = await startTimeoutSession();
                 expect(d.newCommandTimeoutMs).to.be.above(0);
                 await endSession(newSession.sessionId);
             });
             it('should timeout on commands using commandTimeout cap', async function () {
-                let newSession = await startTimeoutSession(0.25);
-                const sessionId = /** @type {string} */ (d.sessionId);
+                const newSession = await startTimeoutSession(0.25);
+                const sessionId = d.sessionId;
                 await postCommand(sessionId, 'element', {
                     using: 'name',
                     value: 'foo',
                 });
-                await bluebird_1.default.delay(400);
+                await (0, asyncbox_1.sleep)(400);
                 const value = await getSession(sessionId);
                 expect(value.error).to.equal('invalid session id');
                 expect(d.sessionId).to.be.null;
@@ -262,9 +218,9 @@ function driverE2ETestSuite(DriverClass, defaultCaps = {}) {
                 expect(resp?.error).to.equal('invalid session id');
             });
             it('should not timeout with commandTimeout of false', async function () {
-                let newSession = await startTimeoutSession(0.1);
-                let start = Date.now();
-                const value = await postCommand(/** @type {string} */ (d.sessionId), 'elements', {
+                const newSession = await startTimeoutSession(0.1);
+                const start = Date.now();
+                const value = await postCommand(d.sessionId, 'elements', {
                     using: 'name',
                     value: 'foo',
                 });
@@ -274,43 +230,38 @@ function driverE2ETestSuite(DriverClass, defaultCaps = {}) {
             });
             it('should not timeout with commandTimeout of 0', async function () {
                 d.newCommandTimeoutMs = 2;
-                let newSession = await startTimeoutSession(0);
-                await postCommand(/** @type {string} */ (d.sessionId), 'element', {
+                const newSession = await startTimeoutSession(0);
+                await postCommand(d.sessionId, 'element', {
                     using: 'name',
                     value: 'foo',
                 });
-                await bluebird_1.default.delay(400);
-                const value = await getSession(/** @type {string} */ (d.sessionId));
+                await (0, asyncbox_1.sleep)(400);
+                const value = await getSession(d.sessionId);
                 expect(value.platformName).to.equal(defaultCaps.platformName);
                 const resp = (await endSession(newSession.sessionId)).data.value;
                 expect(resp).to.be.null;
                 d.newCommandTimeoutMs = 60 * 1000;
             });
             it('should not timeout if its just the command taking awhile', async function () {
-                let newSession = await startTimeoutSession(0.25);
-                // XXX: race condition: we must build this URL before ...something happens...
-                // which causes `d.sessionId` to be missing
+                const newSession = await startTimeoutSession(0.25);
                 const { sessionId } = d;
-                await postCommand(/** @type {string} */ (d.sessionId), 'element', {
+                await postCommand(d.sessionId, 'element', {
                     using: 'name',
                     value: 'foo',
                 });
-                await bluebird_1.default.delay(400);
-                const value = await getSession(/** @type {string} */ (sessionId));
-                expect(/** @type {string} */ (value.error)).to.equal('invalid session id');
+                await (0, asyncbox_1.sleep)(400);
+                const value = await getSession(sessionId);
+                expect(value.error).to.equal('invalid session id');
                 expect(d.sessionId).to.be.null;
                 const resp = (await endSession(newSession.sessionId)).data.value;
-                expect(/** @type {string} */ ( /** @type { {error: string} } */(resp).error)).to.equal('invalid session id');
+                expect(resp?.error).to.equal('invalid session id');
             });
             it('should not have a timer running before or after a session', async function () {
-                // @ts-expect-error
                 expect(d.noCommandTimer).to.be.null;
-                let newSession = await startTimeoutSession(0.25);
+                const newSession = await startTimeoutSession(0.25);
                 expect(newSession.sessionId).to.equal(d.sessionId);
-                // @ts-expect-error
                 expect(d.noCommandTimer).to.exist;
                 await endSession(newSession.sessionId);
-                // @ts-expect-error
                 expect(d.noCommandTimer).to.be.null;
             });
         });
@@ -325,13 +276,10 @@ function driverE2ETestSuite(DriverClass, defaultCaps = {}) {
                 await expect(d.settings.update({ ignoreUnimportantViews: true })).to.not.be.rejected;
             });
             it('should reject for invalid update object', async function () {
-                await expect(
-                // @ts-expect-error
-                d.settings.update('invalid json')).to.be.rejectedWith('JSON');
+                await expect(d.settings.update('invalid json')).to.be.rejectedWith('JSON');
             });
         });
         describe('unexpected exits', function () {
-            /** @type {import('sinon').SinonSandbox} */
             let sandbox;
             beforeEach(function () {
                 sandbox = sinon_1.default.createSandbox();
@@ -341,12 +289,11 @@ function driverE2ETestSuite(DriverClass, defaultCaps = {}) {
             });
             it('should reject a current command when the driver crashes', async function () {
                 sandbox.stub(d, 'getStatus').callsFake(async function () {
-                    await bluebird_1.default.delay(5000);
+                    await (0, asyncbox_1.sleep)(5000);
                 });
                 const reqPromise = getCommand('status', { validateStatus: null });
-                // make sure that the request gets to the server before our shutdown
-                await bluebird_1.default.delay(100);
-                const shutdownEventPromise = new bluebird_1.default((resolve, reject) => {
+                await (0, asyncbox_1.sleep)(100);
+                const shutdownEventPromise = new Promise((resolve, reject) => {
                     setTimeout(() => reject(new Error('onUnexpectedShutdown event is expected to be fired within 5 seconds timeout')), 5000);
                     d.onUnexpectedShutdown(resolve);
                 });
@@ -357,9 +304,7 @@ function driverE2ETestSuite(DriverClass, defaultCaps = {}) {
             });
         });
         describe('event timings', function () {
-            /** @type {NewSessionResponse} */
             let session;
-            /** @type {SingularSessionData} */
             let res;
             describe('when not provided the eventTimings cap', function () {
                 before(async function () {
@@ -397,48 +342,4 @@ function driverE2ETestSuite(DriverClass, defaultCaps = {}) {
         });
     });
 }
-/**
- * @typedef {import('@appium/types').DriverClass} DriverClass
- * @typedef {import('@appium/types').Driver} Driver
- * @typedef {import('@appium/types').Constraints} Constraints
- * @typedef {import('@appium/types').StringRecord} StringRecord
- * @typedef {import('@appium/types').BaseDriverCapConstraints} BaseDriverCapConstraints
- * @typedef {import('@appium/types').BaseNSCapabilities} BaseNSCapabilities
- * @typedef {import('axios').RawAxiosRequestConfig} RawAxiosRequestConfig
- */
-/**
- * `Constraints` is purposefully loose here
- * @template {Constraints} [C=Constraints]
- * @typedef {import('@appium/types').SingularSessionData<C>} SingularSessionData
- */
-/**
- * @template T,D
- * @typedef {import('axios').AxiosResponse<T, D>} AxiosResponse
- */
-/**
- * `Constraints` is purposefully loose here
- * @template {Constraints} [C=Constraints]
- * @typedef NewSessionData
- * @property {import('type-fest').RequireAtLeastOne<import('@appium/types').W3CCapabilities<C>, 'firstMatch'|'alwaysMatch'>} capabilities
- */
-/**
- * `Constraints` is purposefully loose here
- * @template {Constraints} [C=Constraints]
- * @typedef NewSessionResponse
- * @property {string} sessionId,
- * @property {import('@appium/types').Capabilities<C>} capabilities
- */
-/**
- * Some E2E helpers for making requests and managing sessions
- * See {@linkcode createSessionHelpers}
- * @template [CommandData=unknown]
- * @template [ResponseData=any]
- * @typedef SessionHelpers
- * @property {string} newSessionURL - URL to create a new session. Can be used with raw `axios` requests to fully inspect raw response.  Mostly, this will not be used.
- * @property {(data: NewSessionData, config?: RawAxiosRequestConfig) => Promise<NewSessionResponse>} startSession - Begin a session
- * @property {(sessionId: string) => Promise<AxiosResponse<{value: {error?: string}?}, {validateStatus: null}>>} endSession - End a session. _Note: resolves with raw response object_
- * @property {(sessionId: string) => Promise<SingularSessionData>} getSession - Get info about a session
- * @property {(sessionId: string, cmdName: string, data?: CommandData, config?: RawAxiosRequestConfig) => Promise<ResponseData>} postCommand - Send an arbitrary command via `POST`.
- * @property {(sessionIdOrCmdName: string, cmdNameOrConfig: string|RawAxiosRequestConfig, config?: RawAxiosRequestConfig) => Promise<ResponseData>} getCommand - Send an arbitrary command via `GET`. Optional `sessionId`.
- */
 //# sourceMappingURL=e2e-suite.js.map