detox 20.13.5 → 20.14.0-prerelease.0

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

@@ -0,0 +1 @@
+5aec7a3796623aa58d8d12e2a79a73d4

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

@@ -0,0 +1 @@
+3530c43ea00d627580747ee9f0d5863ca9813f37

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

@@ -0,0 +1 @@
+8e1b2ec062f53625f04682a7680f945a735f5ce1398779fc75053e06552d1df5

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

@@ -0,0 +1 @@
+609e6c6a9432b4e1ef6a4e0cce31001a69ea5fb95ea2396be34732e5e1cc80accb647c5c9003827cf69754918a3a814deb24d27f14047a3aa6297c92b764ef03

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

@@ -0,0 +1 @@
+a5d3efc29dc36129f22268aecde7ba01

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

@@ -0,0 +1 @@
+c2dffdb56581b4c26ed98b6775e222e1a4486c5e

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

@@ -0,0 +1 @@
+c9a52d8a32ecbc37230bcdbb9a4aa67411ca950311e5de327ec44694d77c8872

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

@@ -0,0 +1 @@
+402fd90cfcfc8ee4f7faa04e7915ab6f24580ef704dbe0b835bae434abe4bf749987cb7fcc52b6a1f7557275a3ca5e0205438aef2934966948dfdaa66335a162

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

@@ -0,0 +1 @@
+e4d79ca2a269e97059c4321c69b89508

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

@@ -0,0 +1 @@
+a5f8cbcf67d3d87d5036eb6f48372962c64dd12b

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

@@ -0,0 +1 @@
+b2459b4c1286baf4f608be3ec55a46688c92ab1a95d840769a3519b4f75c2ea4

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

@@ -0,0 +1 @@
+60375b1df9ce89baea8fb435985d83d2fde2a8013f3b12fb1d3e3391ef7ac14e98d10eff9b27fd44acc753c7764244fcb0d9934ce97c4beb534102247a9962f0

package/Detox-android/com/wix/detox/{20.13.5/detox-20.13.5.pom → 20.14.0-prerelease.0/detox-20.14.0-prerelease.0.pom}

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

@@ -0,0 +1 @@
+1e365cca25c5a49f1bf610fd76df8ff0

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

@@ -0,0 +1 @@
+6f1a93a3247a829d64f63a67830adc742dfef0b9

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

@@ -0,0 +1 @@
+c2745e1391bb64bed726bf43a1f624f79d13f0a2c7e4ccd9838b64df40d1e3ee

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

@@ -0,0 +1 @@
+ca4428ae0cdffbf5bb7967d24f29486735a29ee89bad794bfa451f12467744f48bab8a7adac1fdb73426951aec461ccf3bae0396994c6e4711d1ff347e85369b

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.13.5</latest>
-    <release>20.13.5</release>
+    <latest>20.14.0-prerelease.0</latest>
+    <release>20.14.0-prerelease.0</release>
     <versions>
-      <version>20.13.5</version>
+      <version>20.14.0-prerelease.0</version>
     </versions>
-    <lastUpdated>20231031123136</lastUpdated>
+    <lastUpdated>20231206150336</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-8e252c6a41f82c0f28319398cbe2271b
+374b144f9306034184388c9579fcda60

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

@@ -1 +1 @@
-3cabac25c64bf47e471ec9f665e64b864120fd95
+aeb72dae3a76fd71e383c8b1bbc7871bf39b5424

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

@@ -1 +1 @@
-759c7898b0ee76e88b9a3ef8ef5de8554fbf03d353fe056655cdb78349ebc820
+94e4275040ab622783723cea7783afc664a6b9759ea43e8d3c57b48e1eb34290

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

@@ -1 +1 @@
-823153db733db6842218f0694b986684eaa0c78d8866eadb09f047b3f201a6dbf52d0c9f3a58d159e1511f34e46c19fa14538bf4679eae61dc9137e00b416311
+8ed181a738180833c36cf5066afb55082d4067c3924e5f240deef147ee818058a09ad14f3a2800cb46538e67872fd79b8437561b37eadd9e2f9f7d38b5454285

package/android/detox/src/full/java/com/wix/detox/ActivityLaunchHelper.kt

