detox 21.0.0-rc.3 → 21.0.0-rc.4

package/src/ios/web.js

@@ -0,0 +1,280 @@
+const assert = require('assert');
+
+const _ = require('lodash');
+
+const { DetoxRuntimeError } = require('../errors');
+const { webViewActionDescription, expectDescription } = require('../utils/invocationTraceDescriptions');
+const log = require('../utils/logger').child({ cat: 'ws-client, ws' });
+const traceInvocationCall = require('../utils/traceInvocationCall').bind(null, log);
+
+
+class WebExpect {
+  constructor(invocationManager, element) {
+    this._invocationManager = invocationManager;
+    this.element = element;
+    this.modifiers = [];
+  }
+
+  toHaveText(text) {
+    const traceDescription = expectDescription.toHaveText(text);
+    return this.expect('toHaveText', traceDescription, text);
+  }
+
+  toExist() {
+    const traceDescription = expectDescription.toExist();
+    return this.expect('toExist', traceDescription);
+  }
+
+  get not() {
+    this.modifiers.push('not');
+    return this;
+  }
+  getText;
+  createInvocation(webExpectation, ...params) {
+    const definedParams = _.without(params, undefined);
+    return {
+      type: 'webExpectation',
+      ...(this.element.webViewElement !== undefined) && {
+        predicate: this.element.webViewElement.matcher.predicate,
+        ...(this.element.webViewElement.index !== undefined && { atIndex: this.element.webViewElement.index }),
+      },
+      webPredicate: this.element.matcher.predicate,
+      ...(this.element.index !== undefined && { webAtIndex: this.element.index }),
+      ...(this.modifiers.length !== 0 && { webModifiers: this.modifiers }),
+      webExpectation,
+      ...(definedParams.length !== 0 && { params: definedParams })
+    };
+  }
+
+  expect(expectation, traceDescription, ...params) {
+    assert(traceDescription, `must provide trace description for expectation: \n ${JSON.stringify(expectation)}`);
+
+    const invocation = this.createInvocation(expectation, ...params);
+    traceDescription = expectDescription.full(traceDescription, this.modifiers.includes('not'));
+    return _executeInvocation(this._invocationManager, invocation, traceDescription);
+  }
+}
+
+class WebElement {
+  constructor(invocationManager, emitter, webViewElement, matcher, index) {
+    this._invocationManager = invocationManager;
+    this._emitter = emitter;
+    this.webViewElement = webViewElement;
+    this.matcher = matcher;
+    this.index = index;
+  }
+
+  atIndex(index) {
+    if (typeof index !== 'number') throw new DetoxRuntimeError(`atIndex argument must be a number, got ${typeof index}`);
+    this.index = index;
+    return this;
+  }
+
+  tap() {
+    const traceDescription = webViewActionDescription.tap();
+    return this.withAction('tap', traceDescription);
+  }
+
+  typeText(text, isContentEditable = false) {
+    const traceDescription = webViewActionDescription.typeText(text, isContentEditable);
+    return this.withAction('typeText', traceDescription, text, isContentEditable);
+  }
+
+  replaceText(text) {
+    const traceDescription = webViewActionDescription.replaceText(text);
+    return this.withAction('replaceText', traceDescription, text);
+  }
+
+  clearText() {
+    const traceDescription = webViewActionDescription.clearText();
+    return this.withAction('clearText', traceDescription);
+  }
+
+  selectAllText() {
+    const traceDescription = webViewActionDescription.selectAllText();
+    return this.withAction('selectAllText', traceDescription);
+  }
+
+  async getText() {
+    const traceDescription = webViewActionDescription.getText();
+    let result = await this.withAction('getText', traceDescription);
+
+    if (result['text']) {
+      return result['text'];
+    } else {
+      throw new DetoxRuntimeError(`Failed to extract text from result: ${JSON.stringify(result)}`);
+    }
+  }
+
+  scrollToView() {
+    const traceDescription = webViewActionDescription.scrollToView();
+    return this.withAction('scrollToView', traceDescription);
+  }
+
+  focus() {
+    const traceDescription = webViewActionDescription.focus();
+    return this.withAction('focus', traceDescription);
+  }
+
+  moveCursorToEnd() {
+    const traceDescription = webViewActionDescription.moveCursorToEnd();
+    return this.withAction('moveCursorToEnd', traceDescription);
+  }
+
+  runScript(script) {
+    const traceDescription = webViewActionDescription.runScript(script);
+    return this.withAction('runScript', traceDescription, script);
+  }
+
+  runScriptWithArgs(script, ...args) {
+    const traceDescription = webViewActionDescription.runScriptWithArgs(script, ...args);
+    return this.withAction('runScriptWithArgs', traceDescription, script, ...args);
+  }
+
+  async getCurrentUrl() {
+    const traceDescription = webViewActionDescription.getCurrentUrl();
+    let result = await this.withAction('getCurrentUrl', traceDescription);
+
+    if (result['url']) {
+      return result['url'];
+    } else {
+      throw new DetoxRuntimeError(`Failed to extract url from result: ${JSON.stringify(result)}`);
+    }
+  }
+
+  async getTitle() {
+    const traceDescription = webViewActionDescription.getTitle();
+    let result = await this.withAction('getTitle', traceDescription);
+
+    if (result['title']) {
+      return result['title'];
+    } else {
+      throw new DetoxRuntimeError(`Failed to extract title from result: ${JSON.stringify(result)}`);
+    }
+  }
+
+  withAction(action, traceDescription, ...params) {
+    assert(traceDescription, `must provide trace description for action: \n ${JSON.stringify(action)}`);
+
+    const invocation = {
+      type: 'webAction',
+      ...(this.webViewElement !== undefined) && {
+        predicate: this.webViewElement.matcher.predicate,
+        ...(this.webViewElement.index !== undefined && { atIndex: this.webViewElement.index }),
+      },
+      webPredicate: this.matcher.predicate,
+      ...(this.index !== undefined && { webAtIndex: this.index }),
+      webAction: action,
+      ...(params.length !== 0 && { params }),
+    };
+    traceDescription = webViewActionDescription.full(traceDescription);
+    return _executeInvocation(this._invocationManager, invocation, traceDescription);
+  }
+}
+
+class WebElementMatcher {
+  id(id) {
+    if (typeof id !== 'string') throw new DetoxRuntimeError('id should be a string, but got ' + (id + (' (' + (typeof id + ')'))));
+    this.predicate = { type: 'id', value: id.toString() };
+    return this;
+  }
+
+  className(className) {
+    if (typeof className !== 'string') throw new DetoxRuntimeError('className should be a string, but got ' + (className + (' (' + (typeof className + ')'))));
+    this.predicate = { type: 'class', value: className.toString() };
+    return this;
+  }
+
+  cssSelector(cssSelector) {
+    if (typeof cssSelector !== 'string') throw new DetoxRuntimeError('cssSelector should be a string, but got ' + (cssSelector + (' (' + (typeof cssSelector + ')'))));
+    this.predicate = { type: 'css', value: cssSelector.toString() };
+    return this;
+  }
+
+  name(name) {
+    if (typeof name !== 'string') throw new DetoxRuntimeError('name should be a string, but got ' + (name + (' (' + (typeof name + ')'))));
+    this.predicate = { type: 'name', value: name.toString() };
+    return this;
+  }
+
+  xpath(xpath) {
+    if (typeof xpath !== 'string') throw new DetoxRuntimeError('xpath should be a string, but got ' + (xpath + (' (' + (typeof xpath + ')'))));
+    this.predicate = { type: 'xpath', value: xpath.toString() };
+    return this;
+  }
+
+  href(href) {
+    if (typeof href !== 'string') throw new DetoxRuntimeError('href should be a string, but got ' + (href + (' (' + (typeof href + ')'))));
+    this.predicate = { type: 'href', value: href.toString() };
+    return this;
+  }
+
+  hrefContains(href) {
+    if (typeof href !== 'string') throw new DetoxRuntimeError('href should be a string, but got ' + (href + (' (' + (typeof href + ')'))));
+    this.predicate = { type: 'hrefContains', value: href.toString() };
+    return this;
+  }
+
+  tag(tag) {
+    if (typeof tag !== 'string') throw new DetoxRuntimeError('tag should be a string, but got ' + (tag + (' (' + (typeof tag + ')'))));
+    this.predicate = { type: 'tag', value: tag.toString() };
+    return this;
+  }
+
+  label(label) {
+    if (typeof label !== 'string') throw new DetoxRuntimeError('label should be a string, but got ' + (label + (' (' + (typeof label + ')'))));
+    this.predicate = { type: 'label', value: label.toString() };
+    return this;
+  }
+
+  value(value) {
+    if (typeof value !== 'string') throw new DetoxRuntimeError('value should be a string, but got ' + (value + (' (' + (typeof value + ')'))));
+    this.predicate = { type: 'value', value: value.toString() };
+    return this;
+  }
+}
+
+function webMatcher() {
+  return new WebElementMatcher();
+}
+
+function webElement(invocationManager, emitter, webViewElement, matcher) {
+  if (!(matcher instanceof WebElementMatcher)) {
+    throwWebViewMatcherError(matcher);
+  }
+
+  return new WebElement(invocationManager, emitter, webViewElement, matcher);
+}
+
+function throwWebViewMatcherError(param) {
+  const paramDescription = JSON.stringify(param);
+  throw new DetoxRuntimeError(`${paramDescription} is not a Detox web-view matcher. More about web-view matchers here: https://wix.github.io/Detox/docs/api/webviews`);
+}
+
+function webExpect(invocationManager, element) {
+  if (!(element instanceof WebElement)) {
+    throwWebElementError(element);
+  }
+
+  return new WebExpect(invocationManager, element);
+}
+
+function throwWebElementError(param) {
+  const paramDescription = JSON.stringify(param);
+  throw new DetoxRuntimeError(`${paramDescription} is not a web element. More about web elements here: https://wix.github.io/Detox/docs/api/webviews`);
+}
+
+function _executeInvocation(invocationManager, invocation, traceDescription) {
+  return traceInvocationCall(traceDescription, invocation, invocationManager.execute(invocation));
+}
+
+function isWebElement(element) {
+  return element instanceof WebElement;
+}
+
+module.exports = {
+  webMatcher,
+  webElement,
+  webExpect,
+  isWebElement
+};

