detox 20.27.7-smoke.0 → 20.31.0

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

@@ -0,0 +1 @@
+3874ff4a56e24600a473d514e4e29e40

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

@@ -0,0 +1 @@
+629c66f412e7b606503f31713eabd46fa55b618b

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

@@ -0,0 +1 @@
+ca7005ce7e3de6a7fcd96d421742587ed196a0343d90e031501318d3fc3bf54a

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

@@ -0,0 +1 @@
+033a223e6731b20be6db87a17bfcd4be7ff0833cc8686b66f63aa6ba74f2d05c4735715074fcc9834efe265f282823830102b7a5f808dca7865bd9956ec4b782

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

@@ -0,0 +1 @@
+c5f3daffcbc4e0f545784d563efc793c

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

@@ -0,0 +1 @@
+fd392c76debf7d9afdbfd9f7eb0c48766395bd82

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

@@ -0,0 +1 @@
+f6623de89efe2e0b49241ef2c9ec3fee79cf3d84e7dbf5d2f00d762427a32cab

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

@@ -0,0 +1 @@
+92906ac80969295c0ca21b3428801173fa48bb93ffc0ff2450f2d74af4a6c2b6c9afdcb07c49bd46f2bb791317b8dd43bd30ff5801839fa3c7deafd6c8348548

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

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.27.7-smoke.0</version>
+  <version>20.30.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>1.8.0</version>
+      <version>1.9.24</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

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

@@ -0,0 +1 @@
+3c6dcd60dee4e0fc2d0224627831750b

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

@@ -0,0 +1 @@
+de3d4cc5a268e3535f7dc4d9e11fd6bf5f91729c

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

@@ -0,0 +1 @@
+463591b08b156e20021aa77adc93813045a82d3925156dc7f08e1aa092a5e3eb

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

@@ -0,0 +1 @@
+ae13b47252859419d791e1f85f44b8abf97d2817a5ad5a7f7cba39172bd8f816b1fbff2a5b72da47875447d8a268c6dd56a9ffcdb04b4c6b98a4cab8485b8865

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.27.7-smoke.0</latest>
-    <release>20.27.7-smoke.0</release>
+    <latest>20.30.0</latest>
+    <release>20.30.0</release>
     <versions>
-      <version>20.27.7-smoke.0</version>
+      <version>20.30.0</version>
     </versions>
-    <lastUpdated>20241103220531</lastUpdated>
+    <lastUpdated>20241226125215</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-ebda30a3b044d201aaf8fcb02e932cec
+ad324f05689fe3b7b826d7d867e84f37

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

@@ -1 +1 @@
-5adda00fd360478449a0754c8f64e7bb3c8e908b
+70d396df4a41cca1caf0c5ba0e61dab492278a3e

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

@@ -1 +1 @@
-b9d1d0f22516176030945e087241218776c394d2084f3d869c783b634af12911
+6351eb801890ff4733ba3c301fd62b8a296193a1bfd2397dbadc61c9c80796a9

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

@@ -1 +1 @@
-fbd2958bf59db3a3305a8af36159033aa962183fc81ef2c43d0f7542b36d9e13b71d7b971a4e33ed958ab57860a1ed2f948d6cdb741420ef3554433f94604a3e
+6c94d87a91120ce7745700afc1d1f6c53a4abfe8b9ee10111448dffed21bb204c15ff991e07b6fe63fbd4fed4d4d7030593c490f15cb223c97adb37bc8c5e306

package/android/build.gradle