@@ -0,0 +1,76 @@
+package com.wix.detox
+
+import android.app.Instrumentation.ActivityMonitor
+import android.content.Context
+import android.content.Intent
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+
+class ActivityLaunchHelper(private val activityTestRule: ActivityTestRule<*>) {
+
+    private val launchArgs = LaunchArgs()
+    private val intentsFactory = LaunchIntentsFactory()
+
+    fun launchActivityUnderTest() {
+        val intent = extractInitialIntent()
+        activityTestRule.launchActivity(intent)
+    }
+
+    fun launchMainActivity() {
+        val activity = activityTestRule.activity
+        launchActivitySync(intentsFactory.activityLaunchIntent(activity))
+    }
+
+    fun startActivityFromUrl(url: String) {
+        launchActivitySync(intentsFactory.intentWithUrl(url, false))
+    }
+
+    fun startActivityFromNotification(dataFilePath: String) {
+        val notificationData = NotificationDataParser(dataFilePath!!).toBundle()
+        val intent = intentsFactory.intentWithNotificationData(appContext, notificationData, false)
+        launchActivitySync(intent)
+    }
+
+    private fun extractInitialIntent(): Intent =
+        if (launchArgs.hasUrlOverride()) {
+            intentsFactory.intentWithUrl(launchArgs.urlOverride, true)
+        } else if (launchArgs.hasNotificationPath()) {
+            val notificationData = NotificationDataParser(launchArgs.notificationPath).toBundle()
+            intentsFactory.intentWithNotificationData(appContext, notificationData, true)
+        } else {
+            intentsFactory.cleanIntent()
+        }.also {
+            it.putExtra(INTENT_LAUNCH_ARGS_KEY, launchArgs.asIntentBundle())
+        }
+
+    private fun launchActivitySync(intent: Intent) {
+        // Ideally, we would just call sActivityTestRule.launchActivity(intent) and get it over with.
+        // BUT!!! as it turns out, Espresso has an issue where doing this for an activity running in the background
+        // would have Espresso set up an ActivityMonitor which will spend its time waiting for the activity to load, *without
+        // ever being released*. It will finally fail after a 45 seconds timeout.
+        // Without going into full details, it seems that activity test rules were not meant to be used this way. However,
+        // the all-new ActivityScenario implementation introduced in androidx could probably support this (e.g. by using
+        // dedicated methods such as moveToState(), which give better control over the lifecycle).
+        // In any case, this is the core reason for this issue: https://github.com/wix/Detox/issues/1125
+        // What it forces us to do, then, is this -
+        // 1. Launch the activity by "ourselves" from the OS (i.e. using context.startActivity()).
+        // 2. Set up an activity monitor by ourselves -- such that it would block until the activity is ready.
+        // ^ Hence the code below.
+        val activity = activityTestRule.activity
+        val activityMonitor = ActivityMonitor(activity.javaClass.name, null, true)
+        activity.startActivity(intent)
+
+        InstrumentationRegistry.getInstrumentation().run {
+            addMonitor(activityMonitor)
+            waitForMonitorWithTimeout(activityMonitor, ACTIVITY_LAUNCH_TIMEOUT)
+        }
+    }
+
+    private val appContext: Context
+        get() = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
+
+    companion object {
+        private const val INTENT_LAUNCH_ARGS_KEY = "launchArgs"
+        private const val ACTIVITY_LAUNCH_TIMEOUT = 10000L
+    }
+}

package/android/detox/src/full/java/com/wix/detox/Detox.java

@@ -1,18 +1,13 @@
 package com.wix.detox;
 
-import android.app.Activity;
-import android.app.Instrumentation;
 import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-
-import com.wix.detox.config.DetoxConfig;
-import com.wix.detox.espresso.UiControllerSpy;
 
 import androidx.annotation.NonNull;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
