Merge remote-tracking branch 'origin/master' into testid-naming-guide

wix · May 9, 2024 · 07ac990 · 07ac990
2 parents dc4c814 + 4c1c05e
commit 07ac990
Show file tree

Hide file tree

Showing 73 changed files with 98 additions and 2,566 deletions.
diff --git a/.buildkite/jobs/pipeline.android_demo_app_rn_73.yml b/.buildkite/jobs/pipeline.android_demo_app_rn_73.yml
@@ -7,7 +7,6 @@
       REACT_NATIVE_COMPAT_TEST: true # Only set 'true' in jobs with the latest supported RN
       DETOX_DISABLE_POD_INSTALL: true
       DETOX_DISABLE_POSTINSTALL: true
-      JAVA_HOME: /opt/openjdk/jdk-17.0.9.jdk/Contents/Home/
     artifact_paths:
-      - "/Users/builder/work/coverage/**/*.lcov"
-      - "/Users/builder/work/artifacts*.tar.gz"
+      - "/Users/builder/uibuilder/work/coverage/**/*.lcov"
+      - "/Users/builder/uibuilder/work/artifacts*.tar.gz"
diff --git a/.buildkite/jobs/pipeline.android_rn_71.yml b/.buildkite/jobs/pipeline.android_rn_71.yml
@@ -8,6 +8,6 @@
       DETOX_DISABLE_POSTINSTALL: true
       SKIP_UNIT_TESTS: true
     artifact_paths:
-      - "/Users/builder/work/coverage/**/*.lcov"
-      - "/Users/builder/work/**/allure-report-*.html"
-      - "/Users/builder/work/artifacts*.tar.gz"
+      - "/Users/builder/uibuilder/work/coverage/**/*.lcov"
+      - "/Users/builder/uibuilder/work/**/allure-report-*.html"
+      - "/Users/builder/uibuilder/work/artifacts*.tar.gz"
diff --git a/.buildkite/jobs/pipeline.android_rn_73.yml b/.buildkite/jobs/pipeline.android_rn_73.yml
@@ -6,8 +6,7 @@
       REACT_NATIVE_VERSION: 0.73.2
       DETOX_DISABLE_POD_INSTALL: true
       DETOX_DISABLE_POSTINSTALL: true
-      JAVA_HOME: /opt/openjdk/jdk-17.0.9.jdk/Contents/Home/
     artifact_paths:
-      - "/Users/builder/work/coverage/**/*.lcov"
-      - "/Users/builder/work/**/allure-report-*.html"
-      - "/Users/builder/work/artifacts*.tar.gz"
+      - "/Users/builder/uibuilder/work/coverage/**/*.lcov"
+      - "/Users/builder/uibuilder/work/**/allure-report-*.html"
+      - "/Users/builder/uibuilder/work/artifacts*.tar.gz"
diff --git a/.buildkite/jobs/pipeline.ios_demo_app_rn_71.yml b/.buildkite/jobs/pipeline.ios_demo_app_rn_71.yml
@@ -5,5 +5,5 @@
     env:
       REACT_NATIVE_VERSION: 0.71.10
     artifact_paths:
-      - "/Users/builder/work/coverage/**/*.lcov"
-      - "/Users/builder/work/artifacts*.tar.gz"
+      - "/Users/builder/uibuilder/work/coverage/**/*.lcov"
+      - "/Users/builder/uibuilder/work/artifacts*.tar.gz"
diff --git a/.buildkite/jobs/pipeline.ios_demo_app_rn_73.yml b/.buildkite/jobs/pipeline.ios_demo_app_rn_73.yml
@@ -5,5 +5,5 @@
     env:
       REACT_NATIVE_VERSION: 0.73.2
     artifact_paths:
