@appium/images-plugin 1.2.3 → 1.2.4

package/build/lib/image-element.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -127,87 +118,85 @@ class ImageElement {
      *
      * @param {BaseDriver} driver - driver for calling actions with
      */
-    click(driver) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // before we click we need to make sure the element is actually still there
-            // where we expect it to be
-            let newImgEl;
-            const settings = Object.assign({}, finder_1.DEFAULT_SETTINGS, driver.settings.getSettings());
-            const { autoUpdateImageElementPosition: updatePos, checkForImageElementStaleness, imageElementTapStrategy, } = settings;
-            // validate tap strategy
-            if (!IMAGE_TAP_STRATEGIES.includes(imageElementTapStrategy)) {
-                throw new Error(`Incorrect imageElementTapStrategy setting ` +
-                    `'${imageElementTapStrategy}'. Must be one of ` +
-                    JSON.stringify(IMAGE_TAP_STRATEGIES));
+    async click(driver) {
+        // before we click we need to make sure the element is actually still there
+        // where we expect it to be
+        let newImgEl;
+        const settings = Object.assign({}, finder_1.DEFAULT_SETTINGS, driver.settings.getSettings());
+        const { autoUpdateImageElementPosition: updatePos, checkForImageElementStaleness, imageElementTapStrategy, } = settings;
+        // validate tap strategy
+        if (!IMAGE_TAP_STRATEGIES.includes(imageElementTapStrategy)) {
+            throw new Error(`Incorrect imageElementTapStrategy setting ` +
+                `'${imageElementTapStrategy}'. Must be one of ` +
+                JSON.stringify(IMAGE_TAP_STRATEGIES));
+        }
+        if (checkForImageElementStaleness || updatePos) {
+            logger_1.default.info('Checking image element for staleness before clicking');
+            try {
+                newImgEl = await this.finder.findByImage(this.template, {
+                    shouldCheckStaleness: true,
+                    // Set ignoreDefaultImageTemplateScale because this.template is device screenshot based image
+                    // managed inside Appium after finidng image by template which managed by a user
+                    ignoreDefaultImageTemplateScale: true
+                });
             }
-            if (checkForImageElementStaleness || updatePos) {
-                logger_1.default.info('Checking image element for staleness before clicking');
-                try {
-                    newImgEl = yield this.finder.findByImage(this.template, {
-                        shouldCheckStaleness: true,
-                        // Set ignoreDefaultImageTemplateScale because this.template is device screenshot based image
-                        // managed inside Appium after finidng image by template which managed by a user
-                        ignoreDefaultImageTemplateScale: true
-                    });
-                }
-                catch (err) {
-                    throw new base_driver_1.errors.StaleElementReferenceError();
-                }
-                if (!this.equals(newImgEl)) {
-                    logger_1.default.warn(`When trying to click on an image element, the image changed ` +
-                        `position from where it was originally found. It is now at ` +
-                        `${JSON.stringify(newImgEl.rect)} and was originally at ` +
-                        `${JSON.stringify(this.rect)}.`);
-                    if (updatePos) {
-                        logger_1.default.warn('Click will proceed at new coordinates');
-                        this.rect = lodash_1.default.clone(newImgEl.rect);
-                    }
-                    else {
-                        logger_1.default.warn('Click will take place at original coordinates. If you ' +
-                            'would like Appium to automatically click the new ' +
-                            "coordinates, set the 'autoUpdateImageElementPosition' " +
-                            'setting to true');
-                    }
-                }
+            catch (err) {
+                throw new base_driver_1.errors.StaleElementReferenceError();
             }
-            const { x, y } = this.center;
-            logger_1.default.info(`Will tap on image element at coordinate [${x}, ${y}]`);
-            if (imageElementTapStrategy === IMAGE_EL_TAP_STRATEGY_W3C) {
-                // set up a W3C action to click on the image by position
-                logger_1.default.info('Will tap using W3C actions');
-                const action = {
-                    type: 'pointer',
-                    id: 'mouse',
-                    parameters: { pointerType: 'touch' },
-                    actions: [
-                        { type: 'pointerMove', x, y, duration: 0 },
-                        { type: 'pointerDown', button: 0 },
-                        { type: 'pause', duration: TAP_DURATION_MS },
-                        { type: 'pointerUp', button: 0 },
-                    ]
-                };
-                // check if the driver has the appropriate performActions method
-                if (driver.performActions) {
-                    return yield driver.performActions([action]);
+            if (!this.equals(newImgEl)) {
+                logger_1.default.warn(`When trying to click on an image element, the image changed ` +
+                    `position from where it was originally found. It is now at ` +
+                    `${JSON.stringify(newImgEl.rect)} and was originally at ` +
+                    `${JSON.stringify(this.rect)}.`);
+                if (updatePos) {
+                    logger_1.default.warn('Click will proceed at new coordinates');
+                    this.rect = lodash_1.default.clone(newImgEl.rect);
+                }
+                else {
+                    logger_1.default.warn('Click will take place at original coordinates. If you ' +
+                        'would like Appium to automatically click the new ' +
+                        "coordinates, set the 'autoUpdateImageElementPosition' " +
+                        'setting to true');
                 }
-                // if not, warn and fall back to the other method
-                logger_1.default.warn('Driver does not seem to implement W3C actions, falling back ' +
-                    'to TouchActions');
             }
-            // if the w3c strategy was not requested, do the only other option (mjsonwp
-            // touch actions)
-            logger_1.default.info('Will tap using MJSONWP TouchActions');
+        }
+        const { x, y } = this.center;
+        logger_1.default.info(`Will tap on image element at coordinate [${x}, ${y}]`);
+        if (imageElementTapStrategy === IMAGE_EL_TAP_STRATEGY_W3C) {
+            // set up a W3C action to click on the image by position
+            logger_1.default.info('Will tap using W3C actions');
             const action = {
-                action: 'tap',
-                options: { x, y }
+                type: 'pointer',
+                id: 'mouse',
+                parameters: { pointerType: 'touch' },
+                actions: [
+                    { type: 'pointerMove', x, y, duration: 0 },
+                    { type: 'pointerDown', button: 0 },
+                    { type: 'pause', duration: TAP_DURATION_MS },
+                    { type: 'pointerUp', button: 0 },
+                ]
             };
-            if (driver.performTouch) {
-                return yield driver.performTouch([action]);
+            // check if the driver has the appropriate performActions method
+            if (driver.performActions) {
+                return await driver.performActions([action]);
             }
-            throw new Error("Driver did not implement the 'performTouch' command. " +
-                'For drivers to support finding image elements, they ' +
-                "should support 'performTouch' and 'performActions'");
-        });
+            // if not, warn and fall back to the other method
+            logger_1.default.warn('Driver does not seem to implement W3C actions, falling back ' +
+                'to TouchActions');
+        }
+        // if the w3c strategy was not requested, do the only other option (mjsonwp
+        // touch actions)
+        logger_1.default.info('Will tap using MJSONWP TouchActions');
+        const action = {
+            action: 'tap',
+            options: { x, y }
+        };
+        if (driver.performTouch) {
+            return await driver.performTouch([action]);
+        }
+        throw new Error("Driver did not implement the 'performTouch' command. " +
+            'For drivers to support finding image elements, they ' +
+            "should support 'performTouch' and 'performActions'");
     }
     /**
      * Handle various Appium commands that involve an image element
@@ -219,37 +208,35 @@ class ImageElement {
      *
      * @returns {Object} - the result of running a command
      */
-    static execute(driver, imgEl, cmd, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            switch (cmd) {
-                case 'click':
-                    return yield imgEl.click(driver);
-                case 'elementDisplayed':
-                    return true;
-                case 'getSize':
-                    return imgEl.size;
-                case 'getLocation':
-                case 'getLocationInView':
-                    return imgEl.location;
-                case 'getElementRect':
-                    return imgEl.rect;
-                case 'getAttribute':
-                    // /session/:sessionId/element/:elementId/attribute/:name
-                    // /session/:sessionId/element/:elementId/attribute/visual should retun the visual data
-                    // e.g. ["content-desc","appium-image-element-xxxxx","xxxxx"], ["visual","appium-image-element-xxxxx","xxxxx"]
-                    switch (args[0]) {
-                        case 'visual':
-                            return imgEl.matchedImage;
-                        case 'score':
-                            return imgEl.score;
-                        default:
-                            throw new base_driver_1.errors.NotYetImplementedError();
-                    }
-                default: throw new base_driver_1.errors.NotYetImplementedError();
-            }
-        });
+    static async execute(driver, imgEl, cmd, ...args) {
+        switch (cmd) {
+            case 'click':
+                return await imgEl.click(driver);
+            case 'elementDisplayed':
+                return true;
+            case 'getSize':
+                return imgEl.size;
+            case 'getLocation':
+            case 'getLocationInView':
+                return imgEl.location;
+            case 'getElementRect':
+                return imgEl.rect;
+            case 'getAttribute':
+                // /session/:sessionId/element/:elementId/attribute/:name
+                // /session/:sessionId/element/:elementId/attribute/visual should retun the visual data
+                // e.g. ["content-desc","appium-image-element-xxxxx","xxxxx"], ["visual","appium-image-element-xxxxx","xxxxx"]
+                switch (args[0]) {
+                    case 'visual':
+                        return imgEl.matchedImage;
+                    case 'score':
+                        return imgEl.score;
+                    default:
+                        throw new base_driver_1.errors.NotYetImplementedError();
+                }
+            default: throw new base_driver_1.errors.NotYetImplementedError();
+        }
     }
 }
 exports.default = ImageElement;
 exports.ImageElement = ImageElement;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1hZ2UtZWxlbWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9pbWFnZS1lbGVtZW50LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG9EQUF1QjtBQUN2QixxREFBNkM7QUFDN0Msc0RBQTJCO0FBQzNCLDZDQUF1QztBQUN2QyxxQ0FBNEM7QUFFNUMsTUFBTSxvQkFBb0IsR0FBRyx1QkFBdUIsQ0FBQztBQTRQckIsb0RBQW9CO0FBM1BwRCxNQUFNLGVBQWUsR0FBRyxHQUFHLENBQUM7QUFDNUIsTUFBTSx5QkFBeUIsR0FBRyxZQUFZLENBQUM7QUF5UEEsOERBQXlCO0FBeFB4RSxNQUFNLDZCQUE2QixHQUFHLGNBQWMsQ0FBQztBQXdQckMsc0VBQTZCO0FBdlA3QyxNQUFNLG9CQUFvQixHQUFHO0lBQzNCLDZCQUE2QjtJQUM3Qix5QkFBeUI7Q0FDMUIsQ0FBQztBQUNGLE1BQU0sNEJBQTRCLEdBQUcsR0FBRyxDQUFDO0FBb1B2QyxvRUFBNEI7QUFsUDlCOzs7Ozs7R0FNRztBQUVIOzs7O0dBSUc7QUFFSDs7OztHQUlHO0FBRUg7OztHQUdHO0FBQ0gsTUFBcUIsWUFBWTtJQUUvQjs7Ozs7Ozs7Ozs7T0FXRztJQUNILFlBQWEsV0FBVyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsU0FBUyxHQUFHLElBQUksRUFBRSxNQUFNLEdBQUcsSUFBSTtRQUNwRSxJQUFJLENBQUMsUUFBUSxHQUFHLFdBQVcsQ0FBQztRQUM1QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsRUFBRSxHQUFHLEdBQUcsb0JBQW9CLEdBQUcsY0FBSSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUM7UUFDcEQsSUFBSSxDQUFDLGVBQWUsR0FBRyxTQUFTLENBQUM7UUFDakMsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7UUFDbkIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDdkIsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBSSxJQUFJO1FBQ04sT0FBTyxFQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUMsQ0FBQztJQUM1RCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxJQUFJLFFBQVE7UUFDVixPQUFPLEVBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBQyxDQUFDO0lBQzFDLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksTUFBTTtRQUNSLE9BQU87WUFDTCxDQUFDLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLEdBQUcsQ0FBQztZQUNwQyxDQUFDLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQztTQUN0QyxDQUFDO0lBQ0osQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBSSxZQUFZO1FBQ2QsT0FBTyxJQUFJLENBQUMsZUFBZSxDQUFDO0lBQzlCLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNILFNBQVMsQ0FBRSxXQUFXO1FBQ3BCLE9BQU8sRUFBQyxDQUFDLFdBQVcsQ0FBQyxFQUFFLElBQUksQ0FBQyxFQUFFLEVBQUMsQ0FBQztJQUNsQyxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSCxNQUFNLENBQUUsS0FBSztRQUNYLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLEtBQUssS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzVCLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUM1QixJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssS0FBSyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUs7WUFDcEMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEtBQUssS0FBSyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDaEQsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0csS0FBSyxDQUFFLE1BQU07O1lBQ2pCLDJFQUEyRTtZQUMzRSwyQkFBMkI7WUFDM0IsSUFBSSxRQUFRLENBQUM7WUFDYixNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSx5QkFBZ0IsRUFBRSxNQUFNLENBQUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUM7WUFDcEYsTUFBTSxFQUNKLDhCQUE4QixFQUFFLFNBQVMsRUFDekMsNkJBQTZCLEVBQzdCLHVCQUF1QixHQUN4QixHQUFHLFFBQVEsQ0FBQztZQUViLHdCQUF3QjtZQUN4QixJQUFJLENBQUMsb0JBQW9CLENBQUMsUUFBUSxDQUFDLHVCQUF1QixDQUFDLEVBQUU7Z0JBQzNELE1BQU0sSUFBSSxLQUFLLENBQUMsNENBQTRDO29CQUM1QyxJQUFJLHVCQUF1QixvQkFBb0I7b0JBQy9DLElBQUksQ0FBQyxTQUFTLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxDQUFDO2FBQ3ZEO1lBRUQsSUFBSSw2QkFBNkIsSUFBSSxTQUFTLEVBQUU7Z0JBQzlDLGdCQUFHLENBQUMsSUFBSSxDQUFDLHNEQUFzRCxDQUFDLENBQUM7Z0JBQ2pFLElBQUk7b0JBQ0YsUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRTt3QkFDdEQsb0JBQW9CLEVBQUUsSUFBSTt3QkFDMUIsNkZBQTZGO3dCQUM3RixnRkFBZ0Y7d0JBQ2hGLCtCQUErQixFQUFFLElBQUk7cUJBQ3RDLENBQUMsQ0FBQztpQkFDSjtnQkFBQyxPQUFPLEdBQUcsRUFBRTtvQkFDWixNQUFNLElBQUksb0JBQU0sQ0FBQywwQkFBMEIsRUFBRSxDQUFDO2lCQUMvQztnQkFFRCxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsRUFBRTtvQkFDMUIsZ0JBQUcsQ0FBQyxJQUFJLENBQUMsOERBQThEO3dCQUM5RCw0REFBNEQ7d0JBQzVELEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLHlCQUF5Qjt3QkFDekQsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7b0JBQzFDLElBQUksU0FBUyxFQUFFO3dCQUNiLGdCQUFHLENBQUMsSUFBSSxDQUFDLHVDQUF1QyxDQUFDLENBQUM7d0JBQ2xELElBQUksQ0FBQyxJQUFJLEdBQUcsZ0JBQUMsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO3FCQUNwQzt5QkFBTTt3QkFDTCxnQkFBRyxDQUFDLElBQUksQ0FBQyx3REFBd0Q7NEJBQ3hELG1EQUFtRDs0QkFDbkQsd0RBQXdEOzRCQUN4RCxpQkFBaUIsQ0FBQyxDQUFDO3FCQUM3QjtpQkFDRjthQUNGO1lBRUQsTUFBTSxFQUFDLENBQUMsRUFBRSxDQUFDLEVBQUMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDO1lBQzNCLGdCQUFHLENBQUMsSUFBSSxDQUFDLDRDQUE0QyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUVqRSxJQUFJLHVCQUF1QixLQUFLLHlCQUF5QixFQUFFO2dCQUN6RCx3REFBd0Q7Z0JBQ3hELGdCQUFHLENBQUMsSUFBSSxDQUFDLDRCQUE0QixDQUFDLENBQUM7Z0JBQ3ZDLE1BQU0sTUFBTSxHQUFHO29CQUNiLElBQUksRUFBRSxTQUFTO29CQUNmLEVBQUUsRUFBRSxPQUFPO29CQUNYLFVBQVUsRUFBRSxFQUFDLFdBQVcsRUFBRSxPQUFPLEVBQUM7b0JBQ2xDLE9BQU8sRUFBRTt3QkFDUCxFQUFDLElBQUksRUFBRSxhQUFhLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxRQUFRLEVBQUUsQ0FBQyxFQUFDO3dCQUN4QyxFQUFDLElBQUksRUFBRSxhQUFhLEVBQUUsTUFBTSxFQUFFLENBQUMsRUFBQzt3QkFDaEMsRUFBQyxJQUFJLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxlQUFlLEVBQUM7d0JBQzFDLEVBQUMsSUFBSSxFQUFFLFdBQVcsRUFBRSxNQUFNLEVBQUUsQ0FBQyxFQUFDO3FCQUMvQjtpQkFDRixDQUFDO2dCQUVGLGdFQUFnRTtnQkFDaEUsSUFBSSxNQUFNLENBQUMsY0FBYyxFQUFFO29CQUN6QixPQUFPLE1BQU0sTUFBTSxDQUFDLGNBQWMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7aUJBQzlDO2dCQUVELGlEQUFpRDtnQkFDakQsZ0JBQUcsQ0FBQyxJQUFJLENBQUMsOERBQThEO29CQUM5RCxpQkFBaUIsQ0FBQyxDQUFDO2FBQzdCO1lBRUQsMkVBQTJFO1lBQzNFLGlCQUFpQjtZQUNqQixnQkFBRyxDQUFDLElBQUksQ0FBQyxxQ0FBcUMsQ0FBQyxDQUFDO1lBQ2hELE1BQU0sTUFBTSxHQUFHO2dCQUNiLE1BQU0sRUFBRSxLQUFLO2dCQUNiLE9BQU8sRUFBRSxFQUFDLENBQUMsRUFBRSxDQUFDLEVBQUM7YUFDaEIsQ0FBQztZQUVGLElBQUksTUFBTSxDQUFDLFlBQVksRUFBRTtnQkFDdkIsT0FBTyxNQUFNLE1BQU0sQ0FBQyxZQUFZLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO2FBQzVDO1lBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyx1REFBdUQ7Z0JBQ3ZELHNEQUFzRDtnQkFDdEQsb0RBQW9ELENBQUMsQ0FBQztRQUN4RSxDQUFDO0tBQUE7SUFFRDs7Ozs7Ozs7O09BU0c7SUFDSCxNQUFNLENBQU8sT0FBTyxDQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUcsSUFBSTs7WUFDL0MsUUFBUSxHQUFHLEVBQUU7Z0JBQ1gsS0FBSyxPQUFPO29CQUNWLE9BQU8sTUFBTSxLQUFLLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDO2dCQUNuQyxLQUFLLGtCQUFrQjtvQkFDckIsT0FBTyxJQUFJLENBQUM7Z0JBQ2QsS0FBSyxTQUFTO29CQUNaLE9BQU8sS0FBSyxDQUFDLElBQUksQ0FBQztnQkFDcEIsS0FBSyxhQUFhLENBQUM7Z0JBQ25CLEtBQUssbUJBQW1CO29CQUN0QixPQUFPLEtBQUssQ0FBQyxRQUFRLENBQUM7Z0JBQ3hCLEtBQUssZ0JBQWdCO29CQUNuQixPQUFPLEtBQUssQ0FBQyxJQUFJLENBQUM7Z0JBQ3BCLEtBQUssY0FBYztvQkFDakIseURBQXlEO29CQUN6RCx1RkFBdUY7b0JBQ3ZGLDhHQUE4RztvQkFDOUcsUUFBUSxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUU7d0JBQ2YsS0FBSyxRQUFROzRCQUNYLE9BQU8sS0FBSyxDQUFDLFlBQVksQ0FBQzt3QkFDNUIsS0FBSyxPQUFPOzRCQUNWLE9BQU8sS0FBSyxDQUFDLEtBQUssQ0FBQzt3QkFDckI7NEJBQ0UsTUFBTSxJQUFJLG9CQUFNLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztxQkFDN0M7Z0JBQ0gsT0FBTyxDQUFDLENBQUMsTUFBTSxJQUFJLG9CQUFNLENBQUMsc0JBQXNCLEVBQUUsQ0FBQzthQUNwRDtRQUNILENBQUM7S0FBQTtDQUNGO0FBdE5ELCtCQXNOQztBQUdDLG9DQUFZIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1hZ2UtZWxlbWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9pbWFnZS1lbGVtZW50LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLG9EQUF1QjtBQUN2QixxREFBNkM7QUFDN0Msc0RBQTJCO0FBQzNCLDZDQUF1QztBQUN2QyxxQ0FBNEM7QUFFNUMsTUFBTSxvQkFBb0IsR0FBRyx1QkFBdUIsQ0FBQztBQTRQckIsb0RBQW9CO0FBM1BwRCxNQUFNLGVBQWUsR0FBRyxHQUFHLENBQUM7QUFDNUIsTUFBTSx5QkFBeUIsR0FBRyxZQUFZLENBQUM7QUF5UEEsOERBQXlCO0FBeFB4RSxNQUFNLDZCQUE2QixHQUFHLGNBQWMsQ0FBQztBQXdQckMsc0VBQTZCO0FBdlA3QyxNQUFNLG9CQUFvQixHQUFHO0lBQzNCLDZCQUE2QjtJQUM3Qix5QkFBeUI7Q0FDMUIsQ0FBQztBQUNGLE1BQU0sNEJBQTRCLEdBQUcsR0FBRyxDQUFDO0FBb1B2QyxvRUFBNEI7QUFsUDlCOzs7Ozs7R0FNRztBQUVIOzs7O0dBSUc7QUFFSDs7OztHQUlHO0FBRUg7OztHQUdHO0FBQ0gsTUFBcUIsWUFBWTtJQUUvQjs7Ozs7Ozs7Ozs7T0FXRztJQUNILFlBQWEsV0FBVyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsU0FBUyxHQUFHLElBQUksRUFBRSxNQUFNLEdBQUcsSUFBSTtRQUNwRSxJQUFJLENBQUMsUUFBUSxHQUFHLFdBQVcsQ0FBQztRQUM1QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsRUFBRSxHQUFHLEdBQUcsb0JBQW9CLEdBQUcsY0FBSSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUM7UUFDcEQsSUFBSSxDQUFDLGVBQWUsR0FBRyxTQUFTLENBQUM7UUFDakMsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7UUFDbkIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDdkIsQ0FB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

package/build/lib/plugin.js

@@ -1,14 +1,5 @@
 "use strict";
 /* eslint-disable no-case-declarations */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -35,47 +26,37 @@ class ImageElementPlugin extends base_plugin_1.default {
         super(pluginName);
         this.finder = new finder_1.default();
     }
-    compareImages(next, driver, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, compare_1.compareImages)(...args);
-        });
+    async compareImages(next, driver, ...args) {
+        return await (0, compare_1.compareImages)(...args);
     }
