detox 20.0.0-breaking.new-global-lifecycle.0 → 20.0.0

package/android/detox/src/full/java/com/wix/detox/espresso/matcher/ViewMatchers.kt

@@ -3,15 +3,17 @@
 package com.wix.detox.espresso.matcher
 
 import android.view.View
+import androidx.appcompat.widget.AppCompatSeekBar
 import androidx.test.espresso.matcher.BoundedMatcher
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
-import com.facebook.react.views.slider.ReactSlider
+import com.wix.detox.espresso.common.SliderHelper
 import org.hamcrest.BaseMatcher
 import org.hamcrest.Description
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.allOf
 import org.hamcrest.TypeSafeMatcher
+import kotlin.math.abs
 
 /*
  * An extension of [androidx.test.espresso.matcher.ViewMatchers].
@@ -36,6 +38,19 @@ fun isOfClassName(className: String): Matcher<View> {
 fun isMatchingAtIndex(index: Int, innerMatcher: Matcher<View>): Matcher<View> =
     ViewAtIndexMatcher(index, innerMatcher)
 
+fun toHaveSliderPosition(expectedValuePct: Double, tolerance: Double): Matcher<View?> =
+    object: BoundedMatcher<View?, AppCompatSeekBar>(AppCompatSeekBar::class.java) {
+        override fun describeTo(description: Description) {
+            description.appendText("sliderPositionPercent($expectedValuePct)")
+        }
+
+        override fun matchesSafely(view: AppCompatSeekBar): Boolean {
+            val sliderHelper = SliderHelper.create(view)
+            val progressPct = sliderHelper.getCurrentProgressPct()
+            return (abs(progressPct - expectedValuePct) <= tolerance)
+        }
+    }
+
 /**
  * Same as [androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom], but accepts any class. Needed
  * in order to avoid warning when passing 'any' class.
@@ -47,25 +62,3 @@ private class IsAssignableFromMatcher(private val clazz: Class<*>) : TypeSafeMat
         description.appendText("is assignable from class: $clazz")
     }
 }
-
-fun toHaveSliderPosition(expectedValue: Double, tolerance: Double): Matcher<View?> {
-    return object : BoundedMatcher<View?, ReactSlider>(ReactSlider::class.java) {
-        override fun describeTo(description: Description) {
-            description.appendText("expected: $expectedValue")
-        }
-
-        override fun matchesSafely(slider: ReactSlider?): Boolean {
-            val currentProgress = slider?.progress
-
-            if (currentProgress != null) {
-                val realProgress = slider.toRealProgress(currentProgress)
-                val currentPctFactor = slider.max / currentProgress.toDouble()
-                val realTotal = realProgress * currentPctFactor
-                val actualValue = realProgress / realTotal
-                return Math.abs(actualValue - expectedValue) <= tolerance
-            }
-
-            return false
-        }
-    }
-}

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

@@ -39,7 +39,7 @@ object ReactNativeExtension {
             reloadReactNativeInBackground(it)
             val reactContext = awaitNewReactNativeContext(it, previousReactContext)
 
-            setupIdlingResources(reactContext, networkSyncEnabled)
+            enableOrDisableSynchronization(reactContext, networkSyncEnabled)
             hackRN50OrHigherWaitForReady()
         }
     }
@@ -58,7 +58,7 @@ object ReactNativeExtension {
         (applicationContext as ReactApplication).let {
             val reactContext = awaitNewReactNativeContext(it, null)
 
-            setupIdlingResources(reactContext)
+            enableOrDisableSynchronization(reactContext)
             hackRN50OrHigherWaitForReady()
         }
     }
@@ -124,6 +124,19 @@ object ReactNativeExtension {
         return rnLoadingMonitor.getNewContext()!!
     }
 
+    private fun enableOrDisableSynchronization(reactContext: ReactContext, networkSyncEnabled: Boolean = true) {
+        if (shouldDisableSynchronization()) {
+            clearAllSynchronization()
+        } else {
+            setupIdlingResources(reactContext, networkSyncEnabled)
+        }
+    }
+
+    private fun shouldDisableSynchronization(): Boolean {
+        val launchArgs = LaunchArgs()
+        return launchArgs.hasEnableSynchronization() && launchArgs.enableSynchronization.equals("0")
+    }
+
     private fun setupIdlingResources(reactContext: ReactContext, networkSyncEnabled: Boolean = true) {
         val launchArgs = LaunchArgs()
 

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

@@ -2,6 +2,7 @@ package com.wix.detox.reactnative
 
 import android.os.Looper
 import android.util.Log
+import androidx.test.espresso.Espresso
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.base.IdlingResourceRegistry
 import com.facebook.react.bridge.ReactContext
@@ -12,7 +13,6 @@ import com.wix.detox.reactnative.idlingresources.timers.getInterrogationStrategy
 import com.wix.detox.reactnative.idlingresources.uimodule.UIModuleIdlingResource
 import org.joor.Reflect
 import org.joor.ReflectException
-import java.util.Set
 
 private const val LOG_TAG = "DetoxRNIdleRes"
 
@@ -46,15 +46,11 @@ private class MQThreadReflected(private val queue: Any?, private val queueName:
 }
 
 class ReactNativeIdlingResources constructor(
-        private val reactContext: ReactContext,
-        private var launchArgs: LaunchArgs,
-        internal var networkSyncEnabled: Boolean = true
-        )
-
-    {
-
+    private val reactContext: ReactContext,
+    private var launchArgs: LaunchArgs,
+    internal var networkSyncEnabled: Boolean = true
+) {
     companion object {
-        private const val FIELD_UI_BG_MSG_QUEUE = "mUiBackgroundMessageQueueThread"
         private const val FIELD_NATIVE_MODULES_MSG_QUEUE = "mNativeModulesMessageQueueThread"
         private const val FIELD_JS_MSG_QUEUE = "mJSMessageQueueThread"
     }
@@ -69,17 +65,11 @@ class ReactNativeIdlingResources constructor(
 
     fun registerAll() {
         Log.i(LOG_TAG, "Setting up Espresso Idling Resources for React Native")
-
         unregisterAll()
 
-        if (launchArgs.hasURLBlacklist()) {
-            val blacklistUrls = launchArgs.getURLBlacklist()
-            setBlacklistUrls(blacklistUrls)
-        }
-
+        setupUrlBlacklist()
         setupMQThreadsInterrogators()
         syncIdlingResources()
-
         setupCustomRNIdlingResources()
         syncIdlingResources()
     }
@@ -108,28 +98,42 @@ class ReactNativeIdlingResources constructor(
             networkIdlingResource?.resume()
         }
     }
+
     fun pauseRNTimersIdlingResource() = timersIdlingResource?.pause()
     fun resumeRNTimersIdlingResource() = timersIdlingResource?.resume()
     fun pauseUIIdlingResource() = uiModuleIdlingResource?.pause()
     fun resumeUIIdlingResource() = uiModuleIdlingResource?.resume()
-    fun pauseJSBridgeIdlingResource() = rnBridgeIdlingResource?.pause()
-    fun resumeJSBridgeIdlingResource() = rnBridgeIdlingResource?.resume()
+
+    fun setBlacklistUrls(urlList: String) {
+        setIldingResourceBlacklist(urlList)
+    }
+
+    private fun setIldingResourceBlacklist(urlList: String) {
+        val urlArray = toFormattedUrlArray(urlList)
+        NetworkIdlingResource.setURLBlacklist(urlArray)
+    }
 
     private fun setupMQThreadsInterrogators() {
         if (IdlingRegistry.getInstance().loopers.isEmpty()) {
             val mqThreadsReflector = MQThreadsReflector(reactContext)
-//            val mqUIBackground = mqThreadsReflector.getQueue(FIELD_UI_BG_MSG_QUEUE)?.getLooper() TODO
             val mqJS = mqThreadsReflector.getQueue(FIELD_JS_MSG_QUEUE)?.getLooper()
-            val mqNativeModules = mqThreadsReflector.getQueue(FIELD_NATIVE_MODULES_MSG_QUEUE)?.getLooper()
+            val mqNativeModules =
+                mqThreadsReflector.getQueue(FIELD_NATIVE_MODULES_MSG_QUEUE)?.getLooper()
 
             IdlingRegistry.getInstance().apply {
-//                registerLooperAsIdlingResource(mqUIBackground)
                 registerLooperAsIdlingResource(mqJS)
                 registerLooperAsIdlingResource(mqNativeModules)
             }
         }
     }
 
+    private fun setupUrlBlacklist() {
+        if (launchArgs.hasURLBlacklist()) {
+            val blacklistUrls = launchArgs.urlBlacklist
+            setIldingResourceBlacklist(blacklistUrls)
+        }
+    }
+
     private fun setupCustomRNIdlingResources() {
         rnBridgeIdlingResource = BridgeIdlingResource(reactContext)
         timersIdlingResource = TimersIdlingResource(getInterrogationStrategy(reactContext)!!)
@@ -151,13 +155,16 @@ class ReactNativeIdlingResources constructor(
 
     private fun syncIdlingResources() {
         IdlingRegistry.getInstance().apply {
-            val irr: IdlingResourceRegistry = Reflect.on(androidx.test.espresso.Espresso::class.java).field("baseRegistry").get()
+            val irr: IdlingResourceRegistry =
+                Reflect.on(Espresso::class.java).field("baseRegistry").get()
             irr.sync(this.resources, this.loopers)
         }
     }
 
     private fun unregisterMQThreadsInterrogators() {
-        Reflect.on(IdlingRegistry.getInstance()).field("loopers").get<Set<Any>>().clear()
+        val idlingResourceInstance = IdlingRegistry.getInstance()
+        val loopersField = Reflect.on(idlingResourceInstance).field("loopers")
+        loopersField.get<MutableSet<Any>>().clear()
     }
 
     private fun unregisterCustomRNIdlingResources() {
@@ -166,7 +173,8 @@ class ReactNativeIdlingResources constructor(
                 timersIdlingResource,
                 rnBridgeIdlingResource,
                 uiModuleIdlingResource,
-                animIdlingResource)
+                animIdlingResource
+            )
         rnBridgeIdlingResource?.onDetach()
 
         removeNetworkIdlingResource()
@@ -174,13 +182,15 @@ class ReactNativeIdlingResources constructor(
     }
 
     private fun setupAsyncStorageIdlingResource() {
-        asyncStorageIdlingResource = AsyncStorageIdlingResource.createIfNeeded(reactContext, false)?.also {
-            IdlingRegistry.getInstance().register(it)
-        }
+        asyncStorageIdlingResource =
+            AsyncStorageIdlingResource.createIfNeeded(reactContext, false)?.also {
+                IdlingRegistry.getInstance().register(it)
+            }
 
-        legacyAsyncStorageIdlingResource = AsyncStorageIdlingResource.createIfNeeded(reactContext, true)?.also {
-            IdlingRegistry.getInstance().register(it)
-        }
+        legacyAsyncStorageIdlingResource =
+            AsyncStorageIdlingResource.createIfNeeded(reactContext, true)?.also {
+                IdlingRegistry.getInstance().register(it)
+            }
     }
 
     private fun removeAsyncStorageIdlingResource() {
@@ -212,13 +222,8 @@ class ReactNativeIdlingResources constructor(
 
     private fun toFormattedUrlArray(urlList: String): List<String> {
         var formattedUrls = urlList
-        formattedUrls = formattedUrls.replace(Regex("""[()"]"""), "");
-        formattedUrls = formattedUrls.trim();
-        return formattedUrls.split(',');
-    }
-
-    fun setBlacklistUrls(urlList: String) {
-        val urlArray = toFormattedUrlArray(urlList)
-        NetworkIdlingResource.setURLBlacklist(urlArray);
+        formattedUrls = formattedUrls.replace(Regex("""[()"]"""), "")
+        formattedUrls = formattedUrls.trim()
+        return formattedUrls.split(',')
     }
 }

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

@@ -7,17 +7,22 @@ import com.facebook.react.ReactInstanceManager
 import com.facebook.react.bridge.ReactContext
 import com.wix.detox.common.DetoxErrors
 import com.wix.detox.config.DetoxConfig
+import org.joor.Reflect
+import java.lang.reflect.Proxy
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
 private const val LOG_TAG = "DetoxRNLoading"
 
+private const val REACT_INSTANCE_EVENT_LISTENER_CLASS = "com.facebook.react.ReactInstanceEventListener"
+private const val REACT_INSTANCE_EVENT_LISTENER_CLASS_COMPAT = "com.facebook.react.ReactInstanceManager\$ReactInstanceEventListener"
+
 open class ReactNativeLoadingMonitor(
         private val instrumentation: Instrumentation,
         private val rnApplication: ReactApplication,
         private val previousReactContext: ReactContext?,
         private val config: DetoxConfig = DetoxConfig.CONFIG) {
-    val countDownLatch = CountDownLatch(1)
+    private val countDownLatch = CountDownLatch(1)
 
     fun getNewContext(): ReactContext? {
         subscribeToNewRNContextUpdates()
@@ -35,13 +40,9 @@ open class ReactNativeLoadingMonitor(
                         return@Runnable
                     }
 
-                    rnInstanceManager.addReactInstanceEventListener(object : ReactInstanceManager.ReactInstanceEventListener {
-                        override fun onReactContextInitialized(context: ReactContext) {
-                            Log.i(LOG_TAG, "Got new RN-context async'ly through listener")
-                            rnInstanceManager.removeReactInstanceEventListener(this)
-                            countDownLatch.countDown()
-                        }
-                    })
+                    subscribeAsyncRNContextHandler(rnInstanceManager) {
+                        countDownLatch.countDown()
+                    }
                 })
     }
 
@@ -81,3 +82,48 @@ open class ReactNativeLoadingMonitor(
         return rnInstanceManager.currentReactContext
     }
 }
+
+private interface DummyListenerIdentifier
+
+/**
+ * This baby bridges over RN's breaking change introduced in version 0.68:
+ * `ReactInstanceManager$ReactInstanceEventListener` was extracted onto a separate interface, having
+ * `ReactInstanceManager.{add|remove}ReactInstanceEventLister()` changing their signature to use it, accordingly.
+ *
+ * This made us resort to a solution based on dynamic proxies, because - depending on RN's version (at runtime), we
+ * need to dynamically decide what interface we "extend" (or actually shadow) via the proxy.
+ *
+ * @see RNDiff https://github.com/facebook/react-native/compare/v0.67.4..v0.68.0#diff-2f01f0cd7ff8c9ea58f12ef0eff5fa8250cad144dd5490598d80d8e9e743458aR1009
+ * @see DynamicProxies https://docs.oracle.com/javase/8/docs/technotes/guides/reflection/proxy.html
+ */
+private fun subscribeAsyncRNContextHandler(rnInstanceManager: ReactInstanceManager, onReactContextInitialized: () -> Any) {
+    val listenerClass = resolveListenerClass()
+    val proxyInterfaces = arrayOf(
+        listenerClass,
+        DummyListenerIdentifier::class.java // In order to be able to implement equals()
+    )
+    val listener = Proxy.newProxyInstance(listenerClass.classLoader, proxyInterfaces) { listener, method, args ->
+        Log.d(LOG_TAG, "Listener-proxy method called: ${method.name}")
+
+        val result = when (method.name) {
+            "onReactContextInitialized" -> {
+                Log.i(LOG_TAG, "Got new RN-context async'ly through listener")
+                Reflect.on(rnInstanceManager).call("removeReactInstanceEventListener", listener)
+                onReactContextInitialized()
+            }
+            "equals" -> {
+                val candidate = args[0]
+                candidate is DummyListenerIdentifier
+            }
+            else -> Any()
+        }
+
+        result
+    }
+    Reflect.on(rnInstanceManager).call("addReactInstanceEventListener", listener)
+}
+
+private fun resolveListenerClass(): Class<*> {
+    val className = if (ReactNativeInfo.rnVersion().minor >= 68) REACT_INSTANCE_EVENT_LISTENER_CLASS else REACT_INSTANCE_EVENT_LISTENER_CLASS_COMPAT
+    return Class.forName(className)
+}

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/full/java/com/wix/detox/reactnative/idlingresources/timers/DelegatedIdleInterrogationStrategy.kt

