detox 20.32.0 → 20.33.0-prerelease.0

package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/AsyncStorageIdlingResourceTest.kt

@@ -2,7 +2,9 @@ package com.wix.detox.reactnative.idlingresources
 
 import androidx.test.espresso.IdlingResource
 import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactContext
 import com.wix.detox.UTHelpers.yieldToOtherThreads
+import com.wix.detox.reactnative.helpers.RNHelpers
 import com.wix.detox.reactnative.idlingresources.storage.AsyncStorageIdlingResource
 import com.wix.detox.reactnative.idlingresources.storage.SerialExecutorReflected
 import org.assertj.core.api.Assertions.assertThat
@@ -10,6 +12,7 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.kotlin.any
+import org.mockito.kotlin.argThat
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.eq
 import org.mockito.kotlin.mock
@@ -37,6 +40,8 @@ class AsyncStorageIdlingResourceTest {
     private lateinit var sexecutorReflectedGenFn: (executor: Executor) -> SerialExecutorReflected
     private lateinit var module: AsyncStorageModuleStub
     private lateinit var uut: AsyncStorageIdlingResource
+    private val reactContext: ReactContext = mock()
+    private lateinit var rnHelpers: RNHelpers
 
     @Before
     fun setup() {
@@ -49,8 +54,10 @@ class AsyncStorageIdlingResourceTest {
             on { invoke(eq(module.executor)) }.thenReturn(sexecutorReflected)
         }
 
-
-        uut = AsyncStorageIdlingResource(module, sexecutorReflectedGenFn)
+        rnHelpers = mock {
+            on { getNativeModule(any(), any()) }.thenReturn(module)
+        }
+        uut = AsyncStorageIdlingResource(reactContext, sexecutorReflectedGenFn, rnHelpers)
     }
 
     fun givenNoActiveTasks() = whenever(sexecutorReflected.hasActiveTask()).thenReturn(false)

package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/timers/TimersIdlingResourceTest.kt

@@ -5,13 +5,13 @@ import androidx.test.espresso.IdlingResource
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.modules.core.TimingModule
 import org.assertj.core.api.Assertions
+import org.junit.Assert.assertFalse
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.kotlin.*
 import org.robolectric.RobolectricTestRunner
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
+import kotlin.test.assertTrue
 
 private fun anIdlingResourceCallback() = mock<IdlingResource.ResourceCallback>()
 
@@ -28,7 +28,6 @@ class TimersIdlingResourceTest {
         timersIdlingResource = TimersIdlingResource(context) { choreographer }
     }
 
-
     private fun givenIdleStrategy() {
         whenever(timersModule.hasActiveTimersInRange(any())).thenReturn(false)
     }
@@ -48,6 +47,13 @@ class TimersIdlingResourceTest {
         getChoreographerCallback().doFrame(0L)
     }
 
+    @Test
+    fun `should pause when unregistered`() {
+        assertFalse(timersIdlingResource.paused.get())
+        timersIdlingResource.onUnregistered()
+        assertTrue(timersIdlingResource.paused.get())
+    }
+
     @Test
     fun `should return a debug-name`() {
         Assertions.assertThat(timersIdlingResource.getDebugName()).isEqualTo("timers")

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "20.32.0",
+  "version": "20.33.0-prerelease.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -119,5 +119,5 @@
   "browserslist": [
     "node 14"
   ],
-  "gitHead": "32bc3aabb05f843e8307043e9e5c85f4b47accef"
+  "gitHead": "24e2e8402c63506e434341130f79a62ad6949e3f"
 }

package/scripts/updateGradle.js

@@ -26,6 +26,43 @@ function getGradleVersionByRNVersion() {
 function patchGradleByRNVersion() {
   updateGradleWrapperSync();
   patchSettingsGradle();
+  patchGradlePropertiesSync();
+}
+
+/**
+ * By default gralde.properties has new arch enabled. Disable it by adding evn var
+ */
+function patchGradlePropertiesSync() {
+  // Read the evn var to check if the new arch is enabled
+  let isNewArch;
+
+  if (!process.env.ENABLE_NEW_ARCH) {
+    isNewArch = true;
+  } else {
+    isNewArch = process.env.ENABLE_NEW_ARCH === 'true';
+  }
+
+  function readGradlePropertiesFile() {
+    const gradlePropertiesFile = path.join(process.cwd(), 'android', 'gradle.properties');
+    console.log(`Patching gradle.properties. File: ${gradlePropertiesFile}`);
+    const data = fs.readFileSync(gradlePropertiesFile, 'utf8');
+    return { gradlePropertiesFile, data };
+  }
+
+  function writeGradlePropertiesFile(gradlePropertiesFile, data) {
+    const updatedData = data.replace('newArchEnabled=true', 'newArchEnabled=false');
+    fs.writeFileSync(gradlePropertiesFile, updatedData, 'utf8');
+    console.log('gradle.properties patched successfully.');
+  }
+
+  if (!isNewArch) {
+    try {
+      const { gradlePropertiesFile, data } = readGradlePropertiesFile();
+      writeGradlePropertiesFile(gradlePropertiesFile, data);
+    } catch (e) {
+      console.error('Error:', e);
+    }
+  }
 }
 
 /**

package/src/DetoxWorker.js

@@ -259,8 +259,7 @@ class DetoxWorker {
     });
 
     if (copilot.isInitialized()) {
-      // In case of failure, pass false to copilot, so temporary cache is not saved
-      copilot.end(testSummary.status === 'passed');
+      copilot.end(testSummary.status !== 'passed');
     }
   };
 

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

@@ -1 +0,0 @@
-eee5ef30145285d5cb57b7a09afb8304

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

@@ -1 +0,0 @@
-f454322216a38a2a565504eeeee3097cdf210dd0

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

@@ -1 +0,0 @@
-bde47b3d7df6f70cc9812e1232aa5781a4dbfbd923ca52c6097ab9ea880eb207

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

@@ -1 +0,0 @@
-175ce023c440c5903a33af31f0ce39e603c6c930fa05ddf5a38f070cd99b29fc6ee2e82b816bc60507c7c4729e9c0b1d8d1247ecc4b6b75455e0924d397dfe37

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

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

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

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

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

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

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

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

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

@@ -1 +0,0 @@
-8a89efbe63dd0bb5e8263bd728b2a6ce

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

@@ -1 +0,0 @@
-73079f2074231a904b98113f686c7b7f8df79ad7

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

@@ -1 +0,0 @@
-4c76f2991c6d5bb6fd4a883542bac697c8e3e49d1816e59f36b5b3678c6ae6ab

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

@@ -1 +0,0 @@
-b856a9916b7e864eeb2226d29b56c5bea595545c7cb82e8c33619357fdfbf9a942201f1ecd70b57fb5499c5b59d38a1e4fc13bee6a84eaf2b75e2b630faeb6f7

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

@@ -1,16 +0,0 @@
-package com.wix.detox.reactnative
-
-import android.app.Instrumentation
-import com.facebook.react.ReactApplication
-
-open class ReactNativeReLoader(
-        private val instrumentation: Instrumentation,
-        private val rnApplication: ReactApplication) {
-
-    fun reloadInBackground() {
-        val rnInstanceManager = rnApplication.reactNativeHost.reactInstanceManager
-        instrumentation.runOnMainSync {
-            rnInstanceManager.recreateReactContextInBackground()
-        }
-    }
-}