detox 20.12.1 → 20.13.0

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

@@ -0,0 +1 @@
+0709a8a30b2cc4c27244a2257ac28ed7

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

@@ -0,0 +1 @@
+08f017a03aa160bead65af9b208ea95857ac9697

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

@@ -0,0 +1 @@
+5cc49445c8f5440e5e5ed8d2d95e4827fb1ab4796d20e32ab30d7151da661ce7

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

@@ -0,0 +1 @@
+7360ab285d19450619f38c7da9985fda6514d382f903e87a2af9d4e0204a0250851c412a045da6ce04cc932e9addf7c131fd5147889975be20910e2fdc64e88f

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

@@ -0,0 +1 @@
+972fa81d6c5d9f0eb6edc63765bf01af

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

@@ -0,0 +1 @@
+1ea26448826d4701a7dce9d2c0c24355853ad9d7

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

@@ -0,0 +1 @@
+6b2f9a8186f2eef1075910eae28c189ac2030561520277e503e3a696f3c977e2

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

@@ -0,0 +1 @@
+eae9264b4d57f78a80ecffae3c85e157a2cd1df1b2259c0edc93f5c22d305a004216c5e9e6b35a1415fab6ba14a4f6667acd2eac4d5c6ae5a7a410ee85ca2c7c

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

@@ -0,0 +1 @@
+0ff20c1510b97ba80b15a438ce65bddc

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

@@ -0,0 +1 @@
+449b07e6bb8435baef57e3d0839e68b5f7f85af5

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

@@ -0,0 +1 @@
+c3347ddd7b4e4a94c60c55c079451ea219e050f7c69b8dbc7b59a453d2398e67

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

@@ -0,0 +1 @@
+ebcf7f52b7e34a391174fc8850879e39a3e3f8f8ccfa0a417937680187461d5b41f7811933ca5ca088c554ae7a4e8d8cb2198375fdbb55680888aac561c71f64