@@ -1,43 +1,23 @@
+
 package com.wix.detox.reactnative.idlingresources.timers
 
-import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactContext
-import com.wix.detox.common.RNDropSupportTodo
-import com.wix.detox.reactnative.helpers.RNHelpers
-import org.joor.Reflect
+import com.facebook.react.modules.core.TimingModule
 
 private const val BUSY_WINDOW_THRESHOLD = 1500L
 
-private class RN62TimingModuleReflected(private val timingModule: NativeModule) {
-    fun hasActiveTimers(): Boolean = Reflect.on(timingModule).call("hasActiveTimersInRange", BUSY_WINDOW_THRESHOLD).get()
-}
-
 /**
  * Delegates the interrogation to the native module itself, added
  * [here](https://github.com/facebook/react-native/pull/27539) in the context
  * of RN v0.62 (followed by a previous refactor and rename of the class).
  */
-@RNDropSupportTodo(62, """
-    When min RN version supported by Detox is 0.62.x (or higher), can (and
-    should) remove any usage of reflection here.
-    That includes the unit test's stub being used for that reason in particular.
-    """)
-class DelegatedIdleInterrogationStrategy(timingModule: NativeModule): IdleInterrogationStrategy {
-    private val timingModuleReflected = RN62TimingModuleReflected(timingModule)
-
-    override fun isIdleNow(): Boolean = !timingModuleReflected.hasActiveTimers()
+class DelegatedIdleInterrogationStrategy(private val timingModule: TimingModule): IdleInterrogationStrategy {
+    override fun isIdleNow(): Boolean = !timingModule.hasActiveTimersInRange(BUSY_WINDOW_THRESHOLD)
 
     companion object {
-        fun createIfSupported(reactContext: ReactContext): DelegatedIdleInterrogationStrategy? {
-            val module = RNHelpers.getNativeModule(reactContext, "com.facebook.react.modules.core.TimingModule")
-                    ?: return null
-
-            return try {
-                module.javaClass.getDeclaredMethod("hasActiveTimersInRange", Long::class.java)
-                DelegatedIdleInterrogationStrategy(module)
-            } catch (ex: Exception) {
-                null
-            }
+        fun create(reactContext: ReactContext): DelegatedIdleInterrogationStrategy {
+            val timingModule = reactContext.getNativeModule(TimingModule::class.java)!!
+            return DelegatedIdleInterrogationStrategy(timingModule)
         }
     }
 }

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

@@ -1,6 +1,5 @@
 package com.wix.detox.reactnative.idlingresources.timers
 
-import android.util.Log
 import com.facebook.react.bridge.ReactContext
 import com.wix.detox.common.UIThread
 import java.util.concurrent.Callable
@@ -13,14 +12,5 @@ fun getInterrogationStrategy(reactContext: ReactContext): IdleInterrogationStrat
     // Getting a native-module (inside) also initializes it if needed. That has to run on a
     // looper thread, and the easiest to make sure that happens is to use the main thread.
     UIThread.runSync(Callable {
-        DelegatedIdleInterrogationStrategy.createIfSupported(reactContext)?.let {
-            return@Callable it
-        }
-
-        DefaultIdleInterrogationStrategy.createIfSupported(reactContext)?.let {
-            return@Callable it
-        }
-
-        Log.e(TimersIdlingResource.LOG_TAG, "Failed to determine proper implementation-strategy for timers idling resource")
-        null
+        return@Callable DelegatedIdleInterrogationStrategy.create(reactContext)
     })

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

@@ -2,6 +2,7 @@ package com.wix.detox.reactnative.idlingresources.uimodule
 
 import android.util.Log
 import android.view.View
+import com.facebook.react.uimanager.IllegalViewOperationException
 import com.wix.detox.common.DetoxLog.Companion.LOG_TAG
 import com.wix.detox.reactnative.ReactNativeInfo
 import java.lang.ref.WeakReference
@@ -19,9 +20,7 @@ class RN66Workaround {
     fun isScarceUISwitchCommandStuckInQueue(uiManagerModuleReflected: UIManagerModuleReflected): Boolean {
         var isStuckSwitchOperation = false
 
-        val rnVersion = ReactNativeInfo.rnVersion()
-
-        if (rnVersion.minor >= 66 && uiManagerModuleReflected.getUIOpsCount() >= 1) {
+        if (isRelevantRNVersion() && uiManagerModuleReflected.getUIOpsCount() >= 1) {
             val nextUIOperation = uiManagerModuleReflected.getNextUIOpReflected()
             val view = getUIOpView(uiManagerModuleReflected, nextUIOperation)
             val isReactSwitch = isReactSwitch(view)
@@ -46,10 +45,20 @@ class RN66Workaround {
         return isStuckSwitchOperation
     }
 
+    private fun isRelevantRNVersion(): Boolean {
+        val rnVersion = ReactNativeInfo.rnVersion()
+        return rnVersion.minor == 66 || (rnVersion.minor == 67 && rnVersion.patch < 4)
+    }
+
     private fun getUIOpView(uiManagerModuleReflected: UIManagerModuleReflected, uiOperation: DispatchCommandOperationReflected?): View? {
         val nativeViewHierarchyManager = uiManagerModuleReflected.nativeViewHierarchyManager() ?: return null
         val tag = uiOperation?.tag ?: return null
-        return nativeViewHierarchyManager.getViewClass(tag)
+        return try {
+            nativeViewHierarchyManager.getViewClass(tag)
+        } catch(e: IllegalViewOperationException) {
+            Log.e(LOG_TAG, "failed to get view from tag ", e.cause)
+            null
+        }
     }
 
     private fun isReactSwitch(view: View?) = try {

package/android/detox/src/main/java/com/wix/detox/common/DetoxErrors.java

@@ -5,7 +5,6 @@ public interface DetoxErrors {
         public DetoxRuntimeException(Throwable cause) {
             super(cause);
         }
-
         public DetoxRuntimeException(String message) {
             super(message);
         }
@@ -31,5 +30,9 @@ public interface DetoxErrors {
         public DetoxIllegalArgumentException(String message) {
             super(message);
         }
+
+        public DetoxIllegalArgumentException(Throwable cause) {
+            super(cause);
+        }
     }
 }

package/android/detox/src/main/java/com/wix/detox/common/TextFileReader.kt

@@ -3,5 +3,5 @@ package com.wix.detox.common
 import java.io.File
 
 internal class TextFileReader(private val fileName: String) {
-    fun read() = File(fileName).inputStream().readBytes().toString(Charsets.UTF_8)
+    fun read() = File(fileName).readText(Charsets.UTF_8)
 }

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

@@ -1,10 +1,11 @@
+
 package com.wix.detox.espresso
 
 import androidx.test.espresso.UiController
 import com.wix.detox.common.proxy.CallInfo
 import com.wix.detox.common.proxy.SpyingInvocationHandler
 import com.wix.detox.common.proxy.MethodsSpy
-import com.wix.detox.espresso.common.utils.getUiController
+import com.wix.detox.espresso.action.common.utils.getUiController
 import org.joor.Reflect
 
 class UiControllerSpy: MethodsSpy("uiController") {

package/android/detox/src/main/java/com/wix/detox/espresso/action/common/ReflectUtils.kt

@@ -0,0 +1,10 @@
+package com.wix.detox.espresso.action.common
+
+object ReflectUtils {
+    fun isAssignableFrom(source: Any, className: String) =
+        try {
+            Class.forName(className).isAssignableFrom(source.javaClass)
+        } catch (ex: ClassNotFoundException) {
+            false
+        }
+}

package/android/detox/src/main/java/com/wix/detox/espresso/action/common/utils/UiControllerUtils.kt

@@ -1,6 +1,6 @@
 @file:JvmName("UiControllerUtils")
 
-package com.wix.detox.espresso.common.utils
+package com.wix.detox.espresso.action.common.utils
 
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.UiController