package/src/realms/DetoxPrimaryContext.js

@@ -51,8 +51,7 @@ class DetoxPrimaryContext extends DetoxContext {
     }
   }
 
-  async [symbols.resolveConfig](opts = { argv: { configuration: process.env.DETOX_DBG_SELECTED_CFG } })
-  {
+  async [symbols.resolveConfig](opts = {}) {
     const session = this[$sessionState];
     if (!session.detoxConfig) {
       const configuration = require('../configuration');

package/src/utils/invocationTraceDescriptions.js

@@ -26,6 +26,22 @@ module.exports = {
     tapReturnKey: () => 'tap on return key',
     typeText: (value) => `type input text: "${value}"`,
   },
+  webViewActionDescription: {
+    tap: (value) => `tap${value !== undefined ? ` at ${JSON.stringify(value)}` : ''}`,
+    typeText: (value, isContentEditable) => `type input text: "${value}"${isContentEditable ? ' in content editable' : ''}`,
+    replaceText: (value) => `replace input text: "${value}"`,
+    clearText: () => 'clear input text',
+    selectAllText: () => 'select all input text',
+    getText: () => 'get input text',
+    scrollToView: () => 'scroll to view',
+    focus: () => 'focus',
+    moveCursorToEnd: () => 'move cursor to end',
+    runScript: (script) => `run script: "${script}"`,
+    runScriptWithArgs: (script, ...args) => `run script: "${script}" with args: "${args}"`,
+    getCurrentUrl: () => 'get current url',
+    getTitle: () => 'get title',
+    full: (actionDescription) => `perform web view action: ${actionDescription}`
+  },
   expectDescription: {
     waitFor: (actionDescription) => `wait for expectation while ${actionDescription}`,
     waitForWithTimeout: (expectDescription, timeout) => `${expectDescription} with timeout (${timeout} ms)`,

package/src/utils/isRegExp.js

@@ -0,0 +1,7 @@
+function isRegExp(obj) {
+  return Object.prototype.toString.call(obj) === '[object RegExp]';
+}
+
+module.exports = {
+  isRegExp,
+};

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3-javadoc.jar.md5

@@ -1 +0,0 @@
-f0954630cd14cb559233558f989412a5

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3-javadoc.jar.sha1

@@ -1 +0,0 @@
-8628c93bf55263e9366d680bf57fcecc95832f90

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3-javadoc.jar.sha256

@@ -1 +0,0 @@
-e23216d8a0b231edf552797d0ae1016a93fe61b2a9f9c86793d70823ebdc0366

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3-javadoc.jar.sha512

@@ -1 +0,0 @@
-fdf40c31adb97dcb7148e5a9baf9e9a4e81bc1ad4c49ad5ab15dde5e9e26b8a99769e28ff2c7a550bd3b07454ebd17dfdf1420889133931f5807ae069954c72c

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3-sources.jar.md5

@@ -1 +0,0 @@
-fdef35879df2cce299f3f16c727070bc

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3-sources.jar.sha1

@@ -1 +0,0 @@
-0ac9fc259a6e579927235b5eacf3754be08c13c0

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3-sources.jar.sha256

@@ -1 +0,0 @@
-a943ced74e59265f399038779bc15fa9c46ab09625944de1f6be7eb116e336a9

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3-sources.jar.sha512

@@ -1 +0,0 @@
-e8f641e91a1cb7c3bcfe8f257b9911a041a16ca26575d64ab2d9b45f90190d3eeb4fcc85a41d183c166a8da97214ad4a952b4847e38bbedfcd634bd13c3b440d

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3.aar.md5

@@ -1 +0,0 @@
-e89d3204dcda439e4deb0df61603394a

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3.aar.sha1

@@ -1 +0,0 @@
-eda5c226e954731b3dbd16becbab72f66888d5ce

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3.aar.sha256

@@ -1 +0,0 @@
-4da9ab41881efc27c7268bff2bfbb7092d9dbdf6de8f43787b4df649f0291bff

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3.aar.sha512

@@ -1 +0,0 @@
-c63bf901eb0327ca3791b419f99dd67060a9b48a816da5c71e7e660e60fed607347ef8f76710969e9497054cc4f99add8db19f47b7e780ee3e6413df6d75e195

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3.pom.md5

@@ -1 +0,0 @@
-2b4ab6a8105cd7c00fd4380744d398b1

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3.pom.sha1

@@ -1 +0,0 @@
-f820034eb82e53f52b44ebc6080cf20b61b3fe14

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3.pom.sha256

@@ -1 +0,0 @@
-7eaaf62df1f06a4d5d300eebd8613433802ff396454889f62772d5b40a21116c

package/Detox-android/com/wix/detox/21.0.0-rc.3/detox-21.0.0-rc.3.pom.sha512

@@ -1 +0,0 @@
-32130087dfe4ff8f5c10f68c31b8f8f23e479d35f624cf49177efadec68ea02e91e23a35de534f455238748273f15b0978a03240bf6ccb718d4eb181077f6a72

package/src/invoke/EarlGrey.js

@@ -1,8 +0,0 @@
-const instance = {
-  type: 'EarlGrey',
-  value: 'instance'
-};
-
-module.exports = {
-  instance
-};