detox 19.12.1 → 19.12.3

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

@@ -0,0 +1 @@
+6be640bbb26a68100ac9dc523a8968e2

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

@@ -0,0 +1 @@
+c41568eb3c834b8637495b4e5e0cb1a009c5c885

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

@@ -0,0 +1 @@
+a8679c6f6491725d8848c0544990477011148e16f58ea0df9b1e92980e59ff30

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

@@ -0,0 +1 @@
+67cb77995d9b1b38c0a56151c55265bbbc9b04efe546f6f8ce6e16af83e21c61a6825f4fc66e98880448b74f454223116dbe3856cd69ed30e19170afc73841f4

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

@@ -0,0 +1 @@
+7a6072a3ec1ebe22a490ec3fc828132e

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

@@ -0,0 +1 @@
+b7fc93850b4c5927a53b349ce098367de13fa60e

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

@@ -0,0 +1 @@
+29ef40f0881caa19b79937690b21fcc90ba182de06618854b527f81718629ca5

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

@@ -0,0 +1 @@
+6fb34a891f06385672ac7395f8e2b8b7142437e279e4486b9c6ac96663b229343c3133d0e214de2e85c4b66d7687087a06683fc311efece0d6b5072c2997d856

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

@@ -0,0 +1 @@
+2c7931e2f81f1c416737d98c54c5ec03

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

@@ -0,0 +1 @@
+ff7ab3b06537dedb033cdef008d5754ccd657085

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

@@ -0,0 +1 @@
+841142d217e137188dda87896be9a2fbc02516b9d289477f57afca3a2576dc63

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

@@ -0,0 +1 @@
+82a2c3f1ac41a8d5da57c7435f05ae23fedf75425b30125873d8f96aaba53b6c3a77ce1faff0973df8a31db16864ed8ec00480f3272489ca49d8e88e2ec7d46a

