detox 20.13.1-smoke.0 → 20.13.1

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1-javadoc.jar.md5

@@ -0,0 +1 @@
+f3048894c00a7239bb094b235bc2d49e

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1-javadoc.jar.sha1

@@ -0,0 +1 @@
+fe7331cc4ce84d9a0a473df7ac13c9e80f3e8122

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1-javadoc.jar.sha256

@@ -0,0 +1 @@
+60182f1b4783500cc206014da0334a980c4c346af6171d0b59cb68c53f8198ba

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1-javadoc.jar.sha512

@@ -0,0 +1 @@
+add43f620967550f42cfd555508e63e0ae6a1b290e4a3fd5ae5c81c30b03a33e319237e2a35aec2e7e073b2b68792ce814c5eb4379199e52e837834088b108f2

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1-sources.jar.md5

@@ -0,0 +1 @@
+886ac12a5c1768ae354b67634f9b76f3

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1-sources.jar.sha1

@@ -0,0 +1 @@
+1107bc5be81ab2b5ff830def4f031d0b01dbe3ff

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1-sources.jar.sha256

@@ -0,0 +1 @@
+044d09df3e2350e3be4a28d94f9d7a28d83f0050df86009b9f4adbd6e07c4bb7

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1-sources.jar.sha512

@@ -0,0 +1 @@
+b6220370f4427f279716c3cc38994508f180613325632ce0fc403a618b98856ca7f652866921492edefb3b37c3ae1abaede15118a0babdf335c6eda860afd5ae

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1.aar.md5

@@ -0,0 +1 @@
+dbb846f9545df1e8042051370f926473

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1.aar.sha1

@@ -0,0 +1 @@
+0ff4c3089c909efba5c879ee597721d24a8bdedc

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1.aar.sha256

@@ -0,0 +1 @@
+adf0b93b184196e06817be10bc2f55eee14bf91563943201286e67b2ab269325

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1.aar.sha512

@@ -0,0 +1 @@
+89e7cce601a45bdaf00431a49b0b31acebb728cb396ef8f907a64a2df29994b489ea60ba506fc077c1cd9a646af61a3a758cc24cff0fcef6683b5dfb33ad0532

