detox 20.31.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.31.0",
+  "version": "20.33.0-prerelease.0",
   "bin": {
     "detox": "local-cli/cli.js"
   },
@@ -119,5 +119,5 @@
   "browserslist": [
     "node 14"
   ],
-  "gitHead": "89a3f0efbac69cd37db886a53f712d51db8f857d"
+  "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/src/devices/allocation/drivers/android/genycloud/exec/GenyCloudExec.js

@@ -3,7 +3,7 @@ const exec = require('../../../../../../utils/childProcess').execWithRetriesAndL
 
 class GenyCloudExec {
   constructor(binaryPath) {
-    this.binaryExec = `"${binaryPath}" --format compactjson`;
+    this.binaryExec = binaryPath;
     process.env.GMSAAS_USER_AGENT_EXTRA_DATA = process.env.GMSAAS_USER_AGENT_EXTRA_DATA || 'detox';
   }
 
@@ -11,6 +11,10 @@ class GenyCloudExec {
     return this._exec('--version');
   }
 
+  doctor() {
+    return this._exec('doctor', { retries: 0 }, 'text');
+  }
+
   getRecipe(name) {
     return this._exec(`recipes list --name "${name}"`);
   }
@@ -38,23 +42,25 @@ class GenyCloudExec {
     return this._exec(`instances stop ${instanceUUID}`, options);
   }
 
-  async _exec(args, options) {
+  async _exec(args, options, format = 'compactjson') {
     try {
-      const rawResult = await this.__exec(args, options);
-      return JSON.parse(rawResult);
+      const rawResult = await this.__exec(args, options, format);
+      return (
+        format === 'compactjson' ? JSON.parse(rawResult) : rawResult
+      );
     } catch (error) {
       throw new Error(error.stderr);
     }
   }
 
-  async __exec(args, _options) {
-    const options = {
-      ..._options,
+  async __exec(args, options, format) {
+    const _options = {
+      ...options,
       statusLogs: {
         retrying: true,
       },
     };
-    return (await exec(`${this.binaryExec} ${args}`, options )).stdout;
+    return (await exec(`"${this.binaryExec}" --format ${format} ${args}`, _options )).stdout;
   }
 }
 

package/src/devices/validation/android/GenycloudEnvValidator.js

@@ -6,6 +6,7 @@ const environment = require('../../../utils/environment');
 const EnvironmentValidatorBase = require('../EnvironmentValidatorBase');
 
 const MIN_GMSAAS_VERSION = '1.6.0';
+const MIN_GMSAAS_VERSION_WITH_DOCTOR = '1.11.0';
 
 class GenycloudEnvValidator extends EnvironmentValidatorBase {
   /**
@@ -18,11 +19,13 @@ class GenycloudEnvValidator extends EnvironmentValidatorBase {
   }
 
   async validate() {
-    await this._validateGmsaasVersion();
+    const { version } = await this._exec.getVersion();
+
+    await this._validateGmsaasVersion(version);
+    await this._validateGmsaasDoctorCheck(version);
   }
 
-  async _validateGmsaasVersion() {
-    const { version } = await this._exec.getVersion();
+  async _validateGmsaasVersion(version) {
     if (semver.lt(version, MIN_GMSAAS_VERSION)) {
       throw new DetoxRuntimeError({
         message: `Your Genymotion-Cloud executable (found in ${environment.getGmsaasPath()}) is too old! (version ${version})`,
@@ -30,6 +33,20 @@ class GenycloudEnvValidator extends EnvironmentValidatorBase {
       });
     }
   }
+
+  async _validateGmsaasDoctorCheck(version) {
+    if (semver.lt(version, MIN_GMSAAS_VERSION_WITH_DOCTOR)) {
+      return;
+    }
+
+    try {
+      await this._exec.doctor();
+    } catch (e) {
+      throw new DetoxRuntimeError({
+        message: e.message,
+      });
+    }
+  }
 }
 
 module.exports = GenycloudEnvValidator;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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()
-        }
-    }
-}