-      - "/Users/builder/work/coverage/**/*.lcov"
-      - "/Users/builder/work/artifacts*.tar.gz"
+      - "/Users/builder/uibuilder/work/coverage/**/*.lcov"
+      - "/Users/builder/uibuilder/work/artifacts*.tar.gz"
diff --git a/.buildkite/jobs/pipeline.ios_rn_71.yml b/.buildkite/jobs/pipeline.ios_rn_71.yml
@@ -5,6 +5,6 @@
     env:
       REACT_NATIVE_VERSION: 0.71.10
     artifact_paths:
-      - "/Users/builder/work/coverage/**/*.lcov"
-      - "/Users/builder/work/**/allure-report-*.html"
-      - "/Users/builder/work/artifacts*.tar.gz"
+      - "/Users/builder/uibuilder/work/coverage/**/*.lcov"
+      - "/Users/builder/uibuilder/work/**/allure-report-*.html"
+      - "/Users/builder/uibuilder/work/artifacts*.tar.gz"
diff --git a/.buildkite/jobs/pipeline.ios_rn_73.yml b/.buildkite/jobs/pipeline.ios_rn_73.yml
@@ -5,6 +5,6 @@
     env:
       REACT_NATIVE_VERSION: 0.73.2
     artifact_paths:
-      - "/Users/builder/work/coverage/**/*.lcov"
-      - "/Users/builder/work/**/allure-report-*.html"
-      - "/Users/builder/work/artifacts*.tar.gz"
+      - "/Users/builder/uibuilder/work/coverage/**/*.lcov"
+      - "/Users/builder/uibuilder/work/**/allure-report-*.html"
+      - "/Users/builder/uibuilder/work/artifacts*.tar.gz"
diff --git a/.buildkite/pipeline.debug.yml b/.buildkite/pipeline.debug.yml
@@ -8,20 +8,20 @@ steps:
         multiple: true
         hint: "hey Chef, what are we cooking today?"
         options:
-          - label: "iOS RN 70"
+          - label: "iOS RN 71"
             value: "ios_rn_71"
-          - label: "iOS RN 70"
-            value: "ios_rn_71"
-          - label: "iOS Demo App RN 70"
-            value: "ios_demo_app_rn_70"
+          - label: "iOS RN 73"
+            value: "ios_rn_73"
           - label: "iOS Demo App RN 71"
             value: "ios_demo_app_rn_71"
-          - label: "Android RN 70"
-            value: "android_rn_70"
+          - label: "iOS Demo App RN 73"
+            value: "ios_demo_app_rn_73"
           - label: "Android RN 71"
             value: "android_rn_71"
-          - label: "Android Demo App RN 71"
-            value: "android_demo_app_rn_71"
+          - label: "Android RN 73"
+            value: "android_rn_73"
+          - label: "Android Demo App RN 73"
+            value: "android_demo_app_rn_73"
 
   - label: "Get Release Pipeline"
     command: '.buildkite/pipeline.sh debug | buildkite-agent pipeline upload'
diff --git a/.buildkite/pipeline.release.fast.yml b/.buildkite/pipeline.release.fast.yml
@@ -4,7 +4,7 @@
     command:
       - "nvm install"
       - "npm run package:ios"
-    artifact_paths: "/Users/builder/work/detox/*.tbz"
+    artifact_paths: "/Users/builder/uibuilder/work/detox/*.tbz"
 
   - label: ":android: Package android"
     key: 'android_package'
@@ -15,8 +15,8 @@
     env:
       DETOX_DISABLE_POSTINSTALL: true
       DETOX_DISABLE_POD_INSTALL: true
-      JAVA_HOME: /opt/openjdk/jdk-17.0.9.jdk/Contents/Home/
-    artifact_paths: "/Users/builder/work/detox/Detox-android/**/*"
+      JAVA_HOME: /opt/openjdk/openlogic-openjdk-17.0.9+9-mac-x64/jdk-17.0.9.jdk/Contents/Home
+    artifact_paths: "/Users/builder/uibuilder/work/detox/Detox-android/**/*"
 
   - label: ":android: Package android Legacy"
     key: 'android_package_legacy'