-    findElement(next, driver, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this._find(false, next, driver, ...args);
-        });
+    async findElement(next, driver, ...args) {
+        return await this._find(false, next, driver, ...args);
     }
-    findElements(next, driver, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this._find(true, next, driver, ...args);
-        });
+    async findElements(next, driver, ...args) {
+        return await this._find(true, next, driver, ...args);
     }
-    _find(multiple, next, driver, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [strategy, selector] = args;
-            // if we're not actually finding by image, just do the normal thing
-            if (strategy !== IMAGE_STRATEGY) {
-                return yield next();
-            }
-            this.finder.setDriver(driver);
-            return yield this.finder.findByImage(selector, { multiple });
-        });
+    async _find(multiple, next, driver, ...args) {
+        const [strategy, selector] = args;
+        // if we're not actually finding by image, just do the normal thing
+        if (strategy !== IMAGE_STRATEGY) {
+            return await next();
+        }
+        this.finder.setDriver(driver);
+        return await this.finder.findByImage(selector, { multiple });
     }
-    handle(next, driver, cmdName, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // if we have a command that involves an image element id, attempt to find the image element
-            // and execute the command on it
-            const imgElId = getImgElFromArgs(args);
-            if (imgElId) {
-                if (!this.finder.imgElCache.has(imgElId)) {
-                    throw new base_driver_1.errors.NoSuchElementError();
-                }
-                const imgEl = this.finder.imgElCache.get(imgElId);
-                return yield image_element_1.ImageElement.execute(driver, imgEl, cmdName, ...args);
+    async handle(next, driver, cmdName, ...args) {
+        // if we have a command that involves an image element id, attempt to find the image element
+        // and execute the command on it
+        const imgElId = getImgElFromArgs(args);
+        if (imgElId) {
+            if (!this.finder.imgElCache.has(imgElId)) {
+                throw new base_driver_1.errors.NoSuchElementError();
             }
-            // otherwise just do the normal thing
-            return yield next();
-        });
+            const imgEl = this.finder.imgElCache.get(imgElId);
+            return await image_element_1.ImageElement.execute(driver, imgEl, cmdName, ...args);
+        }
+        // otherwise just do the normal thing
+        return await next();
     }
 }
 exports.default = ImageElementPlugin;