package/Detox-android/com/wix/detox/{19.12.1-prerelease.0/detox-19.12.1-prerelease.0.pom → 19.12.3/detox-19.12.3.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>19.12.1-prerelease.0</version>
+  <version>19.12.3</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/19.12.3/detox-19.12.3.pom.md5

@@ -0,0 +1 @@
+4457baf485c76fa55b2a381be247b377

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

@@ -0,0 +1 @@
+11f0a9cbc34082223f45c47b0e07add7f3a43ed2

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

@@ -0,0 +1 @@
+dee5704c35164889242458000b7044f2f900c1d98e89e6aa90d3387af883b740

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

@@ -0,0 +1 @@
+4db7b2382132ff6f4456dd2a4e22d22af57205212234003e37c4539d624f6d1dd73bb11a5f792f57eb3575a983347668c629f87804b3fd2fb3b23432df3b93ed

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>19.12.1-prerelease.0</latest>
-    <release>19.12.1-prerelease.0</release>
+    <latest>19.12.3</latest>
+    <release>19.12.3</release>
     <versions>
-      <version>19.12.1-prerelease.0</version>
+      <version>19.12.3</version>
     </versions>
-    <lastUpdated>20220908095913</lastUpdated>
+    <lastUpdated>20220929163901</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-3260b4e5892c8adbf429cd00a7bcd49f
+99f562827b42a1dfca170dd13a9d2b9d

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

@@ -1 +1 @@
-3cb2e8fe8742f97d4cbb2e1af530268b10e5f67f
+297506da369f3558785d225ec4265a457d9b75a7

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

@@ -1 +1 @@
-276bed43bb302094199de8720e2438255110faf3c1c71e7869d421af33ba3a1c
+12a12e3cc2f93e0a2cb3dd463224174f56d7cae8e2a7b726da43710216adfc59

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

@@ -1 +1 @@
-e1ed52b051858ef98392e39889d05c7e5c9dfb6ca5d030ce72080da447ccdf2f8eaae6e91576e8b451e493258cbb538ac91227cced71b47b6659897840bc2867
+395c54bd07efdf7b403c5f8e19a0fb2ee698fa4bf51945095c061e53797903d8fddd6f93c1e69f37e5c77b84736e769d9f64cb82705e7a57a79e791c37bc1c2f

package/android/detox/proguard-rules.pro

@@ -13,6 +13,9 @@
 -dontnote org.hamcrest.**
 -dontnote com.facebook.**
 
+-keep class org.apache.commons.lang3.** { *; }
+-keep class org.apache.commons.io.** { *; }
+
 # Detox profiler (optional)
 
 -keep class com.wix.detoxprofiler.** { *; }

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/IdlingResourceDescription.kt

@@ -1,20 +1,26 @@
 package com.wix.detox.reactnative.idlingresources
 
 class IdlingResourceDescription private constructor(
-  private val name: String,
-  private val description: Map<String, Any>) {
-    fun json(): Map<String, Any> = mutableMapOf<String, Any>("name" to name)
-      .apply { if (description.isNotEmpty()) put("description", description) }
+    private val name: String,
+    private val description: Map<String, Any>) {
 
-    override fun equals(other: Any?): Boolean = other is IdlingResourceDescription &&
-        other.json() == this.json()
+    fun json() =
+        mutableMapOf<String, Any>("name" to name)
+          .apply {
+            if (description.isNotEmpty()) put("description", description)
+          }.toMap()
 
-    data class Builder(
-      var name: String = "unknown",
-      var description: MutableMap<String, Any> = mutableMapOf()) {
+    override fun equals(other: Any?) =
+      (other is IdlingResourceDescription && other.json() == this.json())
+
+    override fun hashCode(): Int =
+      (31 * name.hashCode() + description.hashCode())
 
-        fun name(name: String) = apply { this.name = name }
-        fun addDescription(key: String, value: Any) = apply { this.description[key] = value }
-        fun build() = IdlingResourceDescription(name, description)
-    }
+    data class Builder(
+        var name: String = "unknown",
+        var description: MutableMap<String, Any> = mutableMapOf()) {
+            fun name(value: String) = apply { name = value }
+            fun addDescription(key: String, value: Any) = apply { description[key] = value }
+            fun build() = IdlingResourceDescription(name, description)
+      }
 }

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/NetworkIdlingResource.java

@@ -69,42 +69,13 @@ public class NetworkIdlingResource extends DetoxBaseIdlingResource implements Ch
 
     @NotNull
     @Override
-    public IdlingResourceDescription getDescription() {
+    public synchronized IdlingResourceDescription getDescription() {
         return new IdlingResourceDescription.Builder()
                 .name("network")
                 .addDescription("urls", new ArrayList<>(busyResources))
                 .build();
     }
 
-    @Override
-    protected boolean checkIdle() {
-        boolean idle = true;
-        busyResources.clear();
-        List<Call> calls = dispatcher.runningCalls();
-        for (Call call : calls) {
-            idle = false;
-            String url = call.request().url().toString();
-            for (Pattern pattern : blacklist) {
-                if (pattern.matcher(url).matches()) {
-                    idle = true;
-                    break;
-                }
-            }
-            if (!idle) {
-                busyResources.add(call.request().url().toString());
-            }
-        }
-        if (!idle) {
-            Choreographer.getInstance().postFrameCallback(this);
-            Log.i(LOG_TAG, "Network is busy");
-        } else {
-            if (callback != null) {
-                callback.onTransitionToIdle();
-            }
-        }
-        return idle;
-    }
-
     @Override
     public void registerIdleTransitionCallback(ResourceCallback callback) {
         this.callback = callback;
@@ -116,10 +87,42 @@ public class NetworkIdlingResource extends DetoxBaseIdlingResource implements Ch
         isIdleNow();
     }
 
+    @Override
+    protected synchronized boolean checkIdle() {
+        busyResources.clear();
+
+        List<Call> calls = dispatcher.runningCalls();
+        for (Call call: calls) {
+            final String url = call.request().url().toString();
+
+            if (!isUrlBlacklisted(url)) {
+                busyResources.add(url);
+            }
+        }
+
+        if (!busyResources.isEmpty()) {
+            Log.i(LOG_TAG, "Network is busy, with " + busyResources.size() + " in-flight calls");
+            Choreographer.getInstance().postFrameCallback(this);
+            return false;
+        }
+
+        notifyIdle();
+        return true;
+    }
+
     @Override
     protected void notifyIdle() {
         if (callback != null) {
             callback.onTransitionToIdle();
         }
     }
+
+    private boolean isUrlBlacklisted(String url) {
+        for (Pattern pattern: blacklist) {
+            if (pattern.matcher(url).matches()) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/NetworkIdlingResourcesTest.kt

@@ -0,0 +1,61 @@
+package com.wix.detox.reactnative.idlingresources
+
+import com.wix.detox.UTHelpers.yieldToOtherThreads
+import org.assertj.core.api.Assertions.assertThat
+
+import okhttp3.Dispatcher
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import java.util.concurrent.Executors
+
+@RunWith(RobolectricTestRunner::class)
+class NetworkIdlingResourcesTest {
+    lateinit var dispatcher: Dispatcher
+    lateinit var uut: NetworkIdlingResource
+
+    @Before
+    fun setup() {
+        dispatcher = Dispatcher()
+        uut = NetworkIdlingResource(dispatcher)
+    }
+
+    // Note: Ideally, we should test that the list of busy resources is protected,
+    // rather than testing thread-safety as a whole.
+    @Test
+    fun `should return the description in a thread-safe way`() {
+        val localExecutor = Executors.newSingleThreadExecutor()
+        var description: IdlingResourceDescription? = null
+
+        synchronized(uut) {
+            localExecutor.submit {
+                description = uut.getDescription()
+            }
+
+            yieldToOtherThreads(localExecutor)
+            assertThat(description).isNull()
+        }
+        yieldToOtherThreads(localExecutor)
+        assertThat(description).isNotNull()
+    }
+
+    // Note: Ideally, we should test that the list of busy resources is protected,
+    // rather than testing thread-safety as a whole.
+    @Test
+    fun `should check for idle in a thread-safe way`() {
+        val localExecutor = Executors.newSingleThreadExecutor()
+        var idle = false
+
+        synchronized(uut) {
+            localExecutor.submit {
+                idle = uut.isIdleNow
+            }
+
+            yieldToOtherThreads(localExecutor)
+            assertThat(idle).isFalse
+        }
+        yieldToOtherThreads(localExecutor)
+        assertThat(idle).isTrue
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "19.12.1",
+  "version": "19.12.3",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -177,5 +177,5 @@
       }
     }
   },
-  "gitHead": "d47d878de8431f581a558b7458ad68e961cb91d5"
+  "gitHead": "23bf330e395a488a6d7334db29a0fe289ce302f6"
 }

package/src/client/actions/formatters/sync-resources/NetworkFormatter.js

@@ -1,7 +1,7 @@
 const { makeResourceTitle, makeResourceSubTitle } = require('./utils');
 
 function makeURLDescription(url, urlCount) {
-  return makeResourceSubTitle(`URL #${urlCount}: ${url}.`);
+  return makeResourceSubTitle(`URL #${urlCount}: ${url}`);
 }
 
 module.exports = function(properties) {

package/src/devices/common/drivers/ios/tools/AppleSimUtils.js

@@ -132,6 +132,30 @@ class AppleSimUtils {
   }
 
   async sendToHome(udid) {
+    if (await this._isSpringBoardInaccessible(udid)) {
+      // SpringBoard is not directly accessible by Simctl on iOS 16.0 and above, therefore we launch and terminate the
+      // Settings app instead. This sends the currently open app to the background and brings the home screen to the
+      // foreground.
+      await this._launchAndTerminateSettings(udid);
+      return;
+    }
+
+    await this._launchSpringBoard(udid);
+  }
+
+  async _isSpringBoardInaccessible(udid) {
+    const device = await this._findDeviceByUDID(udid);
+    const majorIOSVersion = parseInt(device.os.version.split('.')[0]);
+    return majorIOSVersion >= 16;
+  }
+
+  async _launchAndTerminateSettings(udid) {
+    const bundleId = 'com.apple.Preferences';
+    await this._execSimctl({ cmd: `launch ${udid} ${bundleId}`, retries: 10 });
+    await this._execSimctl({ cmd: `terminate ${udid} ${bundleId}`, retries: 10 });
+  }
+
+  async _launchSpringBoard(udid) {
     await this._execSimctl({ cmd: `launch ${udid} com.apple.springboard`, retries: 10 });
   }
 
@@ -246,7 +270,7 @@ class AppleSimUtils {
       // ```
       // This workaround is done to ignore the error above, as we do not care if the app was running before, we just
       // want to make sure it isn't now.
-      if (err.code === 3 && 
+      if (err.code === 3 &&
           (err.stderr.includes(`the app is not currently running`) ||
            err.stderr.includes(`The operation couldn’t be completed. found nothing to terminate`))) {
         return;

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0-javadoc.jar.md5

@@ -1 +0,0 @@
-a035191b581e1fe1fa995e9391089864

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-f8e27239ed726b6595f4a96e279d35971bc43f56

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-928268a34c865197f129e1bd3f1a0312933ece9504b28f47b5cb4e14285677b5

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-7a63c5b47bc122e758280062930df857698bfe82a5593dfff3312153b4a3462bda6d1379e832b07840ac633b6dc630d31396bfbe562da7a07f3464034f3e9ae8

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0-sources.jar.md5

@@ -1 +0,0 @@
-eed1e9f72bf749fc669294b45060d62d

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0-sources.jar.sha1

@@ -1 +0,0 @@
-89c263a2ae95173263087859cfcffe74f835655b

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0-sources.jar.sha256

@@ -1 +0,0 @@
-013294faa9812b8f5a91517ee06b1277471192a8598da75a9d0ae3ea7b5d99ab

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0-sources.jar.sha512

@@ -1 +0,0 @@
-f2159bd60899a606b420ce9693a331fb359fe99ecbe40b1896f5049660588a98615ca2a20687a99d1f4f0c6bce69ef3df82bde336cd0b4a2fa3662e6235e30c5

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0.aar.md5

@@ -1 +0,0 @@
-2880dad223aa8eb4656fa2eb7f7b11d4

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0.aar.sha1

@@ -1 +0,0 @@
-0d1996a26206fea48387f32e06bed48097e23442

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0.aar.sha256

@@ -1 +0,0 @@
-00c9b8094189ba4f122899781ec77e372172d42bc6c66fcafa4cf3689591fd1f

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0.aar.sha512

@@ -1 +0,0 @@
-237c7b2f001531e1d3d779bf63e4892b6d478a5cecc35b1055490911865222bcbe7df58b1ba6876d09372cc881b5a4aa34bb0875f710e82fbe29210e7428166d

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0.pom.md5

@@ -1 +0,0 @@
-b8d18c9eea24ca929b6241e98fd7e141

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0.pom.sha1

@@ -1 +0,0 @@
-5845c5b4a1040b9ffdd25e84cda718edb81db94e

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0.pom.sha256

@@ -1 +0,0 @@
-b25852c88b6be313daf9ae68265f1a7343b05c5c9bcd2a7cafcf39e2163dbb3b

package/Detox-android/com/wix/detox/19.12.1-prerelease.0/detox-19.12.1-prerelease.0.pom.sha512

@@ -1 +0,0 @@
-35e3934e388e0769116c010427b5b811acc4f650a43f138e8bcbfaf95f75f8c2db4bda62879c581684efbfe6618c08c8389efafb55d659f118a108980c43bd5f