detox 20.0.5-breaking.new-global-lifecycle.0 → 20.0.8-prerelease.0

package/src/logger/DetoxLogger.js

@@ -34,6 +34,22 @@ class DetoxLogger {
      */
     this._sharedConfig = sharedConfig;
 
+    /** @type {object | undefined} */
+    this._context = context;
+
+    /** @public */
+    this.fatal = this._setupLogMethod('fatal');
+    /** @public */
+    this.error = this._setupLogMethod('error');
+    /** @public */
+    this.warn = this._setupLogMethod('warn');
+    /** @public */
+    this.info = this._setupLogMethod('info');
+    /** @public */
+    this.debug = this._setupLogMethod('debug');
+    /** @public */
+    this.trace = this._setupLogMethod('trace');
+
     if (!context) {
       // In this branch, `this` refers to the first (root) logger instance.
 
@@ -76,22 +92,6 @@ class DetoxLogger {
 
       this.overrideConsole();
     }
-
-    /** @type {object | undefined} */
-    this._context = context;
-
-    /** @public */
-    this.fatal = this._setupLogMethod('fatal');
-    /** @public */
-    this.error = this._setupLogMethod('error');
-    /** @public */
-    this.warn = this._setupLogMethod('warn');
-    /** @public */
-    this.info = this._setupLogMethod('info');
-    /** @public */
-    this.debug = this._setupLogMethod('debug');
-    /** @public */
-    this.trace = this._setupLogMethod('trace');
   }
 
   /**
@@ -232,7 +232,11 @@ class DetoxLogger {
     const action = typeof maybeContext !== 'string' ? maybeAction : maybeMessage;
     const args = maybeAction === action ? [maybeContext, maybeMessage] : [maybeContext];
     const { context, msg } = this._parseArgs(null, args);
-    const end = (ctx) => this[level].end(ctx);
+    const end = (ctx) => this[level].end({
+      id: context.id,
+      cat: context.cat,
+      ...ctx,
+    });
 
     let result;
     this[level].begin(context, ...msg);

package/src/logger/utils/tracerLegacy.js

@@ -8,15 +8,38 @@ const methods = {
   },
 
   traceCall(logger) {
-    return (name, action) => logger.trace.complete(name, action);
+    return (name, action, args = {}) => logger.trace.complete(args, name, action);
+  },
+
+  invocationCall(logger) {
+    return (sectionName, invocation, action) => {
+      return logger.trace.complete({
+        cat: 'ws-client,ws-client-invocation',
+        data: invocation,
+        stack: _getCallStackTrace(),
+      }, sectionName, action);
+    };
   },
 };
 
+function _getCallStackTrace() {
+  return new Error().stack
+    .split('\n')
+    .slice(1) // Ignore Error message
+    .map(line => line
+      .replace(/^\s*at\s+/, '')
+      .replace(process.cwd(), '')
+    )
+    .filter(line => !line.includes('/detox/src')) // Ignore detox internal calls
+    .join('\n');
+}
+
 function installLegacyTracerInterface(logger, target) {
   target.traceCall = methods.traceCall(logger);
   target.trace = Object.freeze({
     startSection: methods.startSection(logger),
     endSection: methods.endSection(logger),
+    invocationCall: methods.invocationCall(logger),
   });
 
   return this;

package/src/realms/DetoxPrimaryContext.js

@@ -53,7 +53,7 @@ class DetoxPrimaryContext extends DetoxContext {
   }
 
   async [symbols.resolveConfig](opts = {}) {
-    const session = this[symbols.session];
+    const session = this[$sessionState];
     if (!session.detoxConfig) {
       const configuration = require('../configuration');
       session.detoxConfig = await configuration.composeDetoxConfig(opts);
@@ -170,11 +170,13 @@ class DetoxPrimaryContext extends DetoxContext {
 
       await fs.remove(this[$sessionState].detoxConfigSnapshotPath);
 
-      try {
-        this[_lifecycleLogger].trace.end();
-        await this[_finalizeLogs]();
-      } catch (err) {
-        this[_lifecycleLogger].error({ err }, 'Encountered an error while merging the process logs:');
+      if (this[_dirty]) {
+        try {
+          this[_lifecycleLogger].trace.end();
+          await this[_finalizeLogs]();
+        } catch (err) {
+          this[_lifecycleLogger].error({ err }, 'Encountered an error while merging the process logs:');
+        }
       }
     }
   }
@@ -229,7 +231,7 @@ class DetoxPrimaryContext extends DetoxContext {
       return;
     }
 
-    if (this[_areLogsEnabled]) {
+    if (this[_areLogsEnabled]()) {
       const streamUtils = require('../utils/streamUtils');
       const { rootDir } = this[symbols.config].artifacts;
 
@@ -256,7 +258,10 @@ class DetoxPrimaryContext extends DetoxContext {
     const logsEnabled = this[_areLogsEnabled]();
 
     const { rootDir } = this[symbols.config].artifacts;
-    fs.mkdirpSync(rootDir);
+
+    if (logsEnabled) {
+      fs.mkdirpSync(rootDir);
+    }
 
     const sessionId = this[$sessionState].id;
     const logs = globSync(temporary.for.jsonl(`${sessionId}.*`));
@@ -272,10 +277,20 @@ class DetoxPrimaryContext extends DetoxContext {
 
   [_areLogsEnabled]() {
     const { rootDir, plugins } = this[symbols.config].artifacts || {};
-    const logConfig = plugins && plugins.log || 'none';
-    const enabled = rootDir && (typeof logConfig === 'string' ? logConfig !== 'none' : logConfig.enabled);
+    if (!rootDir || !plugins) {
+      return false;
+    }
+
+    if (!plugins.log.enabled) {
+      return false;
+    }
+
+    if (!plugins.log.keepOnlyFailedTestsArtifacts) {
+      return true;
+    }
 
-    return enabled;
+    const { failedTestFiles, testFilesToRetry } = this[$sessionState];
+    return failedTestFiles.length + testFilesToRetry.length > 0;
   }
 
   async[_resetLockFile]() {

package/src/utils/errorUtils.js

@@ -16,11 +16,12 @@ function filterErrorStack(error, predicate) {
 }
 
 function replaceErrorStack(source, target) {
-  const sourceStack = source.stack || source.message;
-  const targetStack = target.stack || target.message;
+  const sourceStack = (source.stack || '');
   const sourceMessage = sourceStack.replace(CLEAN_AT, '');
-  const targetMessage = targetStack.replace(CLEAN_AT, '');
   const actualSourceStack = sourceStack.slice(sourceMessage.length);
+
+  const targetMessage = target.message || target.stack.replace(CLEAN_AT, '');
+
   target.stack = targetMessage + actualSourceStack;
   return target;
 }

package/src/utils/invocationTraceDescriptions.js

@@ -0,0 +1,43 @@
+module.exports = {
+  actionDescription: {
+    adjustSliderToPosition: (newPosition) => `adjust slider to position ${newPosition}`,
+    clearText: () => 'clear input text',
+    getAttributes: () => 'get element attributes',
+    longPress: (duration) => `long press${duration !== undefined ? ` for ${duration}ms` : ''}`,
+    longPressAndDrag: (duration, startX, startY, targetElement, endX, endY, speed, holdDuration) =>
+      `long press and drag from ${startX}, ${startY} to ${endX}, ${endY} with speed ${speed} and hold duration ${holdDuration}`,
+    multiTap: (times) => `tap ${times} times`,
+    pinch: (scale, speed, angle) => `pinch with scale ${scale}, speed ${speed}, and angle ${angle}`,
+    pinchWithAngle: (direction, speed, angle) => `pinch with direction ${direction}, speed ${speed}, and angle ${angle}`,
+    replaceText: (value) => `replace input text: "${value}"`,
+    scroll: (amount, direction, startPositionX, startPositionY) =>
+      `scroll ${amount} pixels ${direction}${startPositionX !== undefined && startPositionY !== undefined ? ` from normalized position (${startPositionX}, ${startPositionY})` : ''}`,
+    scrollTo: (edge) => `scroll to ${edge}`,
+    scrollToIndex: (index) => `scroll to index #${index}`,
+    setColumnToValue: (column, value) => `set column ${column} to value ${value}`,
+    setDatePickerDate: (dateString, dateFormat) => `set date picker date to ${dateString} using format ${dateFormat}`,
+    swipe: (direction, speed, normalizedSwipeOffset, normalizedStartingPointX, normalizedStartingPointY) =>
+      `swipe ${direction} ${speed} with offset ${normalizedSwipeOffset}
+      ${!isNaN(normalizedStartingPointX) && !isNaN(normalizedStartingPointY) ? ` from normalized position (${normalizedStartingPointX}, ${normalizedStartingPointY})` : ''}`,
+    takeScreenshot: (screenshotName) => `take screenshot${screenshotName !== undefined ? ` with name "${screenshotName}"` : ''}`,
+    tapAtPoint: (value) => `tap${value !== undefined ? ` at ${JSON.stringify(value)}` : ''}`,
+    tapBackspaceKey: () => 'tap on backspace key',
+    tapReturnKey: () => 'tap on return key',
+    typeText: (value) => `type input text: "${value}"`,
+  },
+  expectDescription: {
+    waitFor: (actionDescription) => `wait for expectation while ${actionDescription}`,
+    waitForWithTimeout: (expectDescription, timeout) => `${expectDescription} with timeout (${timeout} ms)`,
+    withTimeout: (timeout) => `wait until timeout (${timeout} ms)`,
+    toBeFocused: () => 'to be focused',
+    toBeVisible: (percent) => `to be visible${percent !== undefined ? ` ${percent}%` : ''}`,
+    toExist: () => 'to exist',
+    toHaveText: (text) => `to have text: "${text}"`,
+    toHaveLabel: (label) => `to have label: "${label}"`,
+    toHaveId: (id) => `to have id: "${id}"`,
+    toHaveValue: (value) => `to have value: "${value}"`,
+    toHaveSliderPosition: (position, tolerance) => `to have slider position: ${position}${tolerance > 0 ? ` with tolerance ${tolerance}` : ''}`,
+    toHaveToggleValue: (value) => `to have toggle value: ${value}`,
+    full: (expectDescription, notCondition) => `expect element ${notCondition ? `not ${expectDescription}` : expectDescription}`
+  }
+};

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

@@ -1 +0,0 @@
-1c28e1a121a1eb49cfae610647edf0ad

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

@@ -1 +0,0 @@
-e7d9c6c15b4467c257ee92ae349d3465446b4a40

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

@@ -1 +0,0 @@
-274e47fbbdbe85abdf2ebfd4c76e00ef33ad353309da375460f71f9f6fe04c2a

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

@@ -1 +0,0 @@
-063f4a5549133b4d661a7677d68a91473877b26ed3e29ef9d7502a83c179810d68f15dd9e35399b5bab23f3c97f96ee875a80abcb07d1dfa57a6177399dcc347

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

@@ -1 +0,0 @@
-20a7fdefedfc40238042f083ca693c54

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

@@ -1 +0,0 @@
-471d2b163fac9e08859166f2aacec3a1609348c8

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

@@ -1 +0,0 @@
-4a344c3b3b5597488fece53c9cc7358705e6d40116b0779122428094bd021db7

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

@@ -1 +0,0 @@
-93443f0d56c9f84ec24523b954e6e9782652c4bd5d8c94bf558812fade6750beb49f4678dcbaef53e1948edcf5fb5e35c47efb49c7acc79cd2ffa0fea2b287bd

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

@@ -1 +0,0 @@
-e7043eb4fd0dfa3c309fd8cd35ee68e5

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

@@ -1 +0,0 @@
-80bef0c22a710dabb0e72b8d15c59125db1bd58b

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

@@ -1 +0,0 @@
-7828ffdff493f8a856efad9b7db540e4e6b13b91260292efe98791013ba2db04

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

@@ -1 +0,0 @@
-a57448b5eec5edfb2b45b99b9c8a6714b3384f71ade0f25da7b453d14c29597e818690b293cefa9be9362be29efb2c420664283cb1fc994883cd143d46506a2f

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

@@ -1 +0,0 @@
-f947833decee666021174627c8909b4b

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

@@ -1 +0,0 @@
-ae94fe4f6480eee73e5f4cc2617dc9b64c5602e0

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

@@ -1 +0,0 @@
-b9ea5a9228c8248ce58fcfc5eb12983b642c2240ae61fd0929cfdafb664cc9a6

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

@@ -1 +0,0 @@
-7d5986795398d9c6021a9d4085a4e1b2c3e794e51fb873ddfefc596d2f8b3a04a58c553fdb4202f6bd5fa4bbbf36373b318a7497a66e345b6f8f23bfee8b4145

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/DefaultIdleInterrogationStrategy.kt

@@ -1,84 +0,0 @@
-@file:RNDropSupportTodo(62, "Remove all of this; Use DelegatedIdleInterrogationStrategy, instead.")
-
-package com.wix.detox.reactnative.idlingresources.timers
-
-import com.facebook.react.bridge.ReactContext
-import com.wix.detox.common.RNDropSupportTodo
-import com.wix.detox.reactnative.helpers.RNHelpers
-import org.joor.Reflect
-import java.util.*
-
-private const val BUSY_WINDOW_THRESHOLD = 1500
-
-private class TimerReflected(timer: Any) {
-    private var reflected = Reflect.on(timer)
-
-    val isRepeating: Boolean
-        get() = reflected.field("mRepeat").get()
-    val interval: Int
-        get() = reflected.field("mInterval").get()
-    val targetTime: Long
-        get() = reflected.field("mTargetTime").get()
-}
-
-private class TimingModuleReflected(private val timingModule: Any) {
-    val timersQueue: PriorityQueue<Any>
-        get() = Reflect.on(timingModule).field("mTimers").get()
-    val timersLock: Any
-        get() = Reflect.on(timingModule).field("mTimerGuard").get()
-
-    operator fun component1() = timersQueue
-    operator fun component2() = timersLock
-}
-
-class DefaultIdleInterrogationStrategy
-    internal constructor(private val timersModule: Any)
-    : IdleInterrogationStrategy {
-
-    override fun isIdleNow(): Boolean {
-        val (timersQueue, timersLock) = TimingModuleReflected(timersModule)
-        synchronized(timersLock) {
-            val nextTimer = timersQueue.peek()
-            nextTimer?.let {
-                return !isTimerInBusyWindow(it) && !hasBusyTimers(timersQueue)
-            }
-            return true
-        }
-    }
-
-    private fun isTimerInBusyWindow(timer: Any): Boolean {
-        val timerReflected = TimerReflected(timer)
-        return when {
-            timerReflected.isRepeating -> false
-            timerReflected.interval > BUSY_WINDOW_THRESHOLD -> false
-            else -> true
-        }
-    }
-
-    private fun hasBusyTimers(timersQueue: PriorityQueue<Any>): Boolean {
-        timersQueue.forEach {
-            if (isTimerInBusyWindow(it)) {
-                return true
-            }
-        }
-        return false
-    }
-
-    companion object {
-        fun createIfSupported(reactContext: ReactContext): DefaultIdleInterrogationStrategy? {
-            // RN = 0.62.0:
-            // Should have been handled by DelegatedIdleInterrogationStrategy.createIfSupported() but seems the new TimingModule class
-            // was released without the awaited-for "hasActiveTimersInRange()" method.
-            try {
-                val timingModule = RNHelpers.getNativeModule(reactContext, "com.facebook.react.modules.core.TimingModule")
-                val timersManager = Reflect.on(timingModule).get<Any>("mJavaTimerManager")
-                return DefaultIdleInterrogationStrategy(timersManager)
-            } catch (ex: Exception) {
-            }
-
-            // RN < 0.62
-            val timingModule = RNHelpers.getNativeModule(reactContext, "com.facebook.react.modules.core.Timing") ?: return null
-            return DefaultIdleInterrogationStrategy(timingModule)
-        }
-    }
-}

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

@@ -1,115 +0,0 @@
-package com.wix.detox.reactnative.idlingresources.timers
-
-import com.facebook.react.bridge.NativeModule
-import com.wix.detox.UTHelpers
-import org.assertj.core.api.Assertions
-import org.spekframework.spek2.Spek
-import org.spekframework.spek2.style.specification.describe
-import java.util.*
-import java.util.concurrent.Executors
-
-private const val BUSY_INTERVAL_MS = 1500
-private const val MEANINGFUL_TIMER_INTERVAL = BUSY_INTERVAL_MS
-
-data class TimerStub(
-        private var mCallbackID: Int,
-        private var mTargetTime: Long,
-        private var mInterval: Int,
-        private var mRepeat: Boolean)
-
-class TimersNativeModuleStub : NativeModule {
-    val mTimers: PriorityQueue<Any> = PriorityQueue(2) { _, _ -> 0}
-    val mTimerGuard = "Lock-Mock"
-
-    override fun onCatalystInstanceDestroy() {}
-    override fun invalidate() {}
-
-    override fun getName(): String = "TimersNativeModuleStub"
-    override fun canOverrideExistingModule() = false
-    override fun initialize() {}
-}
-
-private fun now() = System.nanoTime() / 1000000L
-private fun aTimer(targetTime: Long, interval: Int, isRepeating: Boolean): TimerStub {
-    return TimerStub(-1, targetTime, interval, isRepeating)
-}
-private fun aTimer(interval: Int, isRepeating: Boolean) = aTimer(now() + interval + 10, interval, isRepeating)
-private fun aOneShotTimer(interval: Int) = aTimer(interval, false)
-private fun aRepeatingTimer(interval: Int) = aTimer(interval, true)
-private fun anOverdueTimer() = aTimer(now() - 100, 123, false)
-
-object DefaultIdleInterrogationStrategySpec: Spek({
-  describe("Default timers idle-interrogation strategy") {
-
-      lateinit var timersNativeModule: TimersNativeModuleStub
-
-      beforeEachTest {
-          timersNativeModule = TimersNativeModuleStub()
-      }
-
-      fun givenTimer(timer: Any) {
-          timersNativeModule.mTimers.add(timer)
-      }
-
-      fun uut() = DefaultIdleInterrogationStrategy(timersNativeModule)
-
-      it("should be idle if there are no timers in queue") {
-          Assertions.assertThat(uut().isIdleNow()).isTrue()
-      }
-
-      it("should be busy if there's a meaningful pending timer") {
-          givenTimer(aOneShotTimer(MEANINGFUL_TIMER_INTERVAL))
-          Assertions.assertThat(uut().isIdleNow()).isFalse()
-      }
-
-      it("should be idle if pending timer is too far away (ie not meaningful)") {
-          givenTimer(aOneShotTimer(BUSY_INTERVAL_MS + 1))
-          Assertions.assertThat(uut().isIdleNow()).isTrue()
-      }
-
-      it("should be idle if the only timer is a repeating one") {
-          givenTimer(aRepeatingTimer(MEANINGFUL_TIMER_INTERVAL))
-          Assertions.assertThat(uut().isIdleNow()).isTrue()
-      }
-
-      it("should be busy if a meaningful pending timer lies beyond a repeating one") {
-          givenTimer(aRepeatingTimer(BUSY_INTERVAL_MS / 10))
-          givenTimer(aOneShotTimer(BUSY_INTERVAL_MS))
-          Assertions.assertThat(uut().isIdleNow()).isFalse()
-      }
-
-      /**
-       * Note: Reversed logic due to this issue: https://github.com/wix/Detox/issues/1171 !!!
-       *
-       * Apparently at times (rare) this caused Espresso to think we're idle too soon, rendering
-       * it never to query any idling resource again even after the timer effectively expires...
-       */
-      it("should be *busy* even if all timers are overdue") {
-          givenTimer(anOverdueTimer())
-          givenTimer(anOverdueTimer())
-          Assertions.assertThat(uut().isIdleNow()).isFalse()
-      }
-
-      it("should be busy if has a meaningful pending timer set beyond an overdue timer") {
-          givenTimer(anOverdueTimer())
-          givenTimer(aOneShotTimer(MEANINGFUL_TIMER_INTERVAL))
-          Assertions.assertThat(uut().isIdleNow()).isFalse()
-      }
-
-      it("should yield to other threads using the timers module") {
-          val executor = Executors.newSingleThreadExecutor()
-          var isIdle: Boolean? = null
-
-          synchronized(timersNativeModule.mTimerGuard) {
-              executor.submit {
-                  isIdle = uut().isIdleNow()
-              }
-              UTHelpers.yieldToOtherThreads(executor)
-              Assertions.assertThat(isIdle).isNull()
-          }
-          UTHelpers.yieldToOtherThreads(executor)
-          Assertions.assertThat(isIdle).isNotNull()
-          executor.shutdownNow()
-      }
-  }
-})