@@ -93,4 +74,4 @@ ImageElementPlugin.newMethodMap = {
         }
     },
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3BsdWdpbi5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEseUNBQXlDOzs7Ozs7Ozs7Ozs7Ozs7QUFFekMsb0RBQXVCO0FBQ3ZCLHFEQUE2QztBQUM3QyxzRUFBNkM7QUFDN0MsdUNBQTBDO0FBQzFDLHNEQUEwQztBQUMxQyxtREFBcUU7QUFFckUsTUFBTSxjQUFjLEdBQUcsUUFBUSxDQUFDO0FBd0VlLHdDQUFjO0FBdEU3RCxTQUFTLGdCQUFnQixDQUFFLElBQUk7SUFDN0IsS0FBSyxJQUFJLEdBQUcsSUFBSSxJQUFJLEVBQUU7UUFDcEIsSUFBSSxnQkFBQyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxHQUFHLENBQUMsVUFBVSxDQUFDLG9DQUFvQixDQUFDLEVBQUU7WUFDM0QsT0FBTyxHQUFHLENBQUM7U0FDWjtLQUNGO0FBQ0gsQ0FBQztBQWdFNEIsNENBQWdCO0FBOUQ3QyxNQUFxQixrQkFBbUIsU0FBUSxxQkFBVTtJQUV4RCxZQUFhLFVBQVU7UUFDckIsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2xCLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxnQkFBa0IsRUFBRSxDQUFDO0lBQ3pDLENBQUM7SUFnQkssYUFBYSxDQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsR0FBRyxJQUFJOztZQUN4QyxPQUFPLE1BQU0sSUFBQSx1QkFBYSxFQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7UUFDdEMsQ0FBQztLQUFBO0lBRUssV0FBVyxDQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsR0FBRyxJQUFJOztZQUN0QyxPQUFPLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDO1FBQ3hELENBQUM7S0FBQTtJQUVLLFlBQVksQ0FBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLEdBQUcsSUFBSTs7WUFDdkMsT0FBTyxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztRQUN2RCxDQUFDO0tBQUE7SUFFSyxLQUFLLENBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsR0FBRyxJQUFJOztZQUMxQyxNQUFNLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxHQUFHLElBQUksQ0FBQztZQUVsQyxtRUFBbUU7WUFDbkUsSUFBSSxRQUFRLEtBQUssY0FBYyxFQUFFO2dCQUMvQixPQUFPLE1BQU0sSUFBSSxFQUFFLENBQUM7YUFDckI7WUFFRCxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUM5QixPQUFPLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsUUFBUSxFQUFFLEVBQUMsUUFBUSxFQUFDLENBQUMsQ0FBQztRQUM3RCxDQUFDO0tBQUE7SUFFSyxNQUFNLENBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxJQUFJOztZQUMxQyw0RkFBNEY7WUFDNUYsZ0NBQWdDO1lBQ2hDLE1BQU0sT0FBTyxHQUFHLGdCQUFnQixDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3ZDLElBQUksT0FBTyxFQUFFO2dCQUNYLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUU7b0JBQ3hDLE1BQU0sSUFBSSxvQkFBTSxDQUFDLGtCQUFrQixFQUFFLENBQUM7aUJBQ3ZDO2dCQUNELE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDbEQsT0FBTyxNQUFNLDRCQUFZLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUM7YUFDcEU7WUFFRCxxQ0FBcUM7WUFDckMsT0FBTyxNQUFNLElBQUksRUFBRSxDQUFDO1FBQ3RCLENBQUM7S0FBQTs7QUEzREgscUNBNERDO0FBRVEsZ0RBQWtCO0FBdkR6QiwrREFBK0Q7QUFDeEQsK0JBQVksR0FBRztJQUNwQiwyQ0FBMkMsRUFBRTtRQUMzQyxJQUFJLEVBQUU7WUFDSixPQUFPLEVBQUUsZUFBZTtZQUN4QixhQUFhLEVBQUU7Z0JBQ2IsUUFBUSxFQUFFLENBQUMsTUFBTSxFQUFFLFlBQVksRUFBRSxhQUFhLENBQUM7Z0JBQy9DLFFBQVEsRUFBRSxDQUFDLFNBQVMsQ0FBQzthQUN0QjtZQUNELFVBQVUsRUFBRSxJQUFJO1NBQ2pCO0tBQ0Y7Q0FDRixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3BsdWdpbi5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEseUNBQXlDOzs7Ozs7QUFFekMsb0RBQXVCO0FBQ3ZCLHFEQUE2QztBQUM3QyxzRUFBNkM7QUFDN0MsdUNBQTBDO0FBQzFDLHNEQUEwQztBQUMxQyxtREFBcUU7QUFFckUsTUFBTSxjQUFjLEdBQUcsUUFBUSxDQUFDO0FBd0VlLHdDQUFjO0FBdEU3RCxTQUFTLGdCQUFnQixDQUFFLElBQUk7SUFDN0IsS0FBSyxJQUFJLEdBQUcsSUFBSSxJQUFJLEVBQUU7UUFDcEIsSUFBSSxnQkFBQyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxHQUFHLENBQUMsVUFBVSxDQUFDLG9DQUFvQixDQUFDLEVBQUU7WUFDM0QsT0FBTyxHQUFHLENBQUM7U0FDWjtLQUNGO0FBQ0gsQ0FBQztBQWdFNEIsNENBQWdCO0FBOUQ3QyxNQUFxQixrQkFBbUIsU0FBUSxxQkFBVTtJQUV4RCxZQUFhLFVBQVU7UUFDckIsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2xCLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxnQkFBa0IsRUFBRSxDQUFDO0lBQ3pDLENBQUM7SUFnQkQsS0FBSyxDQUFDLGFBQWEsQ0FBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLEdBQUcsSUFBSTtRQUN4QyxPQUFPLE1BQU0sSUFBQSx1QkFBYSxFQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXLENBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUk7UUFDdEMsT0FBTyxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsS0FBSyxDQUFDLFlBQVksQ0FBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLEdBQUcsSUFBSTtRQUN2QyxPQUFPLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxLQUFLLENBQUMsS0FBSyxDQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLEdBQUcsSUFBSTtRQUMxQyxNQUFNLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxHQUFHLElBQUksQ0FBQztRQUVsQyxtRUFBbUU7UUFDbkUsSUFBSSxRQUFRLEtBQUssY0FBYyxFQUFFO1lBQy9CLE9BQU8sTUFBTSxJQUFJLEVBQUUsQ0FBQztTQUNyQjtRQUVELElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzlCLE9BQU8sTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFBQyxRQUFRLEVBQUMsQ0FBQyxDQUFDO0lBQzdELENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsSUFBSTtRQUMxQyw0RkFBNEY7UUFDNUYsZ0NBQWdDO1FBQ2hDLE1BQU0sT0FBTyxHQUFHLGdCQUFnQixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3ZDLElBQUksT0FBTyxFQUFFO1lBQ1gsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRTtnQkFDeEMsTUFBTSxJQUFJLG9CQUFNLENBQUMsa0JBQWtCLEVBQUUsQ0FBQzthQUN2QztZQUNELE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUNsRCxPQUFPLE1BQU0sNEJBQVksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztTQUNwRTtRQUVELHFDQUFxQztRQUNyQyxPQUFPLE1BQU0sSUFBSSxFQUFFLENBQUM7SUFDdEIsQ0FBQzs7QUEzREgscUNBNERDO0FBRVEsZ0RBQWtCO0FBdkR6QiwrREFBK0Q7QUFDeEQsK0JBQVksR0FBRztJQUNwQiwyQ0FBMkMsRUFBRTtRQUMzQyxJQUFJLEVBQUU7WUFDSixPQUFPLEVBQUUsZUFBZTtZQUN4QixhQUFhLEVBQUU7Z0JBQ2IsUUFBUSxFQUFFLENBQUMsTUFBTSxFQUFFLFlBQVksRUFBRSxhQUFhLENBQUM7Z0JBQy9DLFFBQVEsRUFBRSxDQUFDLFNBQVMsQ0FBQzthQUN0QjtZQUNELFVBQVUsRUFBRSxJQUFJO1NBQ2pCO0tBQ0Y7Q0FDRixDQUFDIn0=

