@appium/fake-driver 5.2.0 → 5.2.2

package/lib/driver.js

@@ -2,7 +2,6 @@ import B from 'bluebird';
 import {BaseDriver, errors} from 'appium/driver';
 import {deprecatedCommandsLogged} from '@appium/base-driver/build/lib/protocol/protocol';
 import {FakeApp} from './fake-app';
-import {alert, contexts, element, find, general} from './commands';
 
 const FAKE_DRIVER_CONSTRAINTS = /** @type {const} */ ({
   app: {
@@ -15,22 +14,50 @@ const FAKE_DRIVER_CONSTRAINTS = /** @type {const} */ ({
 });
 
 /**
+ * Constraints for {@linkcode FakeDriver}'s capabilites
  * @typedef {typeof FAKE_DRIVER_CONSTRAINTS} FakeDriverConstraints
  */
 
 /**
+ * @template [Thing=any]
  * @extends {BaseDriver<FakeDriverConstraints>}
  * @implements {ExternalDriver<FakeDriverConstraints>}
  */
 export class FakeDriver extends BaseDriver {
-  desiredCapConstraints = FAKE_DRIVER_CONSTRAINTS;
+  /**
+   * @type {FakeDriverConstraints}
+   * @readonly
+   */
+  desiredCapConstraints;
 
   /** @type {string} */
   curContext;
 
-  appModel = new FakeApp();
+  /** @type {FakeApp} */
+  appModel;
+
+  /** @type {boolean} */
+  _proxyActive;
+
+  /** @type {boolean} */
+  shook;
+
+  /** @type {string?} */
+  focusedElId;
+
+  /** @type {Thing?} */
+  fakeThing;
+
+  /** @type {number} */
+  maxElId;
 
-  constructor(opts = {}, shouldValidateCaps = true) {
+  /** @type {Record<string,import('./fake-element').FakeElement>} */
+  elMap;
+
+  constructor(
+    opts = /** @type {import('@appium/types').DriverOpts<FakeDriverConstraints>} */ ({}),
+    shouldValidateCaps = true
+  ) {
     super(opts, shouldValidateCaps);
     this.curContext = 'NATIVE_APP';
     this.elMap = {};
@@ -39,6 +66,8 @@ export class FakeDriver extends BaseDriver {
     this.fakeThing = null;
     this._proxyActive = false;
     this.shook = false;
+    this.appModel = new FakeApp();
+    this.desiredCapConstraints = FAKE_DRIVER_CONSTRAINTS;
   }
 
   proxyActive() {
@@ -112,7 +141,7 @@ export class FakeDriver extends BaseDriver {
   /**
    * Set the 'thing' value (so that it can be retrieved later)
    *
-   * @param {any} thing
+   * @param {Thing} thing
    * @returns {Promise<null>}
    */
   async setFakeThing(thing) {
@@ -201,86 +230,16 @@ export class FakeDriver extends BaseDriver {
       res.send(JSON.stringify(cliArgs));
     });
   }
-
-  /*********
-   * ALERT *
-   *********/
-  assertNoAlert = alert.assertNoAlert;
-  assertAlert = alert.assertAlert;
-  getAlertText = alert.getAlertText;
-  setAlertText = alert.setAlertText;
-  postAcceptAlert = alert.postAcceptAlert;
-  postDismissAlert = alert.postDismissAlert;
-
-  /************
-   * CONTEXTS *
-   ************/
-  getRawContexts = contexts.getRawContexts;
-  assertWebviewContext = contexts.assertWebviewContext;
-  getCurrentContext = contexts.getCurrentContext;
-  getContexts = contexts.getContexts;
-  setContext = contexts.setContext;
-  setFrame = contexts.setFrame;
-
-  /************
-   * ELEMENTS *
-   ************/
-  getElements = element.getElements;
-  getElement = element.getElement;
-  getName = element.getName;
-  elementDisplayed = element.elementDisplayed;
-  elementEnabled = element.elementEnabled;
-  elementSelected = element.elementSelected;
-  setValue = element.setValue;
-  getText = element.getText;
-  clear = element.clear;
-  click = element.click;
-  getAttribute = element.getAttribute;
-  getElementRect = element.getElementRect;
-  getSize = element.getSize;
-  equalsElement = element.equalsElement;
-  getCssProperty = element.getCssProperty;
-  getLocation = element.getLocation;
-  getLocationInView = element.getLocationInView;
-
-  /********
-   * FIND *
-   ********/
-  getExistingElementForNode = find.getExistingElementForNode;
-  wrapNewEl = find.wrapNewEl;
-  findElOrEls = find.findElOrEls;
-  findElement = find.findElement;
-  findElements = find.findElements;
-  findElementFromElement = find.findElementFromElement;
-  findElementsFromElement = find.findElementsFromElement;
-
-  /***********
-   * GENERAL *
-   ***********/
-  title = general.title;
-  keys = general.keys;
-  setGeoLocation = general.setGeoLocation;
-  getGeoLocation = general.getGeoLocation;
-  getPageSource = general.getPageSource;
-  getOrientation = general.getOrientation;
-  setOrientation = general.setOrientation;
-  getScreenshot = general.getScreenshot;
-  getWindowSize = general.getWindowSize;
-  getWindowRect = general.getWindowRect;
-  performActions = general.performActions;
-  getLog = general.getLog;
-  mobileShake = general.mobileShake;
-  doubleClick = general.doubleClick;
-  execute = general.execute;
-  fakeAddition = general.fakeAddition;
-  releaseActions = general.releaseActions;
 }
 
+import './commands';
+
 export default FakeDriver;
 
 /**
  * @typedef {import('./types').FakeDriverCaps} FakeDriverCaps
  * @typedef {import('./types').W3CFakeDriverCaps} W3CFakeDriverCaps
+ * @typedef {import('@appium/types').Element} Element
  */
 
 /**
@@ -292,3 +251,7 @@ export default FakeDriver;
  * @template {import('@appium/types').Constraints} C
  * @typedef {import('@appium/types').ExternalDriver<C>} ExternalDriver
  */
+
+/**
+ * @typedef {import('@appium/types').Orientation} Orientation
+ */

package/lib/fake-app.js

@@ -8,7 +8,7 @@ import {FakeElement} from './fake-element';
 
 const SCREENSHOT = path.join(__dirname, 'screen.png');
 
-class FakeApp {
+export class FakeApp {
   constructor() {
     this.dom = null;
     this.activeDom = null;
@@ -20,7 +20,9 @@ class FakeApp {
     this._width = null;
     this._height = null;
     this.rawXml = '';
+    /** @type {import('./driver').Orientation} */
     this.currentOrientation = 'PORTRAIT';
+    /** @type {import('@appium/types').ActionSequence[][]} */
     this.actionLog = [];
   }
 
@@ -176,8 +178,6 @@ class FakeWebView {
   }
 }
 
-export {FakeApp};
-
 /**
  * @typedef {Element & {data: any}} ElementWithData
  */

package/lib/fake-element.js

@@ -1,7 +1,20 @@
 import _ from 'lodash';
 import XMLDom from '@xmldom/xmldom';
 
-class FakeElement {
+export class FakeElement {
+  /** @type {FakeApp} */
+  app;
+
+  /** @type {string} */
+  type;
+
+  /** @type {Record<string,string>} */
+  nodeAttrs;
+
+  /**
+   * @param {any} xmlNode
+   * @param {FakeApp} app
+   */
   constructor(xmlNode, app) {
     this.app = app;
     this.node = xmlNode;
@@ -53,8 +66,8 @@ class FakeElement {
 
   getLocation() {
     return {
-      x: parseFloat(this.nodeAttrs.left || 0),
-      y: parseFloat(this.nodeAttrs.top || 0),
+      x: parseFloat(this.nodeAttrs.left || '0'),
+      y: parseFloat(this.nodeAttrs.top || '0'),
     };
   }
 
@@ -64,8 +77,8 @@ class FakeElement {
 
   getSize() {
     return {
-      width: parseFloat(this.nodeAttrs.width || 0),
-      height: parseFloat(this.nodeAttrs.height || 0),
+      width: parseFloat(this.nodeAttrs.width || '0'),
+      height: parseFloat(this.nodeAttrs.height || '0'),
     };
   }
 
@@ -99,4 +112,6 @@ class FakeElement {
   }
 }
 
-export {FakeElement};
+/**
+ * @typedef {import('./fake-app').FakeApp} FakeApp
+ */

package/lib/scripts/fake-error.js

@@ -1 +1,8 @@
-throw Error('Unsuccessfully ran the script');
+import ora from 'ora';
+
+const spinner = ora('Running fake-error...').start();
+
+setTimeout(() => {
+  spinner.fail('Oh nooooooo!');
+  throw Error('Unsuccessfully ran the script');
+}, 1000);

package/lib/scripts/fake-stdin.js

@@ -0,0 +1,9 @@
+import readline from 'node:readline';
+
+const rl = readline.createInterface({input: process.stdin, output: process.stderr});
+
+rl.question('Press ENTER to continue: ', () => {
+  rl.close();
+  // eslint-disable-next-line no-console
+  console.error('You did it!');
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appium/fake-driver",
-  "version": "5.2.0",
+  "version": "5.2.2",
   "description": "Mock driver used internally by Appium for testing. Ignore",
   "keywords": [
     "automation",
@@ -75,12 +75,13 @@
     "schema": "./build/lib/fake-driver-schema.js",
     "scripts": {
       "fake-error": "./build/lib/scripts/fake-error.js",
-      "fake-success": "./build/lib/scripts/fake-success.js"
+      "fake-success": "./build/lib/scripts/fake-success.js",
+      "fake-stdin": "./build/lib/scripts/fake-stdin.js"
     }
   },
   "typedoc": {
     "entryPoint": "./lib/index.js"
   },
   "types": "./build/lib/index.d.ts",
-  "gitHead": "7b4935632222123a4fa7422461f6312f1f0dfbe4"
+  "gitHead": "d514ebdd7ebd27bb236509d0a3d580f0f18a34e5"
 }

package/lib/commands/alert.js

@@ -1,73 +0,0 @@
-import {errors} from 'appium/driver';
-
-export default {
-  /**
-   * @this {FakeDriver}
-   */
-  assertNoAlert() {
-    if (this.appModel.hasAlert()) {
-      throw new errors.UnexpectedAlertOpenError();
-    }
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  assertAlert() {
-    if (!this.appModel.hasAlert()) {
-      throw new errors.NoAlertOpenError();
-    }
-  },
-
-  /**
-   * Get the text of an alert
-   *
-   * @returns {Promise<string>}
-   * @this {FakeDriver}
-   */
-  async getAlertText() {
-    this.assertAlert();
-    return this.appModel.alertText();
-  },
-
-  /**
-   * Set the text of an alert
-   *
-   * @param {string} text
-   * @returns {Promise<void>}
-   * @this {FakeDriver}
-   */
-  async setAlertText(text) {
-    this.assertAlert();
-    try {
-      this.appModel.setAlertText(text);
-    } catch (e) {
-      throw new errors.InvalidElementStateError();
-    }
-  },
-
-  /**
-   * Accept an alert
-   *
-   * @returns {Promise<void>}
-   * @this {FakeDriver}
-   */
-  async postAcceptAlert() {
-    this.assertAlert();
-    this.appModel.handleAlert();
-  },
-
-  /**
-   * Dismiss an alert
-   *
-   * @returns {Promise<void>}
-   * @this {FakeDriver}
-   */
-  async postDismissAlert() {
-    return this.postAcceptAlert();
-  },
-};
-
-/**
- * @typedef {import('../driver').FakeDriver} FakeDriver
- */

package/lib/commands/element.js

@@ -1,161 +0,0 @@
-import _ from 'lodash';
-import {errors} from 'appium/driver';
-export default {
-  /**
-   * @this {FakeDriver}
-   */
-  getElements(elIds) {
-    for (let elId of elIds) {
-      if (!_.has(this.elMap, elId)) {
-        throw new errors.StaleElementReferenceError();
-      }
-    }
-    return elIds.map((e) => this.elMap[e]);
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  getElement(elId) {
-    return this.getElements([elId])[0];
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  async getName(elementId) {
-    let el = this.getElement(elementId);
-    return el.tagName;
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  async elementDisplayed(elementId) {
-    let el = this.getElement(elementId);
-    return el.isVisible();
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  async elementEnabled(elementId) {
-    let el = this.getElement(elementId);
-    return el.isEnabled();
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  async elementSelected(elementId) {
-    let el = this.getElement(elementId);
-    return el.isSelected();
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  async setValue(keys, elementId) {
-    let value = keys;
-    if (keys instanceof Array) {
-      value = keys.join('');
-    }
-    let el = this.getElement(elementId);
-    if (el.type !== 'MockInputField') {
-      throw new errors.InvalidElementStateError();
-    }
-    el.setAttr('value', value);
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  async getText(elementId) {
-    let el = this.getElement(elementId);
-    return el.getAttr('value');
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  async clear(elementId) {
-    await this.setValue('', elementId);
-  },
-
-  /**
-   * This comment should be displayed instead of the one from ExternalDriver
-   * @param {string} elementId
-   * @this {FakeDriver}
-   */
-  async click(elementId) {
-    this.assertNoAlert();
-    let el = this.getElement(elementId);
-    if (!el.isVisible()) {
-      throw new errors.InvalidElementStateError();
-    }
-    el.click();
-    this.focusedElId = elementId;
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  async getAttribute(attr, elementId) {
-    let el = this.getElement(elementId);
-    return el.getAttr(attr);
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  getElementRect(elementId) {
-    let el = this.getElement(elementId);
-    return el.getElementRect();
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  getSize(elementId) {
-    let el = this.getElement(elementId);
-    return el.getSize();
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  equalsElement(el1Id, el2Id) {
-    let el1 = this.getElement(el1Id);
-    let el2 = this.getElement(el2Id);
-    return el1.equals(el2);
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  async getCssProperty(prop, elementId) {
-    this.assertWebviewContext();
-    let el = this.getElement(elementId);
-    return el.getCss(prop);
-  },
-
-  /**
-   * @param {string} elementId
-   * @this {FakeDriver}
-   */
-  async getLocation(elementId) {
-    const el = this.getElement(elementId);
-    return el.getLocation();
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  async getLocationInView(elementId) {
-    return this.getLocation(elementId);
-  },
-};
-
-/**
- * @typedef {import('../driver').FakeDriver} FakeDriver
- */

package/lib/commands/find.js

@@ -1,118 +0,0 @@
-import _ from 'lodash';
-import {errors} from 'appium/driver';
-import {FakeElement} from '../fake-element';
-
-export default {
-  /**
-   * @this {FakeDriver}
-   */
-  getExistingElementForNode(node) {
-    for (let [id, el] of _.toPairs(this.elMap)) {
-      if (el.node === node) {
-        return id;
-      }
-    }
-    return null;
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  wrapNewEl(obj) {
-    // first check and see if we already have a ref to this element
-    let existingElId = this.getExistingElementForNode(obj);
-    if (existingElId) {
-      return {ELEMENT: existingElId};
-    }
-
-    // otherwise add the element to the map
-    this.maxElId++;
-    this.elMap[this.maxElId.toString()] = new FakeElement(obj, this.appModel);
-    return {ELEMENT: this.maxElId.toString()};
-  },
-
-  /**
-   * @template {boolean} Mult
-   * @template [Ctx=any]
-   * @param {string} strategy
-   * @param {string} selector
-   * @param {Mult} mult
-   * @param {Ctx} [context]
-   * @returns {Promise<Mult extends true ? Element[] : Element>}
-   * @this {FakeDriver}
-   */
-  async findElOrEls(strategy, selector, mult, context) {
-    let qMap = {
-      xpath: 'xpathQuery',
-      id: 'idQuery',
-      'accessibility id': 'idQuery',
-      'class name': 'classQuery',
-      'tag name': 'classQuery',
-      'css selector': 'cssQuery',
-    };
-    // TODO this error checking should probably be part of MJSONWP?
-    if (!_.includes(_.keys(qMap), strategy)) {
-      throw new errors.UnknownCommandError();
-    }
-    if (selector === 'badsel') {
-      throw new errors.InvalidSelectorError();
-    }
-    let els = this.appModel[qMap[strategy]](selector, context);
-
-    let retval;
-    if (els.length) {
-      if (mult) {
-        let allEls = [];
-        for (let el of els) {
-          allEls.push(this.wrapNewEl(el));
-        }
-        retval = allEls;
-      } else {
-        retval = this.wrapNewEl(els[0]);
-      }
-    } else if (mult) {
-      retval = [];
-    } else {
-      throw new errors.NoSuchElementError();
-    }
-    return /** @type {Mult extends true ? Element[] : Element} */ (retval);
-  },
-
-  /**
-   * This should override whatever's in ExternalDriver
-   * @param {string} strategy Strategy
-   * @param {string} selector Selector
-   * @this {FakeDriver}
-   */
-  async findElement(strategy, selector) {
-    return this.findElOrEls(strategy, selector, false);
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  async findElements(strategy, selector) {
-    return this.findElOrEls(strategy, selector, true);
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  async findElementFromElement(strategy, selector, elementId) {
-    let el = this.getElement(elementId);
-    return this.findElOrEls(strategy, selector, false, el.xmlFragment);
-  },
-
-  /**
-   * @this {FakeDriver}
-   */
-  async findElementsFromElement(strategy, selector, elementId) {
-    let el = this.getElement(elementId);
-    return this.findElOrEls(strategy, selector, true, el.xmlFragment);
-  },
-};
-
-/**
- * @typedef {import('@appium/types').Element} Element
- * @typedef {import('../driver').FakeDriver} FakeDriver
- */