@@ -3,12 +3,12 @@ buildscript {
 
     ext {
         isOfficialDetoxLib = true
-        kotlinVersion = '1.8.0'
+        kotlinVersion = '1.9.24'
         dokkaVersion = '1.9.10'
-        buildToolsVersion = '34.0.0'
-        compileSdkVersion = 34
-        targetSdkVersion = 34
-        minSdkVersion = 21
+        buildToolsVersion = '35.0.0'
+        compileSdkVersion = 35
+        targetSdkVersion = 35
+        minSdkVersion = 24
     }
     ext.detoxKotlinVersion = ext.kotlinVersion
 

package/android/detox/proguard-rules-app.pro

@@ -8,6 +8,9 @@
 -keep class com.facebook.react.ReactInstanceManager { *; }
 -keep class com.facebook.react.ReactInstanceManager** { *; }
 -keep class com.facebook.react.ReactInstanceEventListener { *; }
+-keep class com.facebook.react.soloader.OpenSourceMergedSoMapping { *; }
+-keep class com.facebook.soloader.SoLoader { *; }
+-keep class com.facebook.soloader.ExternalSoMapping { *; }
 
 -keep class com.facebook.react.views.slider.** { *; }
 -keep class com.google.android.material.slider.** { *; }

package/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java

@@ -13,7 +13,7 @@ import android.view.ViewGroup;
 import com.facebook.react.ReactApplication;
 import com.wix.detox.common.UIThread;
 import com.wix.detox.reactnative.ReactNativeExtension;
-import com.wix.detox.reactnative.idlingresources.NetworkIdlingResource;
+import com.wix.detox.reactnative.idlingresources.network.NetworkIdlingResource;
 
 import org.hamcrest.Matcher;
 
@@ -21,12 +21,11 @@ import java.util.ArrayList;
 
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
-import androidx.test.espresso.ViewInteraction;
-import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
+import static com.wix.detox.espresso.UiAutomatorHelper.getStatusBarHeightDps;
 
 /**
  * Created by rotemm on 26/12/2016.
@@ -34,6 +33,10 @@ import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
 public class EspressoDetox {
     private static final String LOG_TAG = "detox";
 
+    private static int calculateAdjustedY(View view, Integer y, boolean shouldIgnoreStatusBar) {
+        return shouldIgnoreStatusBar ? y + getStatusBarHeightDps(view) : y;
+    }
+
     public static Object perform(Matcher<View> matcher, ViewAction action) {
         ViewActionPerformer performer = ViewActionPerformer.forAction(action);
         return performer.performOn(matcher);
@@ -121,5 +124,53 @@ public class EspressoDetox {
             }
         });
     }
+
+    public static void tap(Integer x, Integer y, boolean shouldIgnoreStatusBar) {
+        onView(isRoot()).perform(new ViewAction() {
+            @Override
+            public Matcher<View> getConstraints() {
+                return isRoot();
+            }
+
+            @Override
+            public String getDescription() {
+                return "tap on screen";
+            }
+
+            @Override
+            public void perform(UiController uiController, View view) {
+                int adjustedY = calculateAdjustedY(view, y, shouldIgnoreStatusBar);
+                ViewAction action = DetoxAction.tapAtLocation(x, adjustedY);
+                action.perform(uiController, view);
+                uiController.loopMainThreadUntilIdle();
+            }
+        });
+    }
+
+    public static void longPress(Integer x, Integer y, boolean shouldIgnoreStatusBar) {
+        longPress(x, y, null, shouldIgnoreStatusBar);
+    }
+
+    public static void longPress(Integer x, Integer y, Integer duration, boolean shouldIgnoreStatusBar) {
+        onView(isRoot()).perform(new ViewAction() {
+            @Override
+            public Matcher<View> getConstraints() {
+                return isRoot();
+            }
+
+            @Override
+            public String getDescription() {
+                return "long press on screen";
+            }
+
+            @Override
+            public void perform(UiController uiController, View view) {
+                int adjustedY = calculateAdjustedY(view, y, shouldIgnoreStatusBar);
+                ViewAction action = DetoxAction.longPress(x, adjustedY, duration);
+                action.perform(uiController, view);
+                uiController.loopMainThreadUntilIdle();
+            }
+        });
+    }
 }
 

package/android/detox/src/full/java/com/wix/detox/espresso/UiAutomatorHelper.java

@@ -1,8 +1,13 @@
 package com.wix.detox.espresso;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
 import android.os.Handler;
+import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.Choreographer;
+import android.view.View;
 
 import com.wix.detox.common.UIThread;
 import com.wix.detox.espresso.action.common.utils.UiControllerUtils;
@@ -111,4 +116,10 @@ public class UiAutomatorHelper {
         }
     }
 
+    @SuppressLint({"DiscouragedApi", "InternalInsetResource"})
+    public static int getStatusBarHeightDps(View view) {
+        Context context = view.getContext();
+        int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        return (int) (context.getResources().getDimensionPixelSize(resourceId) / ((float) context.getResources().getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT));
+    }
 }

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

@@ -120,7 +120,7 @@ class IsDisplayingAtLeastDetoxMatcher(private val areaPercentage: Int) : TypeSaf
             .defaultDisplay
             .getMetrics(m)
 
-        val statusBarHeight = getStatusBarHeight(view)
+        val statusBarHeight = getStatusBarHeightPixels(view)
         val actionBarHeight = getActionBarHeight(view)
         return Rect(0, 0, m.widthPixels, m.heightPixels - (statusBarHeight + actionBarHeight))
     }
@@ -138,7 +138,7 @@ class IsDisplayingAtLeastDetoxMatcher(private val areaPercentage: Int) : TypeSaf
     }
 
     @SuppressLint("InternalInsetResource", "DiscouragedApi")
-    private fun getStatusBarHeight(view: View): Int {
+    private fun getStatusBarHeightPixels(view: View): Int {
         val resourceId = view.context.resources.getIdentifier("status_bar_height", "dimen", "android")
         return if (resourceId > 0) view.context.resources.getDimensionPixelSize(resourceId) else 0
     }

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

@@ -3,15 +3,12 @@ package com.wix.detox.espresso.web;
 
 import static androidx.test.espresso.web.webdriver.DriverAtoms.findMultipleElements;
 
-import static com.wix.detox.espresso.web.DetoxDriverAtoms.findMultipleElementsDetox;
-
 import androidx.test.espresso.web.model.Atom;
 import androidx.test.espresso.web.model.ElementReference;
 import androidx.test.espresso.web.webdriver.Locator;
 
 import java.util.List;
 
-
 public class DetoxWebAtomMatcher {
 
     private DetoxWebAtomMatcher() {
@@ -19,19 +16,19 @@ public class DetoxWebAtomMatcher {
     }
 
     public static Atom<List<ElementReference>> matcherForId(String id) {
-        return findMultipleElementsDetox(Locator.ID, id);
+        return findMultipleElements(Locator.ID, id);
     }
 
     public static Atom<List<ElementReference>> matcherForClassName(String className) {
-        return findMultipleElementsDetox(Locator.CLASS_NAME, className);
+        return findMultipleElements(Locator.CLASS_NAME, className);
     }
 
     public static Atom<List<ElementReference>> matcherForCssSelector(String cssSelector) {
-        return findMultipleElementsDetox(Locator.CSS_SELECTOR, cssSelector);
+        return findMultipleElements(Locator.CSS_SELECTOR, cssSelector);
     }
 
     public static Atom<List<ElementReference>> matcherForName(String name) {
-        return findMultipleElementsDetox(Locator.NAME, name);
+        return findMultipleElements(Locator.NAME, name);
     }
 
     public static Atom<List<ElementReference>> matcherForXPath(String xpath) {

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

@@ -1,11 +1,8 @@
 package com.wix.detox.espresso.web;
 
-import android.util.Log;
-
 import androidx.test.espresso.web.model.Atom;
 import androidx.test.espresso.web.model.Atoms;
 import androidx.test.espresso.web.model.ElementReference;
-import androidx.test.espresso.web.model.Evaluation;
 import androidx.test.espresso.web.model.SimpleAtom;
 import androidx.test.espresso.web.sugar.Web;
 import androidx.test.espresso.web.webdriver.DriverAtoms;
@@ -31,9 +28,7 @@ public class WebElement {
     }
 
     ElementReference get() {
-        long timestamp = System.currentTimeMillis();
         List<ElementReference> elements = getWebViewInteraction().withTimeout(30, TimeUnit.SECONDS).perform(matcherAtom).get();
-        Log.d("WebElement", "Time taken to get element: " + (System.currentTimeMillis() - timestamp) + "ms");
 
         if (elements == null || elements.size() == 0 || index >= elements.size()) {
             throw new RuntimeException(String.format("element was not found at index: %d", index));

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

@@ -1,5 +1,7 @@
 package com.wix.detox.espresso.web;
 
+import static androidx.test.espresso.web.sugar.Web.onWebView;
+
 import android.view.View;
 import android.webkit.WebView;
 
@@ -7,24 +9,47 @@ import androidx.test.espresso.web.model.Atom;
 import androidx.test.espresso.web.model.ElementReference;
 import androidx.test.espresso.web.sugar.Web;
 
-import org.hamcrest.CoreMatchers;
+import org.hamcrest.Description;
 import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
 
 import java.util.List;
 
 import javax.annotation.Nullable;
 
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.web.sugar.Web.onWebView;
-import static org.hamcrest.CoreMatchers.allOf;
-
 public class WebViewElement {
 
-    final Matcher<View> matcher;
+    private final static String WRAPPER_WEBVIEW_CLASS_NAME = "RNCWebViewWrapper";
+
     final Web.WebInteraction<Void> webViewInteraction;
 
-    WebViewElement(@Nullable Matcher<View> matcher) {
-        this.matcher = matcher != null ? matcher : allOf(CoreMatchers.<View>instanceOf(WebView.class), isDisplayed());
+    WebViewElement(@Nullable Matcher<View> userMatcher) {
+        Matcher<View> matcher = null;
+
+        if (userMatcher != null) {
+            matcher = new TypeSafeMatcher<>() {
+
+                @Override
+                protected boolean matchesSafely(View item) {
+                    // Support for react-native-webview >= 13.0.0
+                    if (item instanceof WebView && item.getParent().getClass().getSimpleName().equals(WRAPPER_WEBVIEW_CLASS_NAME)) {
+                        return userMatcher.matches(item.getParent());
+                    }
+
+                    if (item.getClass().getSimpleName().equals("RNCWebViewWrapper")) {
+                        // We never want to match the wrapper of the webview
+                        return false;
+                    }
+
+                    return userMatcher.matches(item);
+                }
+
+                @Override
+                public void describeTo(Description description) {
+                    userMatcher.describeTo(description);
+                }
+            };
+        }
         this.webViewInteraction = matcher != null ? onWebView(matcher) : onWebView();
     }
 

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

@@ -8,6 +8,7 @@ import com.facebook.react.ReactApplication
 import com.facebook.react.ReactInstanceManager
 import com.facebook.react.bridge.ReactContext
 import com.wix.detox.LaunchArgs
+import com.wix.detox.reactnative.idlingresources.ReactNativeIdlingResources
 
 private const val LOG_TAG = "DetoxRNExt"
 
@@ -56,7 +57,6 @@ object ReactNativeExtension {
         Log.i(LOG_TAG, "Reloading React Native")
 
         (applicationContext as ReactApplication).let {
-            val networkSyncEnabled = rnIdlingResources?.networkSyncEnabled ?: true
             clearIdlingResources()
 
             val previousReactContext = getCurrentReactContextSafe(it)
@@ -64,7 +64,7 @@ object ReactNativeExtension {
             reloadReactNativeInBackground(it)
             val reactContext = awaitNewReactNativeContext(it, previousReactContext)
 
-            enableOrDisableSynchronization(reactContext, networkSyncEnabled)
+            enableOrDisableSynchronization(reactContext)
         }
     }
 
@@ -93,11 +93,6 @@ object ReactNativeExtension {
         return null
     }
 
-    @JvmStatic
-    fun setNetworkSynchronization(enable: Boolean) {
-        rnIdlingResources?.setNetworkSynchronization(enable)
-    }
-
     @JvmStatic
     fun toggleNetworkSynchronization(enable: Boolean) {
         rnIdlingResources?.let {
@@ -129,11 +124,11 @@ object ReactNativeExtension {
         return rnLoadingMonitor.getNewContext()!!
     }
 
-    private fun enableOrDisableSynchronization(reactContext: ReactContext, networkSyncEnabled: Boolean = true) {
+    private fun enableOrDisableSynchronization(reactContext: ReactContext) {
         if (shouldDisableSynchronization()) {
             clearAllSynchronization()
         } else {
-            setupIdlingResources(reactContext, networkSyncEnabled)
+            setupIdlingResources(reactContext)
         }
     }
 
@@ -142,10 +137,10 @@ object ReactNativeExtension {
         return launchArgs.hasEnableSynchronization() && launchArgs.enableSynchronization.equals("0")
     }
 
-    private fun setupIdlingResources(reactContext: ReactContext, networkSyncEnabled: Boolean = true) {
+    private fun setupIdlingResources(reactContext: ReactContext) {
         val launchArgs = LaunchArgs()
 
-        rnIdlingResources = ReactNativeIdlingResources(reactContext, launchArgs, networkSyncEnabled).apply {
+        rnIdlingResources = ReactNativeIdlingResources(reactContext, launchArgs).apply {
             registerAll()
         }
     }

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

@@ -1,20 +1,13 @@
 package com.wix.detox.reactnative
 
-import org.joor.Reflect
-import java.util.Map
+import com.facebook.react.modules.systeminfo.ReactNativeVersion
 
 data class RNVersion(val major: Int, val minor: Int, val patch: Int)
 
 object ReactNativeInfo {
-    private var rnVersion: RNVersion =
-            try {
-                val versionClass = Class.forName("com.facebook.react.modules.systeminfo.ReactNativeVersion")
-                val versionMap: Map<String, Int> = Reflect.on(versionClass).field("VERSION").get()
-                RNVersion(versionMap.get("major")!!, versionMap.get("minor")!!, versionMap.get("patch")!!)
-            } catch (e: ClassNotFoundException) {
-                // ReactNativeVersion was introduced in RN50, default to latest previous version.
-                RNVersion(0, 49, 0)
-            }
+    private var rnVersion: RNVersion = ReactNativeVersion.VERSION.run {
+        RNVersion(get("major") as Int, get("minor") as Int, get("patch") as Int)
+    }
 
     @JvmStatic
     fun rnVersion() = rnVersion

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

@@ -0,0 +1,42 @@
+package com.wix.detox.reactnative.idlingresources
+
+import androidx.test.espresso.IdlingResource
+import com.wix.detox.espresso.idlingresources.DescriptiveIdlingResource
+import java.util.concurrent.atomic.AtomicBoolean
+
+abstract class DetoxIdlingResource : DescriptiveIdlingResource {
+    private var callback: IdlingResource.ResourceCallback? = null
+    private var paused: AtomicBoolean = AtomicBoolean(false)
+
+    fun pause() {
+        paused.set(true)
+        notifyIdle()
+    }
+
+    fun resume() {
+        paused.set(false)
+    }
+
+
+    override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
+        this.callback = callback
+    }
+
+    final override fun isIdleNow(): Boolean {
+        if (paused.get()) {
+            return true
+        }
+        return checkIdle()
+    }
+
+    open fun onUnregistered() {
+        // no-op
+    }
+
+    protected abstract fun checkIdle(): Boolean
+
+
+    fun notifyIdle() {
+        callback?.onTransitionToIdle()
+    }
+}