detox 21.0.0-rc.1 → 21.0.0-rc.10

package/android/detox/src/testFull/java/com/wix/detox/espresso/matcher/RegexMatcherTest.kt

@@ -0,0 +1,52 @@
+package com.wix.detox.espresso.matcher
+
+import org.junit.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class RegexMatcherTest {
+    @Test
+    fun `should work with string matching regex`() {
+        val input = "Hello, world!"
+        val regex = "/[A-Z][a-z]+, world!/"
+        assertTrue(input.matchesJSRegex(regex))
+    }
+
+    @Test
+    fun `should work with string not matching regex`() {
+        val input = "Hello, world!"
+        val regex = "/[A-Z]+, world!/"
+        assertFalse(input.matchesJSRegex(regex))
+    }
+
+    @Test
+    fun `should work with the 'i' flag`() {
+        val input = "Hello, world!"
+        val regex = "/[A-Z]+, woRlD!/i"
+        assertTrue(input.matchesJSRegex(regex))
+    }
+
+    @Test
+    fun `should work with the 's' flag`() {
+        val input = "Hello,\nworld!"
+        val regex = "/Hello,\\sworld!/s"
+        assertTrue(input.matchesJSRegex(regex))
+    }
+
+    @Test
+    fun `should work with the 'm' flag`() {
+        val input = "Hello,\nworld!"
+        val regex = "/^Hello,\\s.*!$/m"
+        assertTrue(input.matchesJSRegex(regex))
+    }
+
+    @Test
+    fun `should work with multiple flags, ignore casing`() {
+        val input = "Hello,\nworld!"
+        val regex = "/^heLLo,\\swOrld!/ISM"
+        assertTrue(input.matchesJSRegex(regex))
+    }
+}

package/android/detox/src/testFull/java/com/wix/detox/espresso/performer/ViewActionPerformerSpec.kt

@@ -0,0 +1,37 @@
+package com.wix.detox.espresso.performer
+
+import org.spekframework.spek2.Spek
+import org.spekframework.spek2.style.specification.describe
+import androidx.test.espresso.ViewAction
+import com.wix.detox.espresso.MultipleViewsAction
+import org.hamcrest.Matcher
+import org.mockito.Mockito.*
+import org.mockito.kotlin.mock
+
+object ViewActionPerformerSpec : Spek({
+
+    describe("ViewActionPerformer") {
+        context("forAction") {
+            context("given a regular ViewAction") {
+                val action = mock(ViewAction::class.java)
+
+                it("should return a SingleViewActionPerformer") {
+                    val performer = ViewActionPerformer.forAction(action)
+                    assert(performer is SingleViewActionPerformer)
+                }
+            }
+
+            context("given a MultipleViewsAction") {
+                val multipleViewsAction: ViewAction = mock(
+                    ViewAction::class.java,
+                    withSettings().extraInterfaces(MultipleViewsAction::class.java)
+                )
+
+                it("should return a MultipleViewsActionPerformer") {
+                    val performer = ViewActionPerformer.forAction(multipleViewsAction)
+                    assert(performer is MultipleViewsActionPerformer)
+                }
+            }
+        }
+    }
+})

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/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
 

package/android/rninfo.gradle

@@ -0,0 +1,25 @@
+import groovy.json.JsonSlurper
+
+def rnVersion = getRNVersion(project.rootDir)
+def rnMajorVer = getMajorVersion(rnVersion)
+println "[$project] RNInfo: detected React Native version: $rnVersion (major=$rnMajorVer)"
+
+project.ext.rnInfo = [
+    version: rnVersion,
+    majorVersion: rnMajorVer,
+    isRN69OrHigher: rnMajorVer >= 69,
+    isRN70OrHigher: rnMajorVer >= 70,
+    isRN71OrHigher: rnMajorVer >= 71,
+]
+
+private static def getRNVersion(workingDir) {
+    def jsonSlurper = new JsonSlurper()
+    Map<String, Object> packageJSON  = jsonSlurper.parse(new File("$workingDir/../node_modules/react-native/package.json"))
+    String rnVersion = packageJSON.get('version')
+    return rnVersion
+}
+
+private static def getMajorVersion(semanticVersion) {
+    Integer rnVersionMajor = semanticVersion.split('\\.')[1].toInteger()
+    return rnVersionMajor
+}

package/android/settings.gradle

@@ -1 +1,2 @@
-include ':detox'
+include ':detox'
+includeBuild('../node_modules/react-native-gradle-plugin')