package/build/test/e2e/plugin-e2e-specs.js

@@ -1,20 +1,14 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const APPIUM_HOME = path_1.default.resolve(__dirname, '..', '..', '..', 'local_appium_home');
+// need to assign this before appium is imported via e2eSetup
+process.env.APPIUM_HOME = APPIUM_HOME;
 const chai_1 = __importDefault(require("chai"));
 const chai_as_promised_1 = __importDefault(require("chai-as-promised"));
-const path_1 = __importDefault(require("path"));
 const webdriverio_1 = require("webdriverio");
 const compare_1 = require("../../lib/compare");
 const fixtures_1 = require("../fixtures");
@@ -22,10 +16,8 @@ const helpers_1 = require("@appium/base-plugin/build/test/helpers");
 chai_1.default.use(chai_as_promised_1.default);
 chai_1.default.should();
 const THIS_PLUGIN_DIR = path_1.default.resolve(__dirname, '..', '..', '..');
-const APPIUM_HOME = path_1.default.resolve(__dirname, '..', '..', '..', 'local_appium_home');
 const TEST_HOST = 'localhost';
-const TEST_PORT = 4723;
-const TEST_FAKE_APP = path_1.default.resolve(APPIUM_HOME, 'appium-fake-driver', 'node_modules', 'appium-fake-driver', 'test', 'fixtures', 'app.xml');
+const TEST_FAKE_APP = path_1.default.resolve(APPIUM_HOME, '@appium', 'fake-driver', 'node_modules', '@appium', 'fake-driver', 'test', 'fixtures', 'app.xml');
 const TEST_CAPS = {
     platformName: 'Fake',
     'appium:automationName': 'Fake',
@@ -34,44 +26,37 @@ const TEST_CAPS = {
 };
 const WDIO_OPTS = {
     hostname: TEST_HOST,
-    port: TEST_PORT,
     connectionRetryCount: 0,
     capabilities: TEST_CAPS
 };
 describe('ImageElementPlugin', function () {
     let server, driver = null;
-    after(function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (driver) {
-                yield driver.deleteSession();
-            }
-        });
+    after(async function () {
+        if (driver) {
+            await driver.deleteSession();
+        }
     });
     (0, helpers_1.e2eSetup)({
-        before, after, server, port: TEST_PORT, host: TEST_HOST, appiumHome: APPIUM_HOME,
-        driverName: 'fake', driverSource: 'npm', driverSpec: 'appium-fake-driver',
-        pluginName: 'images', pluginSource: 'local', pluginSpec: THIS_PLUGIN_DIR,
+        before, after, server, host: TEST_HOST, driverName: 'fake', driverSource: 'npm',
+        driverSpec: '@appium/fake-driver', pluginName: 'images', pluginSource: 'local',
+        pluginSpec: THIS_PLUGIN_DIR,
     });
-    it('should add the compareImages route', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            driver = yield (0, webdriverio_1.remote)(WDIO_OPTS);
-            let comparison = yield driver.compareImages(compare_1.MATCH_FEATURES_MODE, fixtures_1.TEST_IMG_1_B64, fixtures_1.TEST_IMG_2_B64, {});
-            comparison.count.should.eql(0);
-            comparison = yield driver.compareImages(compare_1.GET_SIMILARITY_MODE, fixtures_1.TEST_IMG_1_B64, fixtures_1.TEST_IMG_2_B64, {});
-            comparison.score.should.be.above(0.2);
-        });
+    it('should add the compareImages route', async function () {
+        driver = await (0, webdriverio_1.remote)({ ...WDIO_OPTS, port: this.port });
+        let comparison = await driver.compareImages(compare_1.MATCH_FEATURES_MODE, fixtures_1.TEST_IMG_1_B64, fixtures_1.TEST_IMG_2_B64, {});
+        comparison.count.should.eql(0);
+        comparison = await driver.compareImages(compare_1.GET_SIMILARITY_MODE, fixtures_1.TEST_IMG_1_B64, fixtures_1.TEST_IMG_2_B64, {});
+        comparison.score.should.be.above(0.2);
     });
-    it('should find and interact with image elements', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const imageEl = yield driver.$(fixtures_1.APPSTORE_IMG_PATH);
-            const { x, y } = yield imageEl.getLocation();
-            const { width, height } = yield imageEl.getSize();
-            x.should.eql(28);
-            y.should.eql(72);
-            width.should.eql(80);
-            height.should.eql(91);
-            yield imageEl.click();
-        });
+    it('should find and interact with image elements', async function () {
+        const imageEl = await driver.$(fixtures_1.APPSTORE_IMG_PATH);
+        const { x, y } = await imageEl.getLocation();
+        const { width, height } = await imageEl.getSize();
+        x.should.eql(28);
+        y.should.eql(72);
+        width.should.eql(80);
+        height.should.eql(91);
+        await imageEl.click();
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLWUyZS1zcGVjcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Rlc3QvZTJlL3BsdWdpbi1lMmUtc3BlY3MuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7QUFBQSxnREFBd0I7QUFDeEIsd0VBQThDO0FBQzlDLGdEQUF3QjtBQUN4Qiw2Q0FBNkM7QUFDN0MsK0NBQTZFO0FBQzdFLDBDQUFnRjtBQUNoRixvRUFBa0U7QUFFbEUsY0FBSSxDQUFDLEdBQUcsQ0FBQywwQkFBYyxDQUFDLENBQUM7QUFDekIsY0FBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO0FBRWQsTUFBTSxlQUFlLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztBQUNsRSxNQUFNLFdBQVcsR0FBRyxjQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0FBQ25GLE1BQU0sU0FBUyxHQUFHLFdBQVcsQ0FBQztBQUM5QixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUM7QUFDdkIsTUFBTSxhQUFhLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsb0JBQW9CLEVBQUUsY0FBYyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQzNGLFNBQVMsQ0FBQyxDQUFDO0FBQzlDLE1BQU0sU0FBUyxHQUFHO0lBQ2hCLFlBQVksRUFBRSxNQUFNO0lBQ3BCLHVCQUF1QixFQUFFLE1BQU07SUFDL0IsbUJBQW1CLEVBQUUsTUFBTTtJQUMzQixZQUFZLEVBQUUsYUFBYTtDQUM1QixDQUFDO0FBQ0YsTUFBTSxTQUFTLEdBQUc7SUFDaEIsUUFBUSxFQUFFLFNBQVM7SUFDbkIsSUFBSSxFQUFFLFNBQVM7SUFDZixvQkFBb0IsRUFBRSxDQUFDO0lBQ3ZCLFlBQVksRUFBRSxTQUFTO0NBQ3hCLENBQUM7QUFFRixRQUFRLENBQUMsb0JBQW9CLEVBQUU7SUFDN0IsSUFBSSxNQUFNLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FBQztJQUUxQixLQUFLLENBQUM7O1lBQ0osSUFBSSxNQUFNLEVBQUU7Z0JBQ1YsTUFBTSxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7YUFDOUI7UUFDSCxDQUFDO0tBQUEsQ0FBQyxDQUFDO0lBRUgsSUFBQSxrQkFBUSxFQUFDO1FBQ1AsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxXQUFXO1FBQ2hGLFVBQVUsRUFBRSxNQUFNLEVBQUUsWUFBWSxFQUFFLEtBQUssRUFBRSxVQUFVLEVBQUUsb0JBQW9CO1FBQ3pFLFVBQVUsRUFBRSxRQUFRLEVBQUUsWUFBWSxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsZUFBZTtLQUN6RSxDQUFDLENBQUM7SUFFSCxFQUFFLENBQUMsb0NBQW9DLEVBQUU7O1lBQ3ZDLE1BQU0sR0FBRyxNQUFNLElBQUEsb0JBQUksRUFBQyxTQUFTLENBQUMsQ0FBQztZQUMvQixJQUFJLFVBQVUsR0FBRyxNQUFNLE1BQU0sQ0FBQyxhQUFhLENBQUMsNkJBQW1CLEVBQUUseUJBQWMsRUFBRSx5QkFBYyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ3JHLFVBQVUsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMvQixVQUFVLEdBQUcsTUFBTSxNQUFNLENBQUMsYUFBYSxDQUFDLDZCQUFtQixFQUFFLHlCQUFjLEVBQUUseUJBQWMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUNqRyxVQUFVLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3hDLENBQUM7S0FBQSxDQUFDLENBQUM7SUFFSCxFQUFFLENBQUMsOENBQThDLEVBQUU7O1lBQ2pELE1BQU0sT0FBTyxHQUFHLE1BQU0sTUFBTSxDQUFDLENBQUMsQ0FBQyw0QkFBaUIsQ0FBQyxDQUFDO1lBQ2xELE1BQU0sRUFBQyxDQUFDLEVBQUUsQ0FBQyxFQUFDLEdBQUcsTUFBTSxPQUFPLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDM0MsTUFBTSxFQUFDLEtBQUssRUFBRSxNQUFNLEVBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNoRCxDQUFDLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNqQixDQUFDLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNqQixLQUFLLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNyQixNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN0QixNQUFNLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUN4QixDQUFDO0tBQUEsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLWUyZS1zcGVjcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Rlc3QvZTJlL3BsdWdpbi1lMmUtc3BlY3MuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxnREFBd0I7QUFDeEIsTUFBTSxXQUFXLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsbUJBQW1CLENBQUMsQ0FBQztBQUNuRiw2REFBNkQ7QUFDN0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO0FBRXRDLGdEQUF3QjtBQUN4Qix3RUFBOEM7QUFDOUMsNkNBQTZDO0FBQzdDLCtDQUE2RTtBQUM3RSwwQ0FBZ0Y7QUFDaEYsb0VBQWtFO0FBRWxFLGNBQUksQ0FBQyxHQUFHLENBQUMsMEJBQWMsQ0FBQyxDQUFDO0FBQ3pCLGNBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztBQUVkLE1BQU0sZUFBZSxHQUFHLGNBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFDbEUsTUFBTSxTQUFTLEdBQUcsV0FBVyxDQUFDO0FBQzlCLE1BQU0sYUFBYSxHQUFHLGNBQUksQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsY0FBYyxFQUN0RixTQUFTLEVBQUUsYUFBYSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsU0FBUyxDQUFDLENBQUM7QUFDM0QsTUFBTSxTQUFTLEdBQUc7SUFDaEIsWUFBWSxFQUFFLE1BQU07SUFDcEIsdUJBQXVCLEVBQUUsTUFBTTtJQUMvQixtQkFBbUIsRUFBRSxNQUFNO0lBQzNCLFlBQVksRUFBRSxhQUFhO0NBQzVCLENBQUM7QUFDRixNQUFNLFNBQVMsR0FBRztJQUNoQixRQUFRLEVBQUUsU0FBUztJQUNuQixvQkFBb0IsRUFBRSxDQUFDO0lBQ3ZCLFlBQVksRUFBRSxTQUFTO0NBQ3hCLENBQUM7QUFFRixRQUFRLENBQUMsb0JBQW9CLEVBQUU7SUFDN0IsSUFBSSxNQUFNLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FBQztJQUUxQixLQUFLLENBQUMsS0FBSztRQUNULElBQUksTUFBTSxFQUFFO1lBQ1YsTUFBTSxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7U0FDOUI7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUVILElBQUEsa0JBQVEsRUFBQztRQUNQLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsS0FBSztRQUMvRSxVQUFVLEVBQUUscUJBQXFCLEVBQUUsVUFBVSxFQUFFLFFBQVEsRUFBRSxZQUFZLEVBQUUsT0FBTztRQUM5RSxVQUFVLEVBQUUsZUFBZTtLQUM1QixDQUFDLENBQUM7SUFFSCxFQUFFLENBQUMsb0NBQW9DLEVBQUUsS0FBSztRQUM1QyxNQUFNLEdBQUcsTUFBTSxJQUFBLG9CQUFJLEVBQUMsRUFBQyxHQUFHLFNBQVMsRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBQyxDQUFDLENBQUM7UUFDckQsSUFBSSxVQUFVLEdBQUcsTUFBTSxNQUFNLENBQUMsYUFBYSxDQUFDLDZCQUFtQixFQUFFLHlCQUFjLEVBQUUseUJBQWMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNyRyxVQUFVLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDL0IsVUFBVSxHQUFHLE1BQU0sTUFBTSxDQUFDLGFBQWEsQ0FBQyw2QkFBbUIsRUFBRSx5QkFBYyxFQUFFLHlCQUFjLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDakcsVUFBVSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN4QyxDQUFDLENBQUMsQ0FBQztJQUVILEVBQUUsQ0FBQyw4Q0FBOEMsRUFBRSxLQUFLO1FBQ3RELE1BQU0sT0FBTyxHQUFHLE1BQU0sTUFBTSxDQUFDLENBQUMsQ0FBQyw0QkFBaUIsQ0FBQyxDQUFDO1FBQ2xELE1BQU0sRUFBQyxDQUFDLEVBQUUsQ0FBQyxFQUFDLEdBQUcsTUFBTSxPQUFPLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDM0MsTUFBTSxFQUFDLEtBQUssRUFBRSxNQUFNLEVBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNoRCxDQUFDLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNqQixDQUFDLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNqQixLQUFLLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNyQixNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN0QixNQUFNLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUN4QixDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQyxDQUFDIn0=