@@ -28,7 +28,7 @@
       REACT_NATIVE_VERSION: 0.71.10
       DETOX_DISABLE_POSTINSTALL: true
       DETOX_DISABLE_POD_INSTALL: true
-    artifact_paths: "/Users/builder/work/detox/Detox-android/**/*"
+    artifact_paths: "/Users/builder/uibuilder/work/detox/Detox-android/**/*"
 
   - label: ":shipit: Publish"
     depends_on:

diff --git a/.xcoderc b/.xcoderc
@@ -1 +1 @@
-15.1
+15.0.1
diff --git a/detox/android/detox/src/main/java/com/wix/detox/espresso/scroll/DetoxScrollActions.kt b/detox/android/detox/src/main/java/com/wix/detox/espresso/scroll/DetoxScrollActions.kt
@@ -20,7 +20,7 @@ abstract class DetoxScrollActionBase internal constructor(
     : ViewAction {
     override fun getConstraints(): Matcher<View> = allOf(isAssignableFrom(View::class.java), isDisplayed())
     override fun perform(uiController: UiController?, view: View?) =
-            ScrollHelper.perform(uiController, view, direction, amountInDp, startOffsetPercentX, startOffsetPercentY)
+        ScrollHelper.perform(uiController, view, direction, amountInDp, startOffsetPercentX, startOffsetPercentY)
 }
 
 class DetoxScrollAction(@MotionDir direction: Int, amountInDp: Double, startOffsetPercentX: Float?, startOffsetPercentY: Float?)
@@ -30,6 +30,8 @@ class DetoxScrollAction(@MotionDir direction: Int, amountInDp: Double, startOffs
     override fun perform(uiController: UiController?, view: View?) {
         try {
             super.perform(uiController, view)
+        } catch (e: ScrollEdgeException) {
+            // Hit the edge
         } catch (e: Exception) {
             throw DetoxRuntimeException(e)
         }

diff --git a/detox/android/detox/src/main/java/com/wix/detox/espresso/scroll/DetoxSwipe.kt b/detox/android/detox/src/main/java/com/wix/detox/espresso/scroll/DetoxSwipe.kt
@@ -1,7 +1,7 @@
 package com.wix.detox.espresso.scroll
 
 /**
- * Along with [FlinglessSwiper], this is based on from Espresso's implementation of Swiping
+ * Along with [LinearSwiper], this is based on from Espresso's implementation of Swiping
  * (i.e. in [androidx.test.espresso.action.Swipe] - typically dispatched via the
  * [androidx.test.espresso.action.GeneralSwipeAction] action class).
  *

diff --git a/detox/android/detox/src/main/java/com/wix/detox/espresso/scroll/FlinglessSwiper.kt b/detox/android/detox/src/main/java/com/wix/detox/espresso/scroll/FlinglessSwiper.kt
diff --git a/detox/android/detox/src/main/java/com/wix/detox/espresso/scroll/ScrollHelper.java b/detox/android/detox/src/main/java/com/wix/detox/espresso/scroll/ScrollHelper.java
@@ -29,7 +29,7 @@
 public class ScrollHelper {
     private static final String LOG_TAG = "DetoxScrollHelper";
 
-    private static final int SCROLL_MOTIONS = 70;
+    private static final int SCROLL_MOTIONS = 40;
     private static final int MAX_FLING_WAITS = 3;
 
     private static final double DEFAULT_DEADZONE_PERCENT = 0.05;
@@ -95,7 +95,7 @@ private static void scrollOnce(UiController uiController, View view, @MotionDir
     }
 
     private static void doScroll(final Context context, final UiController uiController, int downX, int downY, int upX, int upY) {
-        final DetoxSwiper swiper = new FlinglessSwiper(SCROLL_MOTIONS, uiController, ViewConfiguration.get(context));
+        final DetoxSwiper swiper = new LinearSwiper(uiController);
         final DetoxSwipe swipe = new DetoxSwipe(downX, downY, upX, upY, SCROLL_MOTIONS, swiper);
         swipe.perform();
     }