package/Detox-android/com/wix/detox/{20.13.1-smoke.0/detox-20.13.1-smoke.0.pom → 20.13.1/detox-20.13.1.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.13.1-smoke.0</version>
+  <version>20.13.1</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1.pom.md5

@@ -0,0 +1 @@
+0b4cb7f546b00ab288c8b8934ec5df15

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1.pom.sha1

@@ -0,0 +1 @@
+9c9cfae28804199f84ae39e92c6342138832e2aa

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1.pom.sha256

@@ -0,0 +1 @@
+e985b88e29ba47ae610f1e2c53d325c3758bdc782601bae7756af9830f87405c

package/Detox-android/com/wix/detox/20.13.1/detox-20.13.1.pom.sha512

@@ -0,0 +1 @@
+37d9a34021dc6037c9ea3dc6a75b87a2db7d80846317de0553d613d4a31bf8351978b08e437fefb30ddc48285ed4a3717c432bddec95c37297d7444125f0ee32

package/Detox-android/com/wix/detox/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.13.1-smoke.0</latest>
-    <release>20.13.1-smoke.0</release>
+    <latest>20.13.1</latest>
+    <release>20.13.1</release>
     <versions>
-      <version>20.13.1-smoke.0</version>
+      <version>20.13.1</version>
     </versions>
-    <lastUpdated>20231013072538</lastUpdated>
+    <lastUpdated>20231017103107</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox/maven-metadata.xml.md5

@@ -1 +1 @@
-d2a9c4ea918b24f4cf98e1194d3fafd2
+2ddb509ae274082e1984a04747bccde0

package/Detox-android/com/wix/detox/maven-metadata.xml.sha1

@@ -1 +1 @@
-90e450b35693d5015c5ac0dc212700fbe1780c10
+27b69ce339b28cfdebc60df88f5d2de0e701a5d7

package/Detox-android/com/wix/detox/maven-metadata.xml.sha256

@@ -1 +1 @@
-ee38fbc385e4c227685a4fc0290cda3a77f6056cc27e914db9b055c9ac14c66d
+811be0afe328d42e2961903914b5c394478ecd9dd66fc3dc84bc30dc43ef0467

package/Detox-android/com/wix/detox/maven-metadata.xml.sha512

@@ -1 +1 @@
-4fca6bd96454869278ee77d1e116e4f929a898943b979896ff04a7e618e52a5122278890227543e2b00e3968f997eec0a3cd6b7a91fe64b0a4f1e0ba36c0ffdb
+78bf003e41e1f29b9ebcaa7f7e364f347217bf9ed06f1d700b3a363a39c959884834f6296715da89b9744436c8e11347625dd1a03a9746e87f9d5b784a2c5261

package/android/detox/src/full/java/com/wix/detox/espresso/web/WebElement.java

@@ -62,12 +62,12 @@ public class WebElement {
         return getWebViewInteraction().withElement(get()).perform(DriverAtoms.getText()).get();
     }
 
-    public Evaluation runScript(String script) {
-        return getWebViewInteraction().withElement(get()).perform(new SimpleAtom(script)).get();
+    public Object runScript(String script) {
+        return getWebViewInteraction().withElement(get()).perform(new SimpleAtom(script)).get().getValue();
     }
 
-    public Evaluation runScriptWithArgs(String script, final ArrayList<Object> args) {
-        return getWebViewInteraction().withElement(get()).perform(Atoms.scriptWithArgs(script, args)).get();
+    public Object runScriptWithArgs(String script, final ArrayList<Object> args) {
+        return getWebViewInteraction().withElement(get()).perform(Atoms.scriptWithArgs(script, args)).get().getValue();
     }
 
     public String getCurrentUrl() {

package/android/detox/src/full/java/com/wix/invoke/types/Invocation.java

@@ -68,9 +68,9 @@ public class Invocation {
                 argument = args.get(i);
             } else if(args.get(i).getClass() == JSONArray.class) {
                 JSONArray jsonArray = (JSONArray) args.get(i);
-                List<String> list = new ArrayList<>();
+                List<Object> list = new ArrayList<>();
                 for (int j = 0; j < jsonArray.length(); j++) {
-                    list.add(jsonArray.getString(j));
+                    list.add(jsonArray.get(j));
                 }
                 argument = list;
             } else {

package/android/detox/src/testFull/java/com/wix/invoke/JsonParserTest.java

@@ -7,6 +7,7 @@ import com.wix.invoke.types.ClassTarget;
 import com.wix.invoke.types.Invocation;
 import com.wix.invoke.types.InvocationTarget;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
@@ -21,20 +22,20 @@ public class JsonParserTest {
     @Test
     public void targetClassStaticMethodNoParams() {
         Invocation invocation = new Invocation(new ClassTarget("java.lang.System"), "lineSeparator");
-        assertThat(parse("targetClassStaticMethodNoParams.json")).isEqualToComparingFieldByFieldRecursively(invocation);
+        assertThat(parse("targetClassStaticMethodNoParams.json")).usingRecursiveComparison().isEqualTo(invocation);
     }
 
     @Test
     public void parseTargetClassStaticMethodOneParam() {
         Invocation invocation = new Invocation(new ClassTarget("java.lang.String"), "valueOf", 1.0f);
-        assertThat(parse("targetClassStaticMethodOneParam.json")).isEqualToComparingFieldByFieldRecursively(invocation);
+        assertThat(parse("targetClassStaticMethodOneParam.json")).usingRecursiveComparison().isEqualTo(invocation);
     }
 
     @Test
     public void targetInvocationMethodOfClassStaticMethodOneParam() {
         Invocation innerInvocation = new Invocation(new ClassTarget("java.lang.String"), "valueOf", 1.0f);
         Invocation outerInvocation = new Invocation(new InvocationTarget(innerInvocation), "length");
-        assertThat(parse("targetInvocationMethodOfClassStaticMethodOneParam.json")).isEqualToComparingFieldByFieldRecursively(outerInvocation);
+        assertThat(parse("targetInvocationMethodOfClassStaticMethodOneParam.json")).usingRecursiveComparison().isEqualTo(outerInvocation);
     }
 
     @Test
@@ -46,7 +47,7 @@ public class JsonParserTest {
         Invocation perform = new Invocation(new InvocationTarget(onView), "perform", click);
 
 
-        assertThat(parse("targetInvocationEspresso.json")).isEqualToComparingFieldByFieldRecursively(perform);
+        assertThat(parse("targetInvocationEspresso.json")).usingRecursiveComparison().isEqualTo(perform);
     }
 
 
@@ -59,7 +60,7 @@ public class JsonParserTest {
         Invocation click = new Invocation(new ClassTarget("android.support.test.espresso.action.ViewActions"), "click");
         Invocation perform = new Invocation(new ClassTarget("com.wix.detox.espresso.EspressoDetox"), "perform", onView, click);
 
-        assertThat(parse("targetInvocationEspressoDetox.json")).isEqualToComparingFieldByFieldRecursively(perform);
+        assertThat(parse("targetInvocationEspressoDetox.json")).usingRecursiveComparison().isEqualTo(perform);
     }
 
     @Test
@@ -73,12 +74,27 @@ public class JsonParserTest {
         assertThat(parse("targetInvocationEspressoWebDetox.json")).usingRecursiveComparison().isEqualTo(tap);
     }
 
+    @Test
+    public void fromJsonTargetInvocationEspressoWebDetoxScript() throws JSONException {
+        Invocation getWebView = new Invocation(new ClassTarget("com.wix.detox.espresso.web.EspressoWebDetox"), "getWebView");
+        Invocation matcher = new Invocation(new ClassTarget("com.wix.detox.espresso.web.DetoxWebAtomMatcher"), "matcherForId", "textInput");
+        Invocation element = new Invocation(new InvocationTarget(getWebView), "element", matcher, 0);
+
+        String script = "function(el,arg1){}";
+        ArrayList<Object> scriptArguments = new ArrayList<>();
+        JSONArray arg1 = new JSONArray("[{ \"b\": true, \"n\": 1, \"s\": \"1\" }]");
+        scriptArguments.add(arg1);
+
+        Invocation runScriptWithArgs = new Invocation(new InvocationTarget(element), "runScriptWithArgs", script, scriptArguments);
+        assertThat(parse("targetInvocationEspressoWebDetoxScript.json")).usingRecursiveComparison().isEqualTo(runScriptWithArgs);
+    }
+
     @Test
     public void fromJsonTargetInvocationWithListParams() {
         ArrayList<String> params = new ArrayList<>();
         params.add(".*10.0.2.2.*");
         Invocation test = new Invocation(new ClassTarget("com.wix.detox.espresso.EspressoDetox"), "setURLBlacklist", params);
-        assertThat(parse("fromJsonTargetInvocationWithListParams.json")).isEqualToComparingFieldByFieldRecursively(test);
+        assertThat(parse("fromJsonTargetInvocationWithListParams.json")).usingRecursiveComparison().isEqualTo(test);
     }
 
     public Invocation parseString(String jsonString) {
@@ -95,4 +111,4 @@ public class JsonParserTest {
         String jsonString = TestUtils.jsonFileToString(filePath);
         return parseString(jsonString);
     }
-}
+}

package/android/detox/src/testFull/resources/targetInvocationEspressoWebDetoxScript.json

@@ -0,0 +1,47 @@
+{
+  "target":{
+    "type":"Invocation",
+    "value":{
+      "target":{
+        "type":"Invocation",
+        "value":{
+          "target":{
+            "type":"Class",
+            "value":"com.wix.detox.espresso.web.EspressoWebDetox"
+          },
+          "method":"getWebView",
+          "args":[
+
+          ]
+        }
+      },
+      "method":"element",
+      "args":[
+        {
+          "type":"Invocation",
+          "value":{
+            "target":{
+              "type":"Class",
+              "value":"com.wix.detox.espresso.web.DetoxWebAtomMatcher"
+            },
+            "method":"matcherForId",
+            "args":[
+              "textInput"
+            ]
+          }
+        },
+        {
+          "type":"Integer",
+          "value":0
+        }
+      ]
+    }
+  },
+  "method": "runScriptWithArgs",
+  "args": [
+    "function(el,arg1){}",
+    [
+      [{ "b": true, "n": 1, "s": "1" }]
+    ]
+  ]
+}

package/index.d.ts

@@ -1571,19 +1571,22 @@ declare global {
             moveCursorToEnd(): Promise<void>;
 
             /**
-             * Running a script on the element
-             * @param script a method that accept the element as its first arg
-             * @example function foo(element) { console.log(element); }
-             */
-            runScript(script: string): Promise<any>;
-
-            /**
-             * Running a script on the element that accept args
-             * @param script a method that accept few args, and the element as the last arg.
-             * @param args a list of args to pass to the script
-             * @example function foo(a, b, c, element) { console.log(`${a}, ${b}, ${c}, ${element}`)}
+             * Running a JavaScript function on the element.
+             * The first argument to the function will be the element itself.
+             * The rest of the arguments will be forwarded to the JavaScript function as is.
+             *
+             * @param script a callback function in stringified form, or a plain function reference
+             * without closures, bindings etc. that will be converted to a string.
+             * @param args optional args to pass to the script
+             *
+             * @example
+             * await webElement.runScript('(el) => el.click()');
+             * await webElement.runScript(function setText(element, text) {
+             *   element.textContent = text;
+             * }, ['Custom Title']);
              */
-            runScriptWithArgs(script: string, args: any[]): Promise<any>;
+            runScript(script: string, args?: unknown[]): Promise<any>;
+            runScript<F>(script: (...args: any[]) => F, args?: unknown[]): Promise<F>;
 
             /**
              * Gets the current page url

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.13.1-smoke.0",
+  "version": "20.13.1",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -109,5 +109,5 @@
   "browserslist": [
     "node 14"
   ],
-  "gitHead": "d43265d95231032ed53eea6d0ef87d689d61c5e8"
+  "gitHead": "a6fdfe461358d7b00d65af7230911ef7f9cc9366"
 }

package/src/android/core/WebElement.js

@@ -1,5 +1,7 @@
 const DetoxRuntimeError = require('../../errors/DetoxRuntimeError');
 const invoke = require('../../invoke');
+const assertIsFunction = require('../../utils/assertIsFunction');
+const isArrowFunction = require('../../utils/isArrowFunction');
 const actions = require('../actions/web');
 const EspressoWebDetoxApi = require('../espressoapi/web/EspressoWebDetox');
 const WebViewElementApi = require('../espressoapi/web/WebViewElement');
@@ -73,12 +75,14 @@ class WebElement {
     return await new ActionInteraction(this[_invocationManager], new actions.WebMoveCursorEnd(this)).execute();
   }
 
-  async runScript(script) {
-    return await new ActionInteraction(this[_invocationManager], new actions.WebRunScriptAction(this, script)).execute();
-  }
+  async runScript(maybeFunction, args) {
+    const script = stringifyScript(maybeFunction);
 
-  async runScriptWithArgs(script, args) {
-    return await new ActionInteraction(this[_invocationManager], new actions.WebRunScriptWithArgsAction(this, script, args)).execute();
+    if (args) {
+      return await new ActionInteraction(this[_invocationManager], new actions.WebRunScriptWithArgsAction(this, script, args)).execute();
+    } else {
+      return await new ActionInteraction(this[_invocationManager], new actions.WebRunScriptAction(this, script)).execute();
+    }
   }
 
   async getCurrentUrl() {
@@ -120,6 +124,20 @@ class WebViewElement {
   }
 }
 
+function stringifyScript(maybeFunction) {
+  if (typeof maybeFunction !== 'string' && typeof maybeFunction !== 'function') {
+    return maybeFunction;
+  }
+
+  const script = (typeof maybeFunction === 'function' ? maybeFunction.toString() : assertIsFunction(maybeFunction)).trim();
+  // WebElement interactions don't support arrow functions for some reason.
+  if (isArrowFunction(script)) {
+    return `function arrowWorkaround() { return (${script}).apply(this, arguments); }`;
+  }
+
+  return script;
+}
+
 module.exports = {
   WebElement,
   WebViewElement,

package/src/android/espressoapi/web/WebElement.js

@@ -76,10 +76,7 @@ class WebElement {
     return {
       target: element,
       method: "runScriptWithArgs",
-      args: [script, {
-        type: "ArrayList<Object>",
-        value: args
-      }]
+      args: [script, args]
     };
   }
 

package/src/utils/assertIsFunction.js

@@ -0,0 +1,35 @@
+const isArrowFunction = require('./isArrowFunction');
+
+const EXAMPLE = `Here are some examples of valid function strings:
+
+1. function(el) { el.click(); }
+2. el => el.click()
+3. (el) => el.click()
+`;
+
+/**
+ * Dynamically evaluates a string as a function and throws an error if it's not a function
+ * @param {string} str serialized function like 'function() { return 42; }'
+ */
+function assertIsFunction(str) {
+  let isFunction;
+
+  try {
+    isFunction = isFunctionDeclaration(str) && Function(`return typeof (${str})`)() === 'function';
+  } catch (e) {
+    isFunction = false;
+  }
+
+  if (!isFunction) {
+    throw new TypeError(`Expected a valid function string, but got: ${str}\n\n${EXAMPLE}`);
+  }
+
+  return str;
+}
+
+function isFunctionDeclaration(rawStr) {
+  const str = rawStr.trimStart();
+  return str.startsWith('async') || str.startsWith('function') || isArrowFunction(str);
+}
+
+module.exports = assertIsFunction;

package/src/utils/isArrowFunction.js

@@ -0,0 +1,24 @@
+function isArrowFunction(code) {
+  if (!code.includes('=>')) {
+    return false;
+  }
+
+  const syncCode = removeAsync(code.trimStart());
+  return syncCode.startsWith('(') || isSimpleArrowFunction(code);
+}
+
+function removeAsync(code) {
+  return code.startsWith('async') ? code.slice(5).trimStart() : code;
+}
+
+function isSimpleArrowFunction(code) {
+  const [signature] = code.split('=>', 1);
+
+  return isAlphanumericId(removeAsync(signature.trim()));
+}
+
+function isAlphanumericId(code) {
+  return /^[a-zA-Z0-9]+$/.test(code);
+}
+
+module.exports = isArrowFunction;

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0-javadoc.jar.md5

@@ -1 +0,0 @@
-f11641164a4f2ccb3b0b9de91e399646

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-97c103ba6e127dbe2dc1b47a972aa3ae9a4e1d65

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-00f9de5a01b9153372c3675054b3cfbcdafa40c5ce88ba851ef71e17d0b61454

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-c88f0877227029128911cdb592c899db3431279e3338ab0b28aef8a6dff658384d628aebf05b08538adb3127ca3d897cc7241101e722965560100015b3cb0bba

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0-sources.jar.md5

@@ -1 +0,0 @@
-1b4b53835ca72328129cda1007497a31

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0-sources.jar.sha1

@@ -1 +0,0 @@
-3e27db4c54c0ce44edfef999eef17d8d326f2a70

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0-sources.jar.sha256

@@ -1 +0,0 @@
-11b9a7566d6654e66fbfb76a92da02bfbab8c97463199839590d2c0ea2307dc4

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0-sources.jar.sha512

@@ -1 +0,0 @@
-ba73a0da52b6d571c6aa370df12e4f65db8424dcdb2450f83825d9abf0faf3f54211eec8d392dc689a191e09aff1396312a551b280d17710d7bb4cc8d2e2e356

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0.aar.md5

@@ -1 +0,0 @@
-02670d8571dd840d7c1e604d43356b33

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0.aar.sha1

@@ -1 +0,0 @@
-4580dad60e33036c50d19b34a9fe021be5304ac8

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0.aar.sha256

@@ -1 +0,0 @@
-d843d03b68588878b7afdcd99421527b3a60145afb450f01e7aea0263c9232ea

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0.aar.sha512

@@ -1 +0,0 @@
-f6ac58b1b02c9fe567cb29c2ecdf28f8ef7fb092438eafcbdcb7f2ba5a64f7a4a725d1d6a021421b19ea78f619feead3051ff129164a25e0e031985f1e635539

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0.pom.md5

@@ -1 +0,0 @@
-bfae4a3d65c10d4f5e1720d34350c38c

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0.pom.sha1

@@ -1 +0,0 @@
-c963c4f616a8a6a534567a173f313b49937ae402

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0.pom.sha256

@@ -1 +0,0 @@
-d12f147001264686f12bc4b1b3af172aa4c55a704f12cb31e328ad4f0fd5d8f5

package/Detox-android/com/wix/detox/20.13.1-smoke.0/detox-20.13.1-smoke.0.pom.sha512

@@ -1 +0,0 @@
-917b7c2836e3f46c1bc94c01bdd819b740e4d45e197aac6cf80cbaf9e84f3e582d3c43cfdb31d68ce1cf2673b900b5f9b7c52ec94e005eb6ac113050e54399f6