+import com.wix.detox.config.DetoxConfig;
+
 /**
  * <p>Static class.</p>
  *
@@ -67,12 +62,7 @@ import androidx.test.rule.ActivityTestRule;
  * <p>If not set, then Detox tests are no ops. So it's safe to mix it with other tests.</p>
  */
 public final class Detox {
-    private static final String INTENT_LAUNCH_ARGS_KEY = "launchArgs";
-    private static final long ACTIVITY_LAUNCH_TIMEOUT = 10000L;
-
-    private static final LaunchArgs sLaunchArgs = new LaunchArgs();
-    private static final LaunchIntentsFactory sIntentsFactory = new LaunchIntentsFactory();
-    private static ActivityTestRule sActivityTestRule;
+    private static ActivityLaunchHelper sActivityLaunchHelper;
 
     private Detox() {
     }
@@ -132,15 +122,10 @@ public final class Detox {
         DetoxConfig.CONFIG = detoxConfig;
         DetoxConfig.CONFIG.apply();
 
-        sActivityTestRule = activityTestRule;
-
-        UiControllerSpy.attachThroughProxy();
-
-        Intent intent = extractInitialIntent();
-        sActivityTestRule.launchActivity(intent);
+        sActivityLaunchHelper = new ActivityLaunchHelper(activityTestRule);
 
         try {
-            DetoxMain.run(context);
+            DetoxMain.run(context, sActivityLaunchHelper);
         } catch (Exception e) {
             Thread.currentThread().interrupt();
             throw new RuntimeException("Detox got interrupted prematurely", e);
@@ -148,56 +133,15 @@ public final class Detox {
     }
 
     public static void launchMainActivity() {
-        final Activity activity = sActivityTestRule.getActivity();
-        launchActivitySync(sIntentsFactory.activityLaunchIntent(activity));
+        sActivityLaunchHelper.launchMainActivity();
     }
 
     public static void startActivityFromUrl(String url) {
-        launchActivitySync(sIntentsFactory.intentWithUrl(url, false));
+        sActivityLaunchHelper.startActivityFromUrl(url);
     }
 
     public static void startActivityFromNotification(String dataFilePath) {
-        Bundle notificationData = new NotificationDataParser(dataFilePath).toBundle();
-        Intent intent = sIntentsFactory.intentWithNotificationData(getAppContext(), notificationData, false);
-        launchActivitySync(intent);
-    }
-
-    private static Intent extractInitialIntent() {
-        Intent intent;
-
-        if (sLaunchArgs.hasUrlOverride()) {
-            intent = sIntentsFactory.intentWithUrl(sLaunchArgs.getUrlOverride(), true);
-        } else if (sLaunchArgs.hasNotificationPath()) {
-            Bundle notificationData = new NotificationDataParser(sLaunchArgs.getNotificationPath()).toBundle();
-            intent = sIntentsFactory.intentWithNotificationData(getAppContext(), notificationData, true);
-        } else {
-            intent = sIntentsFactory.cleanIntent();
-        }
-        intent.putExtra(INTENT_LAUNCH_ARGS_KEY, sLaunchArgs.asIntentBundle());
-        return intent;
-    }
-
-    private static void launchActivitySync(Intent intent) {
-        // Ideally, we would just call sActivityTestRule.launchActivity(intent) and get it over with.
-        // BUT!!! as it turns out, Espresso has an issue where doing this for an activity running in the background
-        // would have Espresso set up an ActivityMonitor which will spend its time waiting for the activity to load, *without
-        // ever being released*. It will finally fail after a 45 seconds timeout.
-        // Without going into full details, it seems that activity test rules were not meant to be used this way. However,
-        // the all-new ActivityScenario implementation introduced in androidx could probably support this (e.g. by using
-        // dedicated methods such as moveToState(), which give better control over the lifecycle).
-        // In any case, this is the core reason for this issue: https://github.com/wix/Detox/issues/1125
-        // What it forces us to do, then, is this -
-        // 1. Launch the activity by "ourselves" from the OS (i.e. using context.startActivity()).
-        // 2. Set up an activity monitor by ourselves -- such that it would block until the activity is ready.
-        // ^ Hence the code below.
-
-        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        final Activity activity = sActivityTestRule.getActivity();
-        final Instrumentation.ActivityMonitor activityMonitor = new Instrumentation.ActivityMonitor(activity.getClass().getName(), null, true);
-
-        activity.startActivity(intent);
-        instrumentation.addMonitor(activityMonitor);
-        instrumentation.waitForMonitorWithTimeout(activityMonitor, ACTIVITY_LAUNCH_TIMEOUT);
+        sActivityLaunchHelper.startActivityFromNotification(dataFilePath);
     }
 
     private static Context getAppContext() {

package/android/detox/src/full/java/com/wix/detox/DetoxMain.kt

@@ -3,35 +3,50 @@ package com.wix.detox
 import android.content.Context
 import android.util.Log
 import com.wix.detox.adapters.server.*
-import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
+import com.wix.detox.common.DetoxLog
+import com.wix.detox.espresso.UiControllerSpy
 import com.wix.detox.instruments.DetoxInstrumentsManager
 import com.wix.detox.reactnative.ReactNativeExtension
 import com.wix.invoke.MethodInvocation
+import java.util.concurrent.CountDownLatch
 
-private const val INIT_ACTION = "_init"
-private const val IS_READY_ACTION = "isReady"
 private const val TERMINATION_ACTION = "_terminate"
 
 object DetoxMain {
+    private val loginMonitor = CountDownLatch(1)
+
     @JvmStatic
-    fun run(rnHostHolder: Context) {
+    fun run(rnHostHolder: Context, activityLaunchHelper: ActivityLaunchHelper) {
         val detoxServerInfo = DetoxServerInfo()
-        Log.i(LOG_TAG, "Detox server connection details: $detoxServerInfo")
-
         val testEngineFacade = TestEngineFacade()
         val actionsDispatcher = DetoxActionsDispatcher()
-        val externalAdapter = DetoxServerAdapter(actionsDispatcher, detoxServerInfo, IS_READY_ACTION, TERMINATION_ACTION)
+        val externalAdapter = DetoxServerAdapter(actionsDispatcher, detoxServerInfo, TERMINATION_ACTION)
+
         initActionHandlers(actionsDispatcher, externalAdapter, testEngineFacade, rnHostHolder)
-        actionsDispatcher.dispatchAction(INIT_ACTION, "", 0)
+//        actionsDispatcher.dispatchAction(INIT_ACTION, "", 0)
+init(externalAdapter)
+synchronized(this) {
+    awaitHandshake()
+    launchApp(rnHostHolder, activityLaunchHelper)
+}
         actionsDispatcher.join()
     }
 
-    private fun doInit(externalAdapter: DetoxServerAdapter, rnHostHolder: Context) {
-        externalAdapter.connect()
-
+    private fun init(externalAdapter: DetoxServerAdapter) {
         initCrashHandler(externalAdapter)
         initANRListener(externalAdapter)
-        initReactNativeIfNeeded(rnHostHolder)
+        initEspresso()
+        initReactNative()
+
+        externalAdapter.connect()
+    }
+
+    private fun awaitHandshake() {
+        loginMonitor.await()
+    }
+
+    private fun onLoginSuccess() {
+        loginMonitor.countDown()
     }
 
     private fun doTeardown(serverAdapter: DetoxServerAdapter, actionsDispatcher: DetoxActionsDispatcher, testEngineFacade: TestEngineFacade) {
@@ -44,32 +59,27 @@ object DetoxMain {
     private fun initActionHandlers(actionsDispatcher: DetoxActionsDispatcher, serverAdapter: DetoxServerAdapter, testEngineFacade: TestEngineFacade, rnHostHolder: Context) {
         // Primary actions
         with(actionsDispatcher) {
+            val readyHandler = ReadyActionHandler(serverAdapter, testEngineFacade)
             val rnReloadHandler = ReactNativeReloadActionHandler(rnHostHolder, serverAdapter, testEngineFacade)
 
-            associateActionHandler(INIT_ACTION, object : DetoxActionHandler {
-                override fun handle(params: String, messageId: Long) =
-                    synchronized(this@DetoxMain) {
-                        this@DetoxMain.doInit(serverAdapter, rnHostHolder)
-                    }
-            })
-            associateActionHandler(IS_READY_ACTION, ReadyActionHandler(serverAdapter, testEngineFacade))
-
-            associateActionHandler("loginSuccess", ScarceActionHandler())
-            associateActionHandler("reactNativeReload", object: DetoxActionHandler {
-                override fun handle(params: String, messageId: Long) =
-                    synchronized(this@DetoxMain) {
-                        rnReloadHandler.handle(params, messageId)
-                    }
-            })
+            associateActionHandler("isReady") { params, messageId ->
+                synchronized(this@DetoxMain) {
+                    readyHandler.handle(params, messageId)
+                }
+            }
+            associateActionHandler("loginSuccess") { _, _ -> this@DetoxMain.onLoginSuccess() }
+            associateActionHandler("reactNativeReload") { params, messageId ->
+                synchronized(this@DetoxMain) {
+                    rnReloadHandler.handle(params, messageId)
+                }
+            }
             associateActionHandler("invoke", InvokeActionHandler(MethodInvocation(), serverAdapter))
             associateActionHandler("cleanup", CleanupActionHandler(serverAdapter, testEngineFacade) {
                 dispatchAction(TERMINATION_ACTION, "", 0)
             })
-            associateActionHandler(TERMINATION_ACTION, object: DetoxActionHandler {
-                override fun handle(params: String, messageId: Long) {
-                    this@DetoxMain.doTeardown(serverAdapter, actionsDispatcher, testEngineFacade)
-                }
-            })
+            associateActionHandler(TERMINATION_ACTION) { _, _ ->
+                this@DetoxMain.doTeardown(serverAdapter, actionsDispatcher, testEngineFacade)
+            }
 
             if (DetoxInstrumentsManager.supports()) {
                 val instrumentsManager = DetoxInstrumentsManager(rnHostHolder)
@@ -98,7 +108,17 @@ object DetoxMain {
         DetoxANRHandler(outboundServerAdapter).attach()
     }
 
-    private fun initReactNativeIfNeeded(rnHostHolder: Context) {
+    private fun initEspresso() {
+        UiControllerSpy.attachThroughProxy()
+    }
+
+    private fun initReactNative() {
+        ReactNativeExtension.initIfNeeded()
+    }
+
+    private fun launchApp(rnHostHolder: Context, activityLaunchHelper: ActivityLaunchHelper) {
+        Log.i(DetoxLog.LOG_TAG, "Launching the tested activity!")
+        activityLaunchHelper.launchActivityUnderTest()
         ReactNativeExtension.waitForRNBootstrap(rnHostHolder)
     }
 }

package/android/detox/src/full/java/com/wix/detox/LaunchIntentsFactory.kt

@@ -6,7 +6,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 
-internal class LaunchIntentsFactory {
+class LaunchIntentsFactory {
 
     /**
      * Constructs an intent tightly associated with a specific activity.

package/android/detox/src/full/java/com/wix/detox/adapters/server/DetoxActionHandlers.kt

@@ -152,7 +152,3 @@ class InstrumentsEventsActionsHandler(
         outboundServerAdapter.sendMessage("eventDone", emptyMap<String, Any>(), messageId)
     }
 }
-
-class ScarceActionHandler: DetoxActionHandler {
-    override fun handle(params: String, messageId: Long) {}
-}

package/android/detox/src/full/java/com/wix/detox/adapters/server/DetoxActionsDispatcher.kt

@@ -16,6 +16,12 @@ class DetoxActionsDispatcher {
         actionsExecutor.associateHandler(type, actionHandler)
     }
 
+    fun associateActionHandler(type: String, handlerFunc: (params: String, messageId: Long) -> Unit) {
+        associateActionHandler(type, object: DetoxActionHandler {
+            override fun handle(params: String, messageId: Long) = handlerFunc(params, messageId)
+        })
+    }
+
     fun dispatchAction(type: String, params: String, messageId: Long) {
         (primaryExec.executeAction(type, params, messageId) ||
             secondaryExec.executeAction(type, params, messageId))
@@ -74,7 +80,5 @@ private class ActionsExecutor(name: String) {
         handler.looper.quit()
     }
 
-    fun join() {
-        thread.join()
-    }
+    fun join() = thread.join()
 }

package/android/detox/src/full/java/com/wix/detox/adapters/server/DetoxServerAdapter.kt

@@ -10,7 +10,6 @@ interface OutboundServerAdapter {
 class DetoxServerAdapter(
         private val actionsDispatcher: DetoxActionsDispatcher,
         private val detoxServerInfo: DetoxServerInfo,
-        private val readyActionType: String,
         private val terminationActionType: String)
     : WebSocketClient.WSEventsHandler, OutboundServerAdapter {
 
@@ -27,7 +26,6 @@ class DetoxServerAdapter(
 
     override fun onConnect() {
         Log.i(DetoxLog.LOG_TAG, "Connected to server!")
-        actionsDispatcher.dispatchAction(readyActionType, "", -1000L)
     }
 
     override fun onClosed() {

package/android/detox/src/full/java/com/wix/detox/adapters/server/DetoxServerInfo.kt

@@ -1,7 +1,9 @@
 package com.wix.detox.adapters.server
 
+import android.util.Log
 import androidx.test.platform.app.InstrumentationRegistry
 import com.wix.detox.LaunchArgs
+import com.wix.detox.common.DetoxLog
 
 private const val DEFAULT_URL = "ws://localhost:8099"
 
@@ -9,7 +11,7 @@ class DetoxServerInfo internal constructor(launchArgs: LaunchArgs = LaunchArgs()
     val serverUrl: String = launchArgs.detoxServerUrl ?: DEFAULT_URL
     val sessionId: String = launchArgs.detoxSessionId ?: InstrumentationRegistry.getInstrumentation().targetContext.applicationInfo.packageName
 
-    override fun toString(): String {
-        return "url=$serverUrl, sessionId=$sessionId"
+    init {
+        Log.i(DetoxLog.LOG_TAG, "Detox server connection details: url=$serverUrl, sessionId=$sessionId")
     }
 }

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

@@ -0,0 +1,44 @@
+package com.wix.detox.reactnative
+
+import android.util.Log
+import com.facebook.react.bridge.ReactMarker
+import com.facebook.react.bridge.ReactMarkerConstants
+import com.facebook.react.bridge.ReactMarkerConstants.*
+
+object ReactMarkersLogger : ReactMarker.MarkerListener {
+
+    fun attach() {
+        ReactMarker.addListener(this)
+    }
+
+    override fun logMarker(marker: ReactMarkerConstants, p1: String?, p2: Int) {
+        when {
+            marker == DOWNLOAD_START ||
+            marker == DOWNLOAD_END ||
+            marker == BUILD_REACT_INSTANCE_MANAGER_START ||
+            marker == BUILD_REACT_INSTANCE_MANAGER_END ||
+            marker == REACT_BRIDGE_LOADING_START ||
+            marker == REACT_BRIDGE_LOADING_END ||
+            marker == REACT_BRIDGELESS_LOADING_START ||
+            marker == REACT_BRIDGELESS_LOADING_END ||
+            marker == CREATE_MODULE_START ||
+            marker == CREATE_MODULE_END ||
+            marker == NATIVE_MODULE_SETUP_START ||
+            marker == NATIVE_MODULE_SETUP_END ||
+            marker == PRE_RUN_JS_BUNDLE_START ||
+            marker == RUN_JS_BUNDLE_START ||
+            marker == RUN_JS_BUNDLE_END ||
+            marker == CONTENT_APPEARED ||
+            marker == CREATE_CATALYST_INSTANCE_START ||
+            marker == CREATE_CATALYST_INSTANCE_END ||
+            marker == DESTROY_CATALYST_INSTANCE_START ||
+            marker == DESTROY_CATALYST_INSTANCE_END ||
+            marker == CREATE_REACT_CONTEXT_START ||
+            marker == CREATE_REACT_CONTEXT_END ||
+            marker == PROCESS_PACKAGES_START ||
+            marker == PROCESS_PACKAGES_END ||
+                false ->
+                Log.d("Detox.RNMarker", "$marker ($p1)")
+        }
+    }
+}

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

@@ -14,6 +14,32 @@ private const val LOG_TAG = "DetoxRNExt"
 object ReactNativeExtension {
     private var rnIdlingResources: ReactNativeIdlingResources? = null
 
+    fun initIfNeeded() {
+        if (!ReactNativeInfo.isReactNativeApp()) {
+            return
+        }
+
+        ReactMarkersLogger.attach()
+    }
+
+    /**
+     * Wait for React-Native to finish loading (i.e. make RN context available).
+     *
+     * @param applicationContext The app context, implicitly assumed to be a [ReactApplication] instance.
+     */
+    fun waitForRNBootstrap(applicationContext: Context) {
+        if (!ReactNativeInfo.isReactNativeApp()) {
+            return
+        }
+
+        (applicationContext as ReactApplication).let {
+            val reactContext = awaitNewReactNativeContext(it, null)
+
+            enableOrDisableSynchronization(reactContext)
+            hackRN50WaitForReady()
+        }
+    }
+
     /**
      * Reloads the React Native context and thus all javascript code.
      *
@@ -40,26 +66,7 @@ object ReactNativeExtension {
             val reactContext = awaitNewReactNativeContext(it, previousReactContext)
 
             enableOrDisableSynchronization(reactContext, networkSyncEnabled)
-            hackRN50OrHigherWaitForReady()
-        }
-    }
-
-    /**
-     * Wait for React-Native to finish loading (i.e. make RN context available).
-     *
-     * @param applicationContext The app context, implicitly assumed to be a [ReactApplication] instance.
-     */
-    @JvmStatic
-    fun waitForRNBootstrap(applicationContext: Context) {
-        if (!ReactNativeInfo.isReactNativeApp()) {
-            return
-        }
-
-        (applicationContext as ReactApplication).let {
-            val reactContext = awaitNewReactNativeContext(it, null)
-
-            enableOrDisableSynchronization(reactContext)
-            hackRN50OrHigherWaitForReady()
+            hackRN50WaitForReady()
         }
     }
 
@@ -145,7 +152,7 @@ object ReactNativeExtension {
         }
     }
 
-    private fun hackRN50OrHigherWaitForReady() {
+    private fun hackRN50WaitForReady() {
         if (ReactNativeInfo.rnVersion().minor in 50..62) {
             try {
                 //TODO- Temp hack to make Detox usable for RN>=50 till we find a better sync solution.
@@ -153,7 +160,6 @@ object ReactNativeExtension {
             } catch (e: InterruptedException) {
                 e.printStackTrace()
             }
-
         }
     }
 

package/android/detox/src/main/java/com/wix/detox/espresso/UiControllerSpy.kt

@@ -11,11 +11,8 @@ class UiControllerSpy: MethodsSpy("uiController") {
     fun eventInjectionsIterator(): Iterator<CallInfo?> = historyOf("injectMotionEvent").iterator()
 
     companion object {
-        @JvmStatic
         val instance = UiControllerSpy()
 
-        @JvmStatic
-        @JvmOverloads
         fun attachThroughProxy(spy: UiControllerSpy = instance) {
             val eventsInjectorReflected = EventsInjectorReflected(getUiController())
 

package/detox.d.ts

@@ -235,6 +235,13 @@ declare global {
              * @see {DetoxInternals.DetoxTestFileReport#isPermanentFailure}
              */
             bail?: boolean;
+            /**
+             * When true, tells `detox test` to spawn the test runner in a detached mode.
+             * This is useful in CI environments, where you want to intercept SIGINT and SIGTERM signals to gracefully shut down the test runner and the device.
+             * Instead of passing the kill signal to the child process (the test runner), Detox will send an emergency shutdown request to all the workers, and then it will wait for them to finish.
+             * @default false
+             */
+            detached?: boolean;
             /**
              * Custom handler to process --inspect-brk CLI flag.
              * Use it when you rely on another test runner than Jest to mutate the config.

package/internals.d.ts

@@ -116,8 +116,9 @@ declare global {
       /**
        * Workaround for Jest exiting abruptly in --bail mode.
        * Makes sure that all workers and their test environments are properly torn down.
+       * @param [permanent] - forbids further retries
        */
-      unsafe_conductEarlyTeardown(): Promise<void>;
+      unsafe_conductEarlyTeardown(permanent?: boolean): Promise<void>;
       /**
        * Reports to Detox CLI about passed and failed test files.
        * The failed test files might be re-run again if

package/local-cli/testCommand/TestRunnerCommand.js

@@ -12,6 +12,7 @@ const { escapeSpaces, useForwardSlashes } = require('../../src/utils/shellUtils'
 const sleep = require('../../src/utils/sleep');
 const AppStartCommand = require('../startCommand/AppStartCommand');
 const { markErrorAsLogged } = require('../utils/cliErrorHandling');
+const interruptListeners = require('../utils/interruptListeners');
 
 const TestRunnerError = require('./TestRunnerError');
 
@@ -28,10 +29,12 @@ class TestRunnerCommand {
     const appsConfig = opts.config.apps;
 
     this._argv = runnerConfig.args;
+    this._detached = runnerConfig.detached;
     this._retries = runnerConfig.retries;
     this._envHint = this._buildEnvHint(opts.env);
     this._startCommands = this._prepareStartCommands(appsConfig, cliConfig);
     this._envFwd = {};
+    this._terminating = false;
 
     if (runnerConfig.forwardEnv) {
       this._envFwd = this._buildEnvOverride(cliConfig, deviceConfig);
@@ -59,16 +62,20 @@ class TestRunnerCommand {
       } catch (e) {
         launchError = e;
 
+        if (this._terminating) {
+          runsLeft = 0;
+        }
+
         const failedTestFiles = detox.session.testResults.filter(r => !r.success);
 
         const { bail } = detox.config.testRunner;
         if (bail && failedTestFiles.some(r => r.isPermanentFailure)) {
-          throw e;
+          runsLeft = 0;
         }
 
         const testFilesToRetry = failedTestFiles.filter(r => !r.isPermanentFailure).map(r => r.testFilePath);
-        if (_.isEmpty(testFilesToRetry)) {
-          throw e;
+        if (testFilesToRetry.length === 0) {
+          runsLeft = 0;
         }
 
         if (--runsLeft > 0) {
@@ -143,6 +150,15 @@ class TestRunnerCommand {
     }, _.isUndefined);
   }
 
+  _onTerminate = () => {
+    if (this._terminating) {
+      return;
+    }
+
+    this._terminating = true;
+    return detox.unsafe_conductEarlyTeardown(true);
+  };
+
   async _spawnTestRunner() {
     const fullCommand = this._buildSpawnArguments().map(escapeSpaces);
     const fullCommandWithHint = printEnvironmentVariables(this._envHint) + fullCommand.join(' ');
@@ -153,6 +169,7 @@ class TestRunnerCommand {
       cp.spawn(fullCommand[0], fullCommand.slice(1), {
         shell: true,
         stdio: 'inherit',
+        detached: this._detached,
         env: _({})
           .assign(process.env)
           .assign(this._envFwd)
@@ -162,6 +179,8 @@ class TestRunnerCommand {
       })
         .on('error', /* istanbul ignore next */ (err) => reject(err))
         .on('exit', (code, signal) => {
+          interruptListeners.unsubscribe(this._onTerminate);
+
           if (code === 0) {
             log.trace.end({ success: true });
             resolve();
@@ -175,6 +194,10 @@ class TestRunnerCommand {
             reject(markErrorAsLogged(error));
           }
         });
+
+      if (this._detached) {
+        interruptListeners.subscribe(this._onTerminate);
+      }
     });
   }
 

package/local-cli/utils/interruptListeners.js

@@ -0,0 +1,15 @@
+function subscribe(listener) {
+  process.on('SIGINT', listener);
+  process.on('SIGTERM', listener);
+}
+
+function unsubscribe(listener) {
+  process.removeListener('SIGINT', listener);
+  process.removeListener('SIGTERM', listener);
+}
+
+module.exports = {
+  subscribe,
+  unsubscribe,
+};
+

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.13.5",
+  "version": "20.14.0-prerelease.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -51,7 +51,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-unicorn": "^47.0.0",
     "jest": "^28.1.3",
-    "jest-allure2-reporter": "2.0.0-alpha.6",
+    "jest-allure2-reporter": "2.0.0-alpha.11",
     "mockdate": "^2.0.1",
     "prettier": "^2.4.1",
     "react-native": "0.71.10",
@@ -109,5 +109,5 @@
   "browserslist": [
     "node 14"
   ],
-  "gitHead": "81db382567a147b0c597d39a519c6ca32d4d97df"
+  "gitHead": "4eb7e6729cf5bd3d30f720c40df316fdf38300df"
 }

package/runners/jest/testEnvironment/index.js

@@ -73,7 +73,9 @@ class DetoxCircusEnvironment extends NodeEnvironment {
   // @ts-expect-error TS2425
   async handleTestEvent(event, state) {
     if (detox.session.unsafe_earlyTeardown) {
-      throw new Error('Detox halted test execution due to an early teardown request');
+      if (event.name === 'test_fn_start' || event.name === 'hook_start') {
+        throw new Error('Detox halted test execution due to an early teardown request');
+      }
     }
 
     this._timer.schedule(state.testTimeout != null ? state.testTimeout : this.setupTimeout);
@@ -107,6 +109,10 @@ class DetoxCircusEnvironment extends NodeEnvironment {
    * @protected
    */
   async initDetox() {
+    if (detox.session.unsafe_earlyTeardown) {
+      throw new Error('Detox halted test execution due to an early teardown request');
+    }
+
     const opts = {
       global: this.global,
       workerId: `w${process.env.JEST_WORKER_ID}`,

package/src/android/espressoapi/Detox.js

@@ -58,17 +58,6 @@ class Detox {
     };
   }
 
-  static extractInitialIntent() {
-    return {
-      target: {
-        type: "Class",
-        value: "com.wix.detox.Detox"
-      },
-      method: "extractInitialIntent",
-      args: []
-    };
-  }
-
   static getAppContext() {
     return {
       target: {

package/src/configuration/composeRunnerConfig.js

@@ -32,6 +32,7 @@ function composeRunnerConfig(opts) {
       retries: 0,
       inspectBrk: inspectBrkHookDefault,
       forwardEnv: false,
+      detached: false,
       bail: false,
       jest: {
         setupTimeout: 300000,
@@ -56,8 +57,9 @@ function composeRunnerConfig(opts) {
 
   if (typeof merged.inspectBrk === 'function') {
     if (cliConfig.inspectBrk) {
-      merged.retries = 0;
+      merged.detached = false;
       merged.forwardEnv = true;
+      merged.retries = 0;
       merged.inspectBrk(merged);
     }
 

package/src/ipc/IPCClient.js

@@ -86,8 +86,8 @@ class IPCClient {
     this._sessionState.patch(sessionState);
   }
 
-  async conductEarlyTeardown() {
-    const sessionState = await this._emit('conductEarlyTeardown', {});
+  async conductEarlyTeardown({ permanent }) {
+    const sessionState = await this._emit('conductEarlyTeardown', { permanent });
     this._sessionState.patch(sessionState);
   }
 

package/src/ipc/IPCServer.js

@@ -73,6 +73,7 @@ class IPCServer {
     this._ipc.server.emit(socket, 'registerContextDone', {
       testResults: this._sessionState.testResults,
       testSessionIndex: this._sessionState.testSessionIndex,
+      unsafe_earlyTeardown: this._sessionState.unsafe_earlyTeardown,
     });
   }
 
@@ -90,10 +91,11 @@ class IPCServer {
     }
   }
 
-  onConductEarlyTeardown(_data = null, socket = null) {
-    // Note that we don't save `unsafe_earlyTeardown` in the primary session state
-    // because it's transient and needed only to make the workers quit early.
+  onConductEarlyTeardown({ permanent }, socket = null) {
     const newState = { unsafe_earlyTeardown: true };
+    if (permanent) {
+      Object.assign(this._sessionState, newState);
+    }
 
     if (socket) {
       this._ipc.server.emit(socket, 'conductEarlyTeardownDone', newState);

package/src/realms/DetoxContext.js

@@ -102,7 +102,7 @@ class DetoxContext {
   /** @abstract */
   [symbols.reportTestResults](_testResults) {}
   /** @abstract */
-  [symbols.conductEarlyTeardown]() {}
+  [symbols.conductEarlyTeardown](_permanent) {}
   /**
    * @abstract
    * @param {Partial<DetoxInternals.DetoxInitOptions>} _opts

package/src/realms/DetoxPrimaryContext.js

@@ -51,9 +51,9 @@ class DetoxPrimaryContext extends DetoxContext {
     }
   }
 
-  [symbols.conductEarlyTeardown] = async () => {
+  [symbols.conductEarlyTeardown] = async (permanent = false) => {
     if (this[_ipcServer]) {
-      await this[_ipcServer].onConductEarlyTeardown();
+      await this[_ipcServer].onConductEarlyTeardown({ permanent });
     }
   };
 

package/src/realms/DetoxSecondaryContext.js

@@ -33,9 +33,9 @@ class DetoxSecondaryContext extends DetoxContext {
     }
   }
 
-  [symbols.conductEarlyTeardown] = async () => {
+  [symbols.conductEarlyTeardown] = async (permanent = false) => {
     if (this[_ipcClient]) {
-      await this[_ipcClient].conductEarlyTeardown();
+      await this[_ipcClient].conductEarlyTeardown({ permanent });
     } else {
       throw new DetoxInternalError('Detected an attempt to report early teardown using a non-initialized context.');
     }

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

@@ -1 +0,0 @@
-faf5dc28d8239cc6da3b2bf96b1b29a5

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

@@ -1 +0,0 @@
-66259e139e74a9129e2f568fcdabaa5385713e68

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

@@ -1 +0,0 @@
-9150be4e9ca3b67f6ff6f6df43fcb06cd8e072077992431f578e514bbe9f778f

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

@@ -1 +0,0 @@
-337245632beaeaf3cf9dce4ec6f98a0dee7faaf09e95fc5538781452c532ebb002bc1907b2da230ec47044cf9f31c6dba55dbb00ab16dab8c3af7b643a376974

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

@@ -1 +0,0 @@
-364d1f43c94bb6c771f7c29321e1bc4c

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

@@ -1 +0,0 @@
-1021db825c7835306b90ae34b8d1c294f719990e

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

@@ -1 +0,0 @@
-fb7098e8a4f09fd00b0ac9f123d104bb7298784d055fcbc1d385788c071f0983

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

@@ -1 +0,0 @@
-19a6d854223aba1d9a037ed08f96ea5ac66d4fca81083b9e755bd0f60df0ef55e0cfee4849ed0ddb742c856b4083efeb772da1cd83771d3f56eba813b194d65f

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

@@ -1 +0,0 @@
-5037d89ac5d98e47d69d63b8731e7e3a

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

@@ -1 +0,0 @@
-b4a0f9db575d92cb2da51c617e0ff531330cc2c6

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

@@ -1 +0,0 @@
-1fa253115965db1c97bc6c8b0c1ab0dff9ac9f8714e063dc972332cc6798b63a

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

@@ -1 +0,0 @@
-8174914ad6abe68c79f4812a32d292e80d922239045a30401bc39f43801f3cd2ea2807786248ffb58e84dfcdb8eddc00c7f606a874eb216def9350d325442af3

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

@@ -1 +0,0 @@
-4ddd8a0d0201920d14cba4ec92fbbc30

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

@@ -1 +0,0 @@
-3ba542128c404b075ca90ee6603104cc1311e0c9

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

@@ -1 +0,0 @@
-c3c239c4180d3fdcc490b06a5848308470e6cf69e23c469716f41d53bf12c32e

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

@@ -1 +0,0 @@
-2a99293177c0028c4839b99fbc16a7afaee90cefb1fc26eb32c3960a71c1cc541b92bc06d6efe38c23932abd14d9b301a72812ce86f700069124805d1e2421c2