detox 20.0.0-breaking.new-global-lifecycle.0 → 20.0.1-breaking.new-global-lifecycle.0

package/src/realms/DetoxContext.js

@@ -19,7 +19,7 @@ class DetoxContext {
   constructor() {
     this[symbols.globalSetup] = this[symbols.globalSetup].bind(this);
     this[symbols.globalTeardown] = this[symbols.globalTeardown].bind(this);
-    this[symbols.reportFailedTests] = this[symbols.globalTeardown].bind(this);
+    this[symbols.reportFailedTests] = this[symbols.reportFailedTests].bind(this);
     this[symbols.resolveConfig] = this[symbols.resolveConfig].bind(this);
     this[symbols.setup] = this[symbols.setup].bind(this);
     this[symbols.teardown] = this[symbols.teardown].bind(this);

package/src/realms/DetoxPrimaryContext.js

@@ -120,8 +120,9 @@ class DetoxPrimaryContext extends DetoxContext {
    * @param {Partial<DetoxInternals.DetoxConfigurationSetupOptions>} [opts]
    */
   async [symbols.setup](opts) {
-    this[$sessionState].workerId = opts.workerId;
-    this[_ipcServer].onRegisterWorker({ workerId: opts.workerId });
+    const workerId = opts.workerId || 1;
+    this[$sessionState].workerId = workerId;
+    this[_ipcServer].onRegisterWorker({ workerId });
     await super[symbols.setup](opts);
   }
 

package/src/realms/DetoxSecondaryContext.js

@@ -59,8 +59,9 @@ class DetoxSecondaryContext extends DetoxContext {
       logger: this[$logger],
     });
 
+    const workerId = opts.workerId || 1;
     await this[_ipcClient].init();
-    await this[_ipcClient].registerWorker(opts.workerId);
+    await this[_ipcClient].registerWorker(workerId);
     await super[symbols.setup](opts);
   }
 

package/src/utils/ChromeTracingExporter.js

@@ -26,15 +26,16 @@ class ChromeTracingExporter {
 
   _parseEvent(event) {
     const { name, ts, args, type } = event;
+    const tsInMicroseconds = ts * 1000;
     switch (type) {
-      case 'start': return this._event(name, 'B', ts * 1000, args);
-      case 'end': return this._event(name, 'E', ts * 1000, args);
+      case 'start': return this._event(name, 'B', tsInMicroseconds, args);
+      case 'end': return this._event(name, 'E', tsInMicroseconds, args);
       case 'init': return [
-          this._event('process_name', 'M', ts, { name: this._process.name }),
-          this._event('thread_name', 'M', ts, { name: this._thread.name }),
+          this._event('process_name', 'M', tsInMicroseconds, { name: this._process.name }),
+          this._event('thread_name', 'M', tsInMicroseconds, { name: this._thread.name }),
         ];
       default:
-        throw new DetoxRuntimeError(`Invalid type '${type}' in event: ${event}`);
+        throw new DetoxRuntimeError({ message: `Invalid type '${type}' in event: ${event}` });
     }
   }
 

package/src/utils/environment.js

@@ -78,7 +78,7 @@ function getAndroidEmulatorPath() {
     return legacyPath;
   }
 
-  throwSdkIntegrityError(sdkRoot, 'emulator/emulator');
+  throwSdkBinIntegrityError(sdkRoot, 'emulator/emulator');
 }
 
 async function getAaptPath() {
@@ -88,23 +88,33 @@ async function getAaptPath() {
   }
 
   const latestBuildTools = await getLatestBuildToolsPath(sdkRoot);
-  const defaultPath = latestBuildTools && which('aapt', latestBuildTools);
+  if (!latestBuildTools) {
+    throwSdkIntegrityError('Failed to find the "aapt" tool under the Android SDK: No build-tools are installed!');
+  }
+
+  const defaultPath = which('aapt', latestBuildTools);
   if (defaultPath) {
     return defaultPath;
   }
 
-  throwSdkIntegrityError(sdkRoot, `${latestBuildTools}/aapt`);
+  throwSdkToolPathError(`${latestBuildTools}/aapt`);
 }
 
 async function getLatestBuildToolsPath(sdkRoot) {
-  if (!sdkRoot) return '';
+  if (!sdkRoot) {
+    return '';
+  }
 
   const buildToolsDir = path.join(sdkRoot, 'build-tools');
-  if (!fs.existsSync(buildToolsDir)) return '';
+  if (!fs.existsSync(buildToolsDir)) {
+    return '';
+  }
 
   const buildToolsVersions = await fsext.getDirectories(buildToolsDir);
   const latestBuildToolsVersion = _.last(buildToolsVersions);
-  if (!latestBuildToolsVersion) return '';
+  if (!latestBuildToolsVersion) {
+    return '';
+  }
 
   return path.join(buildToolsDir, latestBuildToolsVersion);
 }
@@ -120,7 +130,7 @@ function getAdbPath() {
     return defaultPath;
   }
 
-  throwSdkIntegrityError(sdkRoot, 'platform-tools/adb');
+  throwSdkBinIntegrityError(sdkRoot, 'platform-tools/adb');
 }
 
 function getGmsaasPath() {
@@ -142,15 +152,20 @@ function throwMissingAvdError(avdName, avdPath, avdIniPath) {
   );
 }
 