package/Detox-android/com/wix/detox/{20.12.1/detox-20.12.1.pom → 20.13.0/detox-20.13.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.12.1</version>
+  <version>20.13.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>
@@ -84,12 +84,6 @@
       <version>1.2.0</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.android.material</groupId>
-      <artifactId>material</artifactId>
-      <version>1.2.1</version>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>

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

@@ -0,0 +1 @@
+293aa59dd07a84b7a1bd7c4dc2bffe16

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

@@ -0,0 +1 @@
+144cef7278f92d8e7798cae134d8f93136492080

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

@@ -0,0 +1 @@
+a1062bb5feb8cb7210de7f0e2c36d8a219f8d4065377c9ced13ae55d7eb13220

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

@@ -0,0 +1 @@
+216ecb00454a1e03ef9ab2a197b616c4d326ec6ef47fd08b83b22d57c2c9d4dc37725a3c4d19600874074b40918387cebd1be11d558270af4ab7e797af40607f

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

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.12.1</latest>
-    <release>20.12.1</release>
+    <latest>20.13.0</latest>
+    <release>20.13.0</release>
     <versions>
-      <version>20.12.1</version>
+      <version>20.13.0</version>
     </versions>
-    <lastUpdated>20230919081610</lastUpdated>
+    <lastUpdated>20231002075250</lastUpdated>
   </versioning>
 </metadata>

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

@@ -1 +1 @@
-1e3fc98a2197d7ff387e7c2bba133329
+253d464cc30a2d00e586eadca31d5952

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

@@ -1 +1 @@
-0bd2298f41bb8578b4eb3bf4b744dbbec757a1ac
+1a402a8246b4532c9be982b61c2b4d3b3e6ab741

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

@@ -1 +1 @@
-01991e2c36e2b46d6ee16a7de9a7bb11fdb5bb1e2f134bcd7e06a6b5f2f74fa8
+09104c2799b83cedb2f68628779529f7efb1e96b3e33c0ed8c814da6a5e19ef8

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

@@ -1 +1 @@
-9c4f073180d321ea3a79f98c16155c2e55e0e2a53ea3052bda82a18a893d35af8e5a257b882f3dcbd723e0886ee3b874f92bdd2a102d06b80a8fb9090c480d2f
+b1547a601cae891dc3f1a58b66c63e70670d9f3e512c50cb6d26d40568972b94cb2f28887c13ea8d04e2b75b57bba73f8ba4ad780b471009fed3cd4e42b469ae

package/android/detox/build.gradle

@@ -126,9 +126,6 @@ dependencies {
 
 // Third-party/extension deps.
 dependencies {
-    implementation("com.google.android.material:material:$_materialMinVersion") {
-        because 'Material components are mentioned explicitly (e.g. Slider in get-attributes handler)'
-    }
     implementation('org.apache.commons:commons-lang3:3.7') {
         because 'Needed by invoke. Warning: Upgrading to newer versions is not seamless.'
     }
@@ -150,6 +147,10 @@ dependencies {
     testImplementation 'org.apache.commons:commons-io:1.3.2'
     testImplementation 'org.mockito.kotlin:mockito-kotlin:4.0.0'
     testImplementation 'org.robolectric:robolectric:4.4'
+
+    testImplementation("com.google.android.material:material:$_materialMinVersion") {
+        because 'Material components are mentioned explicitly (e.g. Slider in get-attributes handler)'
+    }
 }
 
 // Spek (https://spekframework.org/setup-android)

package/android/detox/src/full/java/com/wix/detox/espresso/action/AdjustSliderToPositionAction.kt

@@ -6,7 +6,7 @@ import androidx.test.espresso.UiController
 import androidx.test.espresso.ViewAction
 import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import com.wix.detox.espresso.common.SliderHelper
+import com.wix.detox.espresso.common.ReactSliderHelper
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers
 
@@ -16,7 +16,7 @@ class AdjustSliderToPositionAction(private val targetPositionPct: Double) : View
         Matchers.allOf( isDisplayed(), isAssignableFrom(AppCompatSeekBar::class.java) )
 
     override fun perform(uiController: UiController?, view: View) {
-        val sliderHelper = SliderHelper.create(view)
+        val sliderHelper = ReactSliderHelper.create(view)
         sliderHelper.setProgressPct(targetPositionPct)
     }
 }

package/android/detox/src/full/java/com/wix/detox/espresso/action/GetAttributesAction.kt

@@ -7,10 +7,10 @@ import android.widget.CheckBox
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.test.espresso.UiController
-import com.google.android.material.slider.Slider
 import com.wix.detox.espresso.ViewActionWithResult
 import com.wix.detox.espresso.MultipleViewsAction
-import com.wix.detox.espresso.common.SliderHelper
+import com.wix.detox.espresso.common.ReactSliderHelper
+import com.wix.detox.espresso.common.MaterialSliderHelper
 import com.wix.detox.reactnative.ui.getAccessibilityLabel
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers
@@ -18,23 +18,25 @@ import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.notNullValue
 import org.json.JSONObject
 
+private interface AttributeExtractor {
+    fun extractAttributes(json: JSONObject, view: View)
+}
+
 class GetAttributesAction() : ViewActionWithResult<JSONObject?>, MultipleViewsAction {
-    private val commonAttributes = CommonAttributes()
-    private val textViewAttributes = TextViewAttributes()
-    private val checkBoxAttributes = CheckBoxAttributes()
-    private val progressBarAttributes = ProgressBarAttributes()
-    private val sliderAttributes = SliderAttributes()
+    private val attributeExtractors = listOf(
+        CommonAttributes(),
+        TextViewAttributes(),
+        CheckBoxAttributes(),
+        ProgressBarAttributes(),
+        MaterialSliderAttributes()
+    )
     private var result: JSONObject? = null
 
     override fun perform(uiController: UiController?, view: View?) {
         view!!
 
         val json = JSONObject()
-        commonAttributes.get(json, view)
-        textViewAttributes.get(json, view)
-        checkBoxAttributes.get(json, view)
-        progressBarAttributes.get(json, view)
-        sliderAttributes.get(json, view)
+        attributeExtractors.forEach { it.extractAttributes(json, view) }
 
         result = json
     }
@@ -44,8 +46,8 @@ class GetAttributesAction() : ViewActionWithResult<JSONObject?>, MultipleViewsAc
     override fun getConstraints(): Matcher<View> = allOf(notNullValue(), Matchers.isA(View::class.java))
 }
 
-private class CommonAttributes {
-    fun get(json: JSONObject, view: View) {
+private class CommonAttributes : AttributeExtractor {
+    override fun extractAttributes(json: JSONObject, view: View) {
         getId(json, view)
         getVisibility(json, view)
         getAccessibilityLabel(json, view)
@@ -89,8 +91,8 @@ private class CommonAttributes {
     }
 }
 
-private class TextViewAttributes {
-    fun get(json: JSONObject, view: View) {
+private class TextViewAttributes : AttributeExtractor {
+    override fun extractAttributes(json: JSONObject, view: View) {
         if (view is TextView) {
             getText(json, view)
             getLength(json, view)
@@ -118,8 +120,8 @@ private class TextViewAttributes {
             }
 }
 
-private class CheckBoxAttributes {
-    fun get(json: JSONObject, view: View) {
+private class CheckBoxAttributes : AttributeExtractor {
+    override fun extractAttributes(json: JSONObject, view: View) {
         if (view is CheckBox) {
             getCheckboxValue(json, view)
         }
@@ -133,31 +135,28 @@ private class CheckBoxAttributes {
  * Note: this applies also to [androidx.appcompat.widget.AppCompatSeekBar], which
  * is anything RN-slider-ish.
  */
-private class ProgressBarAttributes {
-    fun get(json: JSONObject, view: View) {
+private class ProgressBarAttributes : AttributeExtractor {
+    override fun extractAttributes(json: JSONObject, view: View) {
         if (view is ProgressBar) {
-            SliderHelper.maybeCreate(view)?.let {
-                getRNSliderValue(json, it)
+            ReactSliderHelper.maybeCreate(view)?.let {
+                getReactSliderValue(json, it)
             } ?:
                 getProgressBarValue(json, view)
         }
     }
 
-    private fun getRNSliderValue(rootObject: JSONObject, sliderHelper: SliderHelper) {
-        rootObject.put("value", sliderHelper.getCurrentProgressPct())
+    private fun getReactSliderValue(rootObject: JSONObject, reactSliderHelper: ReactSliderHelper) {
+        rootObject.put("value", reactSliderHelper.getCurrentProgressPct())
     }
 
     private fun getProgressBarValue(rootObject: JSONObject, view: ProgressBar) =
             rootObject.put("value", view.progress)
 }
 
-private class SliderAttributes {
-    fun get(json: JSONObject, view: View) {
-        if (view is Slider) {
-            getSliderValue(json, view)
+private class MaterialSliderAttributes : AttributeExtractor {
+    override fun extractAttributes(json: JSONObject, view: View) {
+        MaterialSliderHelper(view).getValueIfSlider()?.let {
+            json.put("value", it)
         }
     }
-
-    private fun getSliderValue(rootObject: JSONObject, view: Slider) =
-        rootObject.put("value", view.value)
 }

package/android/detox/src/full/java/com/wix/detox/espresso/common/MaterialSliderHelper.kt

@@ -0,0 +1,21 @@
+package com.wix.detox.espresso.common
+
+import android.view.View
+import com.wix.detox.espresso.action.common.ReflectUtils
+import org.joor.Reflect
+
+private const val CLASS_MATERIAL_SLIDER = "com.google.android.material.slider.Slider"
+
+open class MaterialSliderHelper(protected val view: View) {
+    fun getValueIfSlider(): Float? {
+        if (!isSlider()) {
+            return null
+        }
+
+        return getValue()
+    }
+
+    private fun isSlider() = ReflectUtils.isAssignableFrom(view, CLASS_MATERIAL_SLIDER)
+
+    private fun getValue() = Reflect.on(view).call("getValue").get() as Float
+}

package/android/detox/src/full/java/com/wix/detox/espresso/common/{SliderHelper.kt → ReactSliderHelper.kt}

@@ -11,8 +11,9 @@ import org.joor.Reflect
 
 private const val CLASS_REACT_SLIDER_LEGACY = "com.facebook.react.views.slider.ReactSlider"
 private const val CLASS_REACT_SLIDER_COMMUNITY = "com.reactnativecommunity.slider.ReactSlider"
+private const val CLASS_REACT_SLIDER_COMMUNITY_MANAGER = "com.reactnativecommunity.slider.ReactSliderManager"
 
-abstract class SliderHelper(protected val slider: AppCompatSeekBar) {
+abstract class ReactSliderHelper(protected val slider: AppCompatSeekBar) {
     fun getCurrentProgressPct(): Double {
         val nativeProgress = slider.progress.toDouble()
         val nativeMax = slider.max
@@ -46,7 +47,7 @@ abstract class SliderHelper(protected val slider: AppCompatSeekBar) {
                 ?: throw DetoxIllegalStateException("Cannot handle this type of a seek-bar view (Class ${view.javaClass.canonicalName}). " +
                         "Only React Native sliders are currently supported.")
 
-        fun maybeCreate(view: View): SliderHelper? =
+        fun maybeCreate(view: View): ReactSliderHelper? =
             when {
                 ReflectUtils.isAssignableFrom(view, CLASS_REACT_SLIDER_LEGACY)
                    -> LegacySliderHelper(view as ReactSlider)
@@ -58,7 +59,7 @@ abstract class SliderHelper(protected val slider: AppCompatSeekBar) {
     }
 }
 
-private class LegacySliderHelper(slider: ReactSlider): SliderHelper(slider) {
+private class LegacySliderHelper(slider: ReactSlider): ReactSliderHelper(slider) {
     override fun setProgressJS(valueJS: Double) {
         val reactSliderManager = com.facebook.react.views.slider.ReactSliderManager()
         reactSliderManager.updateProperties(slider as ReactSlider, buildStyles("value", valueJS))
@@ -67,9 +68,9 @@ private class LegacySliderHelper(slider: ReactSlider): SliderHelper(slider) {
     private fun buildStyles(vararg keysAndValues: Any) = ReactStylesDiffMap(JavaOnlyMap.of(*keysAndValues))
 }
 
-private class CommunitySliderHelper(slider: AppCompatSeekBar): SliderHelper(slider) {
+private class CommunitySliderHelper(slider: AppCompatSeekBar): ReactSliderHelper(slider) {
     override fun setProgressJS(valueJS: Double) {
-        val reactSliderManager = Class.forName("com.reactnativecommunity.slider.ReactSliderManager").newInstance()
+        val reactSliderManager = Class.forName(CLASS_REACT_SLIDER_COMMUNITY_MANAGER).newInstance()
         Reflect.on(reactSliderManager).call("setValue", slider, valueJS)
     }
 }

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

@@ -7,7 +7,7 @@ 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.wix.detox.espresso.common.SliderHelper
+import com.wix.detox.espresso.common.ReactSliderHelper
 import org.hamcrest.*
 import org.hamcrest.Matchers.*
 import kotlin.math.abs
@@ -60,7 +60,7 @@ fun toHaveSliderPosition(expectedValuePct: Double, tolerance: Double): Matcher<V
         }
 
         override fun matchesSafely(view: AppCompatSeekBar): Boolean {
-            val sliderHelper = SliderHelper.create(view)
+            val sliderHelper = ReactSliderHelper.create(view)
             val progressPct = sliderHelper.getCurrentProgressPct()
             return (abs(progressPct - expectedValuePct) <= tolerance)
         }

package/android/detox/src/testFull/java/com/wix/detox/espresso/common/MaterialSliderHelperTest.kt

@@ -0,0 +1,33 @@
+package com.wix.detox.espresso.common
+
+import android.view.View
+import com.google.android.material.slider.Slider
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class MaterialSliderHelperTest {
+    @Test
+    fun `should return value if view is a slider`() {
+        val slider: Slider = mock {
+            on { value } doReturn 0.2f
+        }
+
+        val uut = MaterialSliderHelper(slider)
+
+        assertThat(uut.getValueIfSlider()).isEqualTo(0.2f)
+    }
+
+    @Test
+    fun `should return null if view is not a slider`() {
+        val view: View = mock()
+
+        val uut = MaterialSliderHelper(view)
+
+        assertThat(uut.getValueIfSlider()).isNull()
+    }
+}

package/android/detox/src/testFull/java/com/wix/detox/espresso/common/{SliderHelperTest.kt → ReactSliderHelperTest.kt}

@@ -15,14 +15,14 @@ import org.robolectric.RobolectricTestRunner
  * to avoid having to install the community slider under node_modules just for this.
  */
 @RunWith(RobolectricTestRunner::class)
-class SliderHelperTest {
+class ReactSliderHelperTest {
     lateinit var slider: ReactSlider
-    lateinit var uut: SliderHelper
+    lateinit var uut: ReactSliderHelper
 
     @Before
     fun setup() {
         slider = mock()
-        uut = SliderHelper.create(slider)
+        uut = ReactSliderHelper.create(slider)
     }
 
     private fun givenNativeProgressTraits(current: Int, max: Int) {

package/internals.d.ts

@@ -113,7 +113,11 @@ declare global {
         /** Test suite name */
         name: string;
       }): Promise<void>;
-
+      /**
+       * Workaround for Jest exiting abruptly in --bail mode.
+       * Makes sure that all workers and their test environments are properly torn down.
+       */
+      unsafe_conductEarlyTeardown(): Promise<void>;
       /**
        * Reports to Detox CLI about passed and failed test files.
        * The failed test files might be re-run again if
@@ -215,6 +219,11 @@ declare global {
        * Randomly generated ID for the entire Detox test session, including retries.
        */
       id: string;
+      /**
+       * Signalizes that the test session is being torn down.
+       * Experimental feature for Jest --bail mode.
+       */
+      unsafe_earlyTeardown?: boolean;
       /**
        * Results of test file executions. Primarily used for Detox CLI retry mechanism.
        */

package/local-cli/reset-lock-file.js

@@ -1,16 +1,12 @@
 const { log } = require('../internals');
-const DeviceRegistry = require('../src/devices/DeviceRegistry');
-const { getDetoxLibraryRootPath } = require('../src/utils/environment');
-
+const DeviceRegistry = require('../src/devices/allocation/DeviceRegistry');
 
 module.exports.command = 'reset-lock-file';
-module.exports.desc = 'Resets all Detox lock files. Useful when you need to run multiple `detox test` commands in parallel with --keepLockFile.';
+module.exports.desc = 'Resets Detox lock file completely - all devices are marked as available after that.';
 
 module.exports.handler = async function resetLockFile() {
-  await Promise.all([
-    DeviceRegistry.forIOS().reset(),
-    DeviceRegistry.forAndroid().reset(),
-  ]);
+  const registry = new DeviceRegistry();
+  await registry.reset();
 
-  log.info(`Cleaned lock files from: ${getDetoxLibraryRootPath()}`);
+  log.info(`Cleaned lock file at: ${registry.lockFilePath}`);
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.12.1",
+  "version": "20.13.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -137,9 +137,9 @@
       "src/artifacts/log",
       "src/artifacts/screenshot",
       "src/artifacts/video",
-      "src/devices/allocation/drivers/AllocationDriverBase.js",
       "src/devices/allocation/drivers/android/emulator/launchEmulatorProcess.js",
       "src/devices/allocation/drivers/android/emulator/patchAvdSkinConfig.js",
+      "src/devices/allocation/.*AllocDriver.js",
       "src/devices/allocation/drivers/ios",
       "src/devices/allocation/factories",
       "src/devices/allocation/factories/drivers",
@@ -154,10 +154,9 @@
       "src/devices/runtime/drivers/ios",
       "src/devices/runtime/factories",
       "src/devices/runtime/factories/drivers",
+      "src/devices/validation/EnvironmentValidatorBase.js",
+      "src/devices/validation/factories",
       "src/matchers/factories",
-      "src/validation/EnvironmentValidatorBase.js",
-      "src/validation/factories",
-      "src/validation/ios/IosSimulatorEnvValidator",
       "src/utils/appdatapath.js",
       "src/utils/debug.js",
       "src/utils/environment.js",
@@ -206,5 +205,5 @@
   "browserslist": [
     "node 14"
   ],
-  "gitHead": "b489519a3166723194c83c5a43bd585bee1d9395"
+  "gitHead": "72e85a2fe078a2a721628255249410423fc5c1ac"
 }