-function throwSdkIntegrityError(sdkRoot, relativeExecutablePath) {
-  const executablePath = path.join(sdkRoot, relativeExecutablePath);
-  const name = path.basename(executablePath);
-  const dir = path.dirname(executablePath);
+function throwSdkBinIntegrityError(sdkRoot, relativeBinPath) {
+  const executablePath = path.join(sdkRoot, relativeBinPath);
+  throwSdkToolPathError(executablePath);
+}
 
-  throw new DetoxRuntimeError(
-    `There was no "${name}" executable file in directory: ${dir}.\n` +
-    `Check integrity of your Android SDK.`
-  );
+function throwSdkToolPathError(sdkToolPath) {
+  const name = path.basename(sdkToolPath);
+  const dir = path.dirname(sdkToolPath);
+
+  throwSdkIntegrityError(`There was no "${name}" executable file in directory: ${dir}`);
+}
+
+function throwSdkIntegrityError(errMessage) {
+  throw new DetoxRuntimeError(`${errMessage}\nCheck the integrity of your Android SDK.`);
 }
 
 function throwMissingGmsaasError() {

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-javadoc.jar.md5

@@ -1 +0,0 @@
-4c6cf9ab6a5661e76e324d60e32135a5

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-javadoc.jar.sha1

@@ -1 +0,0 @@
-18acb60a8d1035c30d5456c6ae34452ba601be74

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-javadoc.jar.sha256

@@ -1 +0,0 @@
-a5944cadfbcdb604230d233ffc61937c00aeeb0cd7d119ca80dd980c63cce162

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-javadoc.jar.sha512

@@ -1 +0,0 @@
-3b03acc4ca394d1cf0ad68035630f5f9acf9ef61bb82bc82d12dd0521e477a6b9a90408052929d5292c4a277719f097d2e5442f72c206dfc9fa3454b0065c7ad

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-sources.jar.md5

@@ -1 +0,0 @@
-5b522f2a74898254ef0d235c51538892

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-sources.jar.sha1

@@ -1 +0,0 @@
-9700c95cf470ffa9203966e67eaa5f42a3f261e1

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-sources.jar.sha256

@@ -1 +0,0 @@
-13b5779cfa22e39ee57276e87f52a514ef22ca63c93eeecc040a0fc019de1fa1

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0-sources.jar.sha512

@@ -1 +0,0 @@
-bbf983c662070c19d39533e5bbc5c3aee9d0b5ad4f89c2df86b4358767fcdfb18989cf379ed12257173d2d73c69e1c12a4ed2fd92a5bc2229177d0f8b38b19bf

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.aar.md5

@@ -1 +0,0 @@
-763fee6cb2b551c8163caecafb821478

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.aar.sha1

@@ -1 +0,0 @@
-a3d2827035258ddbd41de27ce4e25df2f3a5a2fd

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.aar.sha256

@@ -1 +0,0 @@
-87990259e9864e07f8a1ccde34e69dfcadfba39167d7384062c272e81b307231

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.aar.sha512

@@ -1 +0,0 @@
-34165b1c6d6ea54d5c3420bd7f387dfa9fc81f8a43d50c404d06c9d24a6d6377dc84ba4f0b699dda5780658fb8796d197f368ef396cbf29240270e9fea78bddc

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.pom.md5

@@ -1 +0,0 @@
-66679cd30052bba4a828537b8cd97014

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.pom.sha1

@@ -1 +0,0 @@
-909eb59596a19f81bcad544a5b7aee3ed899e0c2

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.pom.sha256

@@ -1 +0,0 @@
-ba8c95326c6df61428a56284280062a28c1aa747dcc8d5ec50f1756f869aba7e

package/Detox-android/com/wix/detox/20.0.0-breaking.new-global-lifecycle.0/detox-20.0.0-breaking.new-global-lifecycle.0.pom.sha512

@@ -1 +0,0 @@
-e0f4d3ce73bed2981edc17b8845a2f25044cba806371c3b57eaf59f9d008bff3be112a1cb9876dbafd0ec96a01d240452bdd563ac99f3c03f47ad3416e3ae2d3

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

@@ -1,36 +0,0 @@
-package com.wix.detox.espresso.action
-
-import android.view.View
-import androidx.test.espresso.UiController
-import androidx.test.espresso.ViewAction
-import androidx.test.espresso.matcher.ViewMatchers
-import com.facebook.react.bridge.JavaOnlyMap
-import com.facebook.react.uimanager.ReactStylesDiffMap
-import com.facebook.react.views.slider.ReactSlider
-import com.facebook.react.views.slider.ReactSliderManager
-import org.hamcrest.Matcher
-import org.hamcrest.Matchers
-
-class AdjustSliderToPositionAction(private val desiredPosition: Double, private val mManager: ReactSliderManager) : ViewAction {
-    override fun getConstraints(): Matcher<View?>? = Matchers.allOf(
-            ViewMatchers.isAssignableFrom(ReactSlider::class.java),
-            getIsDisplayed())
-
-    override fun getDescription() = "adjustSliderToPosition"
-
-    fun getIsDisplayed(): Matcher<View?> = ViewMatchers.isDisplayed()
-
-    private fun buildStyles(vararg keysAndValues: Any) = ReactStylesDiffMap(JavaOnlyMap.of(*keysAndValues))
-
-    private fun calculateProgressTarget(view: ReactSlider): Double {
-        val sliderProgress = view.toRealProgress(view.progress)
-        val sliderScrollFactor = view.max / view.progress.toDouble()
-        val sliderMaxValue = sliderProgress * sliderScrollFactor
-        return desiredPosition * sliderMaxValue
-    }
-
-    override fun perform(uiController: UiController?, view: View) {
-        val progressNewValue = calculateProgressTarget(view as ReactSlider)
-        mManager.updateProperties(view, buildStyles("value", progressNewValue))
-    }
-}

package/android/detox/src/testFull/java/com/wix/detox/espresso/action/AdjustSliderToPositionActionTest.kt

@@ -1,59 +0,0 @@
-package com.wix.detox.espresso.action
-
-import android.view.View
-import com.facebook.react.views.slider.ReactSlider
-import com.facebook.react.views.slider.ReactSliderManager
-import org.assertj.core.api.Assertions.assertThat
-import org.hamcrest.Matcher
-import org.junit.Before
-import org.junit.Test
-import org.mockito.kotlin.*
-
-@Suppress("IllegalIdentifier")
-class AdjustSliderToPositionActionTest {
-    val mockReactSliderManager: ReactSliderManager = mock()
-    var uut: AdjustSliderToPositionAction = spy(AdjustSliderToPositionAction(0.25, mockReactSliderManager))
-    private lateinit var mockReactSlider: ReactSlider
-
-    @Before
-    fun setup() {
-        mockReactSlider = mock {
-            on {progress}.thenReturn(250)
-        }
-    }
-
-    @Test
-    fun `should have correct description`() {
-        assertThat(uut.description).isEqualTo("adjustSliderToPosition")
-    }
-
-    @Test
-    fun `should have correct constraints`() {
-        val mockReactSlider: ReactSlider = mock()
-        val mockView: View = mock()
-        val mockIsDisplayed: Matcher<View?> = mock {
-            on {matches(any())}.thenReturn(true)
-        }
-        doReturn(mockIsDisplayed).whenever(uut).getIsDisplayed()
-
-        assertThat(uut.constraints).isNotNull
-        assertThat(uut.constraints!!.matches(null)).isFalse()
-        assertThat(uut.constraints!!.matches(1)).isFalse()
-        assertThat(uut.constraints!!.matches(mockReactSlider)).isTrue()
-        assertThat(uut.constraints!!.matches(mockView)).isFalse()
-    }
-
-    @Test
-    fun `should change progress of slider`() {
-        val mockReactSliderManager: ReactSliderManager = mock {
-            on{updateProperties(any(), any())}.thenAnswer{
-                doReturn(750).whenever(mockReactSlider).progress
-            }
-        }
-        uut = spy(AdjustSliderToPositionAction(0.75, mockReactSliderManager))
-        uut.perform(null, mockReactSlider)
-
-        verify(mockReactSliderManager, times(1)).updateProperties(any(), any())
-        assertThat(mockReactSlider.progress).isEqualTo(750)
-    }
-}