detox 20.0.1-breaking.new-global-lifecycle.0 → 20.0.1
Sign up to get free protection for your applications and to get access to all the features.
- package/Detox-android/com/wix/detox/{20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-javadoc.jar → 20.0.1/detox-20.0.1-javadoc.jar} +0 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1-javadoc.jar.md5 +1 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1-javadoc.jar.sha1 +1 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1-javadoc.jar.sha256 +1 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1-javadoc.jar.sha512 +1 -0
- package/Detox-android/com/wix/detox/{20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-sources.jar → 20.0.1/detox-20.0.1-sources.jar} +0 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1-sources.jar.md5 +1 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1-sources.jar.sha1 +1 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1-sources.jar.sha256 +1 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1-sources.jar.sha512 +1 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1.aar +0 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1.aar.md5 +1 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1.aar.sha1 +1 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1.aar.sha256 +1 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1.aar.sha512 +1 -0
- package/Detox-android/com/wix/detox/{20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.pom → 20.0.1/detox-20.0.1.pom} +1 -7
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1.pom.md5 +1 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1.pom.sha1 +1 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1.pom.sha256 +1 -0
- package/Detox-android/com/wix/detox/20.0.1/detox-20.0.1.pom.sha512 +1 -0
- package/Detox-android/com/wix/detox/maven-metadata.xml +4 -4
- package/Detox-android/com/wix/detox/maven-metadata.xml.md5 +1 -1
- package/Detox-android/com/wix/detox/maven-metadata.xml.sha1 +1 -1
- package/Detox-android/com/wix/detox/maven-metadata.xml.sha256 +1 -1
- package/Detox-android/com/wix/detox/maven-metadata.xml.sha512 +1 -1
- package/Detox-ios-src.tbz +0 -0
- package/Detox-ios.tbz +0 -0
- package/README.md +1 -1
- package/android/build.gradle +12 -7
- package/android/detox/build.gradle +13 -9
- package/android/detox/proguard-rules-app.pro +6 -0
- package/android/detox/proguard-rules.pro +3 -0
- package/android/detox/publishing.gradle +27 -27
- package/android/detox/src/full/java/com/wix/detox/DetoxCrashHandler.kt +1 -1
- package/android/detox/src/full/java/com/wix/detox/LaunchArgs.java +9 -0
- package/android/detox/src/full/java/com/wix/detox/TestEngineFacade.kt +1 -1
- package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeExtension.kt +15 -2
- package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeIdlingResources.kt +43 -38
- package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/IdlingResourceDescription.kt +19 -13
- package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/NetworkIdlingResource.java +33 -30
- package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/DelegatedIdleInterrogationStrategy.kt +7 -27
- package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/IdleInterrogationStrategy.kt +1 -11
- package/android/detox/src/main/java/com/wix/detox/common/TextFileReader.kt +1 -1
- package/android/detox/src/testFull/java/com/wix/detox/espresso/action/DetoxMultiTapSpec.kt +4 -3
- package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/NetworkIdlingResourcesTest.kt +61 -0
- package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/timers/DelegatedIdleInterrogationStrategySpec.kt +3 -11
- package/index.d.ts +198 -57
- package/internals.d.ts +219 -45
- package/local-cli/build.js +2 -2
- package/local-cli/build.test.js +14 -14
- package/local-cli/cli.js +8 -6
- package/local-cli/init.js +61 -21
- package/local-cli/rebuild-framework-cache.js +1 -1
- package/local-cli/reset-lock-file.js +16 -0
- package/local-cli/templates/jest.js +13 -10
- package/local-cli/test.js +14 -8
- package/local-cli/test.test.js +148 -61
- package/local-cli/testCommand/TestRunnerCommand.js +78 -72
- package/local-cli/testCommand/builder.js +0 -1
- package/local-cli/testCommand/middlewares.js +4 -13
- package/local-cli/testCommand/warnings.js +0 -3
- package/local-cli/utils/jestInternals.js +4 -1
- package/package.json +23 -16
- package/runners/deprecation.js +42 -44
- package/runners/jest/globalSetup.js +1 -1
- package/runners/jest/globalTeardown.js +1 -1
- package/runners/jest/index.d.ts +60 -0
- package/runners/jest/index.js +3 -8
- package/runners/jest/index.test.js +13 -0
- package/runners/jest/reporters/DetoxReporter.js +33 -2
- package/runners/jest/testEnvironment/index.js +119 -69
- package/runners/jest/testEnvironment/listeners/DetoxCoreListener.js +94 -51
- package/runners/jest/testEnvironment/listeners/DetoxPlatformFilterListener.js +1 -1
- package/runners/jest/testEnvironment/listeners/SpecReporter.js +14 -16
- package/runners/jest/testEnvironment/listeners/WorkerAssignReporter.js +2 -6
- package/runners/jest/testEnvironment/utils/assertJestCircus27.js +17 -3
- package/runners/jest/testEnvironment/utils/assertJestCircus27.test.js +0 -1
- package/src/DetoxWorker.js +105 -62
- package/src/android/core/NativeElement.js +56 -20
- package/src/android/core/NativeExpect.js +28 -9
- package/src/android/interactions/native.js +25 -18
- package/src/artifacts/ArtifactsManager.js +14 -47
- package/src/artifacts/instruments/ios/SimulatorInstrumentsRecording.js +3 -3
- package/src/artifacts/log/ios/SimulatorLogRecording.js +1 -1
- package/src/artifacts/screenshot/SimulatorScreenshotPlugin.js +1 -1
- package/src/artifacts/templates/artifact/Artifact.js +1 -1
- package/src/artifacts/templates/plugin/ArtifactPlugin.js +1 -1
- package/src/artifacts/timeline/TimelineContextTypes.js +7 -0
- package/src/artifacts/utils/temporaryPath.js +18 -7
- package/src/artifacts/video/SimulatorRecordVideoPlugin.js +1 -1
- package/src/client/AsyncWebSocket.js +8 -17
- package/src/client/Client.js +19 -2
- package/src/client/actions/formatters/sync-resources/NetworkFormatter.js +1 -1
- package/src/configuration/collectCliConfig.js +1 -12
- package/src/configuration/composeAppsConfig.js +4 -0
- package/src/configuration/composeDeviceConfig.js +1 -1
- package/src/configuration/composeLoggerConfig.js +19 -10
- package/src/configuration/composeRunnerConfig.js +62 -9
- package/src/configuration/index.js +14 -9
- package/src/configuration/loadExternalConfig.js +1 -1
- package/src/devices/allocation/DeviceAllocator.js +3 -2
- package/src/devices/allocation/drivers/android/emulator/AVDValidator.js +5 -5
- package/src/devices/allocation/drivers/android/emulator/EmulatorAllocDriver.js +4 -3
- package/src/devices/allocation/drivers/android/emulator/EmulatorAllocationHelper.js +1 -1
- package/src/devices/allocation/drivers/android/emulator/EmulatorLauncher.js +3 -2
- package/src/devices/allocation/drivers/android/emulator/EmulatorVersionResolver.js +4 -6
- package/src/devices/allocation/drivers/android/emulator/launchEmulatorProcess.js +1 -1
- package/src/devices/allocation/drivers/android/genycloud/GenyInstanceAllocationHelper.js +1 -1
- package/src/devices/common/drivers/android/genycloud/services/GenyInstanceNaming.js +3 -3
- package/src/devices/common/drivers/android/genycloud/services/GenyRecipesService.js +1 -1
- package/src/devices/common/drivers/android/tools/EmulatorTelnet.js +1 -1
- package/src/devices/common/drivers/android/tools/FreeDeviceFinder.js +1 -1
- package/src/devices/common/drivers/android/tools/MonitoredInstrumentation.js +1 -1
- package/src/devices/common/drivers/ios/tools/AppleSimUtils.js +29 -3
- package/src/devices/lifecycle/GenyGlobalLifecycleHandler.js +13 -15
- package/src/devices/runtime/RuntimeDevice.js +19 -12
- package/src/devices/runtime/drivers/DeviceDriverBase.js +1 -1
- package/src/devices/runtime/drivers/android/AndroidDriver.js +10 -2
- package/src/devices/runtime/drivers/ios/SimulatorDriver.js +1 -1
- package/src/errors/DetoxConfigErrorComposer.js +17 -2
- package/src/ios/expectTwo.js +153 -67
- package/src/ipc/IPCClient.js +12 -12
- package/src/ipc/IPCServer.js +29 -18
- package/src/ipc/{state.js → SessionState.js} +26 -40
- package/src/logger/DetoxLogger.js +261 -157
- package/src/logger/index.js +5 -0
- package/src/logger/utils/BunyanLogger.js +76 -0
- package/src/logger/utils/CategoryThreadDispatcher.js +36 -0
- package/src/logger/utils/DetoxLogFinalizer.js +140 -0
- package/src/logger/utils/MessageStack.js +24 -0
- package/src/logger/utils/ThreadDispatcher.js +61 -0
- package/src/logger/{customConsoleLogger.js → utils/customConsoleLogger.js} +5 -4
- package/src/logger/utils/sanitizeBunyanContext.js +30 -0
- package/src/{utils → logger/utils}/streamUtils.js +51 -17
- package/src/logger/utils/tracerLegacy.js +37 -0
- package/src/realms/DetoxContext.js +78 -65
- package/src/realms/DetoxInternalsFacade.js +8 -12
- package/src/realms/DetoxPrimaryContext.js +104 -72
- package/src/realms/DetoxSecondaryContext.js +29 -32
- package/src/server/DetoxConnection.js +18 -23
- package/src/server/DetoxServer.js +7 -10
- package/src/server/DetoxSession.js +6 -6
- package/src/server/DetoxSessionManager.js +1 -1
- package/src/server/handlers/RegisteredConnectionHandler.js +1 -2
- package/src/symbols.js +16 -22
- package/src/utils/Timer.js +55 -38
- package/src/utils/argparse.js +11 -0
- package/src/utils/childProcess/exec.js +1 -1
- package/src/utils/childProcess/spawn.js +1 -1
- package/src/utils/errorUtils.js +24 -3
- package/src/utils/invocationTraceDescriptions.js +43 -0
- package/src/utils/logger.js +1 -1
- package/src/utils/traceInvocationCall.js +21 -0
- package/src/utils/traceMethods.js +15 -0
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-javadoc.jar.md5 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-javadoc.jar.sha1 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-javadoc.jar.sha256 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-javadoc.jar.sha512 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-sources.jar.md5 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-sources.jar.sha1 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-sources.jar.sha256 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0-sources.jar.sha512 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.aar +0 -0
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.aar.md5 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.aar.sha1 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.aar.sha256 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.aar.sha512 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.pom.md5 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.pom.sha1 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.pom.sha256 +0 -1
- package/Detox-android/com/wix/detox/20.0.1-breaking.new-global-lifecycle.0/detox-20.0.1-breaking.new-global-lifecycle.0.pom.sha512 +0 -1
- package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/DefaultIdleInterrogationStrategy.kt +0 -84
- package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/timers/DefaultIdleInterrogationStrategySpec.kt +0 -115
- package/runners/jest/deprecation.js +0 -25
- package/src/configuration/utils/warnings.js +0 -12
- package/src/logger/DetoxTraceEventBuilder.js +0 -21
- package/src/logger/DetoxTracer.js +0 -133
- package/src/logger/TraceThreadDispatcher.js +0 -52
- package/src/utils/ChromeTracingExporter.js +0 -54
- package/src/utils/trace.js +0 -19
@@ -1,14 +1,13 @@
|
|
1
1
|
const EventEmitter = require('events');
|
2
2
|
const path = require('path');
|
3
|
-
const util = require('util');
|
4
3
|
|
5
4
|
const fs = require('fs-extra');
|
6
5
|
const _ = require('lodash');
|
7
6
|
|
8
7
|
const DetoxRuntimeError = require('../errors/DetoxRuntimeError');
|
9
|
-
const log = require('../utils/logger').child({
|
8
|
+
const log = require('../utils/logger').child({ cat: 'artifacts-manager,artifact' });
|
10
9
|
const resolveModuleFromPath = require('../utils/resolveModuleFromPath');
|
11
|
-
const
|
10
|
+
const traceMethods = require('../utils/traceMethods');
|
12
11
|
|
13
12
|
const FileArtifact = require('./templates/artifact/FileArtifact');
|
14
13
|
const ArtifactPathBuilder = require('./utils/ArtifactPathBuilder');
|
@@ -23,7 +22,7 @@ class ArtifactsManager extends EventEmitter {
|
|
23
22
|
this._artifactPlugins = {};
|
24
23
|
this._pathBuilder = this._resolveArtifactsPathBuilder(pathBuilder, rootDir);
|
25
24
|
|
26
|
-
traceMethods(
|
25
|
+
traceMethods(log, this, [
|
27
26
|
'onAppReady',
|
28
27
|
'onBeforeCleanup',
|
29
28
|
'onBeforeLaunchApp',
|
@@ -33,19 +32,13 @@ class ArtifactsManager extends EventEmitter {
|
|
33
32
|
'onBootDevice',
|
34
33
|
'onCreateExternalArtifact',
|
35
34
|
'onHookFailure',
|
36
|
-
'onHookStart',
|
37
|
-
'onHookSuccess',
|
38
35
|
'onLaunchApp',
|
39
36
|
'onRunDescribeFinish',
|
40
37
|
'onRunDescribeStart',
|
41
|
-
'onRunFinish',
|
42
|
-
'onRunStart',
|
43
38
|
'onShutdownDevice',
|
44
39
|
'onTerminateApp',
|
45
40
|
'onTestDone',
|
46
41
|
'onTestFnFailure',
|
47
|
-
'onTestFnStart',
|
48
|
-
'onTestFnSuccess',
|
49
42
|
'onTestStart',
|
50
43
|
]);
|
51
44
|
}
|
@@ -53,13 +46,13 @@ class ArtifactsManager extends EventEmitter {
|
|
53
46
|
_resolveArtifactsPathBuilder(pathBuilder, rootDir) {
|
54
47
|
if (typeof pathBuilder === 'string') {
|
55
48
|
pathBuilder = resolveModuleFromPath(pathBuilder);
|
49
|
+
}
|
56
50
|
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
}
|
51
|
+
if (typeof pathBuilder === 'function') {
|
52
|
+
try {
|
53
|
+
pathBuilder = pathBuilder({ rootDir });
|
54
|
+
} catch (e) {
|
55
|
+
pathBuilder = new pathBuilder({ rootDir });
|
63
56
|
}
|
64
57
|
}
|
65
58
|
|
@@ -186,8 +179,6 @@ class ArtifactsManager extends EventEmitter {
|
|
186
179
|
});
|
187
180
|
}
|
188
181
|
|
189
|
-
async onRunStart() {}
|
190
|
-
|
191
182
|
async onRunDescribeStart(suite) {
|
192
183
|
await this._callPlugins('ascending', 'onRunDescribeStart', suite);
|
193
184
|
}
|
@@ -196,22 +187,14 @@ class ArtifactsManager extends EventEmitter {
|
|
196
187
|
await this._callPlugins('ascending', 'onTestStart', testSummary);
|
197
188
|
}
|
198
189
|
|
199
|
-
async onHookStart() {}
|
200
|
-
|
201
190
|
async onHookFailure(testSummary) {
|
202
191
|
await this._callPlugins('plain', 'onHookFailure', testSummary);
|
203
192
|
}
|
204
193
|
|
205
|
-
async onHookSuccess() {}
|
206
|
-
|
207
|
-
async onTestFnStart() {}
|
208
|
-
|
209
194
|
async onTestFnFailure(testSummary) {
|
210
195
|
await this._callPlugins('plain', 'onTestFnFailure', testSummary);
|
211
196
|
}
|
212
197
|
|
213
|
-
async onTestFnSuccess() {}
|
214
|
-
|
215
198
|
async onTestDone(testSummary) {
|
216
199
|
await this._callPlugins('descending', 'onTestDone', testSummary);
|
217
200
|
}
|
@@ -220,35 +203,27 @@ class ArtifactsManager extends EventEmitter {
|
|
220
203
|
await this._callPlugins('descending', 'onRunDescribeFinish', suite);
|
221
204
|
}
|
222
205
|
|
223
|
-
async onRunFinish() {}
|
224
|
-
|
225
206
|
async onBeforeCleanup() {
|
226
207
|
await this._callPlugins('descending', 'onBeforeCleanup');
|
227
208
|
await this._idlePromise;
|
228
209
|
}
|
229
210
|
|
230
211
|
async _callSinglePlugin(pluginId, methodName, ...args) {
|
231
|
-
const callSignature = this._composeCallSignature('artifactsManager', methodName, args);
|
232
|
-
log.trace(Object.assign({ event: 'ARTIFACTS_LIFECYCLE', fn: methodName }, ...args), callSignature);
|
233
|
-
|
234
212
|
const plugin = this._artifactPlugins[pluginId];
|
235
213
|
try {
|
236
214
|
await plugin[methodName](...args);
|
237
215
|
} catch (e) {
|
238
|
-
this._unhandledPluginExceptionHandler(e, { plugin, methodName
|
216
|
+
this._unhandledPluginExceptionHandler(e, { plugin, methodName });
|
239
217
|
}
|
240
218
|
}
|
241
219
|
|
242
220
|
async _callPlugins(strategy, methodName, ...args) {
|
243
|
-
const callSignature = this._composeCallSignature('artifactsManager', methodName, args);
|
244
|
-
log.trace(Object.assign({ event: 'ARTIFACTS_LIFECYCLE', fn: methodName }, ...args), callSignature);
|
245
|
-
|
246
221
|
for (const pluginGroup of this._groupPlugins(strategy)) {
|
247
222
|
await Promise.all(pluginGroup.map(async (plugin) => {
|
248
223
|
try {
|
249
224
|
await plugin[methodName](...args);
|
250
225
|
} catch (e) {
|
251
|
-
this._unhandledPluginExceptionHandler(e, { plugin, methodName
|
226
|
+
this._unhandledPluginExceptionHandler(e, { plugin, methodName });
|
252
227
|
}
|
253
228
|
}));
|
254
229
|
}
|
@@ -278,28 +253,20 @@ class ArtifactsManager extends EventEmitter {
|
|
278
253
|
}
|
279
254
|
}
|
280
255
|
|
281
|
-
|
282
|
-
const argsString = args.map(arg => util.inspect(arg)).join(', ');
|
283
|
-
return `${object}.${methodName}(${argsString})`;
|
284
|
-
}
|
285
|
-
|
286
|
-
_unhandledPluginExceptionHandler(err, { plugin, methodName, args }) {
|
256
|
+
_unhandledPluginExceptionHandler(err, { plugin, methodName }) {
|
287
257
|
const logObject = {
|
288
|
-
event: 'ERROR',
|
289
258
|
plugin: plugin.name,
|
290
|
-
err,
|
291
259
|
methodName,
|
260
|
+
err,
|
292
261
|
};
|
293
262
|
|
294
|
-
|
295
|
-
log.warn(logObject, `Suppressed error inside function call: ${callSignature}`);
|
263
|
+
log.warn(logObject, `Suppressed error inside function call.`);
|
296
264
|
}
|
297
265
|
|
298
266
|
_idleCallbackErrorHandle(err, caller) {
|
299
267
|
this._unhandledPluginExceptionHandler(err, {
|
300
268
|
plugin: caller,
|
301
269
|
methodName: 'onIdleCallback',
|
302
|
-
args: []
|
303
270
|
});
|
304
271
|
}
|
305
272
|
}
|
@@ -2,7 +2,7 @@
|
|
2
2
|
const fs = require('fs-extra');
|
3
3
|
const _ = require('lodash');
|
4
4
|
|
5
|
-
const log = require('../../../utils/logger').child({
|
5
|
+
const log = require('../../../utils/logger').child({ cat: 'artifact' });
|
6
6
|
const FileArtifact = require('../../templates/artifact/FileArtifact');
|
7
7
|
const InstrumentsArtifactRecording = require('../InstrumentsArtifactRecording');
|
8
8
|
|
@@ -37,9 +37,9 @@ class SimulatorInstrumentsRecording extends InstrumentsArtifactRecording {
|
|
37
37
|
SimulatorInstrumentsRecording.hintAboutDetoxInstruments = _.once(() => {
|
38
38
|
log.warn(`Make sure either:
|
39
39
|
1. You have installed Detox Instruments:
|
40
|
-
https://github.com/wix/DetoxInstruments#installation
|
40
|
+
https://github.com/wix/DetoxInstruments#installation
|
41
41
|
2. You have integrated Detox Instruments in your app:
|
42
|
-
https://github.com/wix/DetoxInstruments/blob/master/Documentation/XcodeIntegrationGuide.md
|
42
|
+
https://github.com/wix/DetoxInstruments/blob/master/Documentation/XcodeIntegrationGuide.md
|
43
43
|
3. You have set the environment variable with your custom Detox Instruments location:
|
44
44
|
export DETOX_INSTRUMENTS_PATH="/path/to/Detox Instruments.app"`);
|
45
45
|
});
|
@@ -2,7 +2,7 @@
|
|
2
2
|
const fs = require('fs-extra');
|
3
3
|
|
4
4
|
const childProcess = require('../../../utils/childProcess');
|
5
|
-
const log = require('../../../utils/logger').child({
|
5
|
+
const log = require('../../../utils/logger').child({ cat: 'artifact' });
|
6
6
|
const sleep = require('../../../utils/sleep');
|
7
7
|
const Artifact = require('../../templates/artifact/Artifact');
|
8
8
|
const FileArtifact = require('../../templates/artifact/FileArtifact');
|
@@ -1,7 +1,7 @@
|
|
1
1
|
const path = require('path');
|
2
2
|
|
3
3
|
const fs = require('../../utils/fsext');
|
4
|
-
const log = require('../../utils/logger').child({
|
4
|
+
const log = require('../../utils/logger').child({ cat: 'artifacts-plugin,artifacts' });
|
5
5
|
const FileArtifact = require('../templates/artifact/FileArtifact');
|
6
6
|
const temporaryPath = require('../utils/temporaryPath');
|
7
7
|
|
@@ -3,7 +3,7 @@
|
|
3
3
|
|
4
4
|
const _ = require('lodash');
|
5
5
|
|
6
|
-
const log = require('../../../utils/logger').child({
|
6
|
+
const log = require('../../../utils/logger').child({ cat: 'artifacts-plugin,artifacts' });
|
7
7
|
|
8
8
|
/***
|
9
9
|
* Almost non-opinionated building block for any artifact type
|
@@ -2,15 +2,26 @@ const path = require('path');
|
|
2
2
|
|
3
3
|
const tempfile = require('tempfile');
|
4
4
|
|
5
|
+
function createTempFileBuilderFn(fileExtension) {
|
6
|
+
/**
|
7
|
+
* @param {string} [basename]
|
8
|
+
*/
|
9
|
+
return (basename) => {
|
10
|
+
return basename
|
11
|
+
? path.join(path.dirname(tempfile()), `${basename}.detox.${fileExtension}`)
|
12
|
+
: tempfile(`.detox.${fileExtension}`);
|
13
|
+
};
|
14
|
+
}
|
15
|
+
|
5
16
|
module.exports = {
|
6
17
|
for: {
|
7
|
-
json: (
|
8
|
-
jsonl: (
|
9
|
-
png: (
|
10
|
-
log: (
|
11
|
-
mp4: (
|
12
|
-
dtxrec: (
|
13
|
-
viewhierarchy: (
|
18
|
+
json: createTempFileBuilderFn('json'),
|
19
|
+
jsonl: createTempFileBuilderFn('jsonl'),
|
20
|
+
png: createTempFileBuilderFn('png'),
|
21
|
+
log: createTempFileBuilderFn('log'),
|
22
|
+
mp4: createTempFileBuilderFn('mp4'),
|
23
|
+
dtxrec: createTempFileBuilderFn('dtxrec'),
|
24
|
+
viewhierarchy: createTempFileBuilderFn('viewhierarchy'),
|
14
25
|
},
|
15
26
|
mask: () => path.join(tempfile(), '..') + path.sep + '*.detox.*',
|
16
27
|
};
|
@@ -1,7 +1,7 @@
|
|
1
1
|
const fs = require('fs-extra');
|
2
2
|
|
3
3
|
const { interruptProcess } = require('../../utils/childProcess');
|
4
|
-
const log = require('../../utils/logger').child({
|
4
|
+
const log = require('../../utils/logger').child({ cat: 'artifacts-plugin,artifact' });
|
5
5
|
const Artifact = require('../templates/artifact/Artifact');
|
6
6
|
const FileArtifact = require('../templates/artifact/FileArtifact');
|
7
7
|
const temporaryPath = require('../utils/temporaryPath');
|
@@ -5,25 +5,16 @@ const WebSocket = require('ws');
|
|
5
5
|
const DetoxInternalError = require('../errors/DetoxInternalError');
|
6
6
|
const DetoxRuntimeError = require('../errors/DetoxRuntimeError');
|
7
7
|
const Deferred = require('../utils/Deferred');
|
8
|
-
const log = require('../utils/logger').child({
|
8
|
+
const log = require('../utils/logger').child({ cat: 'ws-client,ws' });
|
9
9
|
|
10
10
|
const InflightRequest = require('./InflightRequest');
|
11
11
|
|
12
|
-
const EVENTS = {
|
13
|
-
OPEN: Object.freeze({ event: 'WS_OPEN' }),
|
14
|
-
ERROR: Object.freeze({ event: 'WS_ERROR' }),
|
15
|
-
MESSAGE: Object.freeze({ event: 'WS_MESSAGE' }),
|
16
|
-
SEND: Object.freeze({ event: 'WS_SEND' }),
|
17
|
-
LATE_RESPONSE: Object.freeze({ event: 'WS_LATE_RESPONSE' }),
|
18
|
-
};
|
19
|
-
|
20
12
|
const DEFAULT_SEND_OPTIONS = {
|
21
13
|
timeout: 0,
|
22
14
|
};
|
23
15
|
|
24
16
|
class AsyncWebSocket {
|
25
17
|
constructor(url) {
|
26
|
-
this._log = log.child({ url });
|
27
18
|
this._url = url;
|
28
19
|
this._ws = null;
|
29
20
|
this._eventCallbacks = {};
|
@@ -99,9 +90,9 @@ class AsyncWebSocket {
|
|
99
90
|
|
100
91
|
this.handleMultipleNonAtomicPendingActions();
|
101
92
|
|
102
|
-
const
|
103
|
-
|
104
|
-
this._ws.send(
|
93
|
+
const payload = JSON.stringify(message);
|
94
|
+
log.trace({ data: payload }, 'send message');
|
95
|
+
this._ws.send(payload);
|
105
96
|
|
106
97
|
return inFlight.promise;
|
107
98
|
}
|
@@ -157,7 +148,7 @@ class AsyncWebSocket {
|
|
157
148
|
}
|
158
149
|
|
159
150
|
if (!hasPendingActions) {
|
160
|
-
log.error(
|
151
|
+
log.error({ error });
|
161
152
|
}
|
162
153
|
}
|
163
154
|
|
@@ -186,7 +177,7 @@ class AsyncWebSocket {
|
|
186
177
|
* @private
|
187
178
|
*/
|
188
179
|
_onOpen(event) { // eslint-disable-line no-unused-vars
|
189
|
-
|
180
|
+
log.trace(`opened web socket to: ${this._url}`);
|
190
181
|
this._opening.resolve();
|
191
182
|
this._opening = null;
|
192
183
|
}
|
@@ -234,7 +225,7 @@ class AsyncWebSocket {
|
|
234
225
|
const data = event && event.data || null;
|
235
226
|
|
236
227
|
try {
|
237
|
-
|
228
|
+
log.trace({ data }, 'get message');
|
238
229
|
|
239
230
|
const json = JSON.parse(data);
|
240
231
|
if (!json || !json.type) {
|
@@ -259,7 +250,7 @@ class AsyncWebSocket {
|
|
259
250
|
|
260
251
|
if (!handled) {
|
261
252
|
if (this._abortedMessageIds.has(json.messageId)) {
|
262
|
-
log.debug(
|
253
|
+
log.debug({ messageId: json.messageId }, `late response`);
|
263
254
|
} else {
|
264
255
|
throw new DetoxRuntimeError('Unexpected message received over the web socket: ' + json.type);
|
265
256
|
}
|
package/src/client/Client.js
CHANGED
@@ -9,7 +9,7 @@ const DetoxRuntimeError = require('../errors/DetoxRuntimeError');
|
|
9
9
|
const failedToReachTheApp = require('../errors/longreads/failedToReachTheApp');
|
10
10
|
const Deferred = require('../utils/Deferred');
|
11
11
|
const { asError, createErrorWithUserStack, replaceErrorStack } = require('../utils/errorUtils');
|
12
|
-
const log = require('../utils/logger').child({
|
12
|
+
const log = require('../utils/logger').child({ cat: 'ws-client,ws' });
|
13
13
|
|
14
14
|
const AsyncWebSocket = require('./AsyncWebSocket');
|
15
15
|
const actions = require('./actions/actions');
|
@@ -34,6 +34,7 @@ class Client {
|
|
34
34
|
this._slowInvocationStatusHandle = null;
|
35
35
|
this._whenAppIsConnected = this._invalidState('before connecting to the app');
|
36
36
|
this._whenAppIsReady = this._whenAppIsConnected;
|
37
|
+
this._whenAppDisconnected = Deferred.resolved();
|
37
38
|
this._isCleaningUp = false;
|
38
39
|
this._pendingAppCrash = null;
|
39
40
|
this._appTerminationHandle = null;
|
@@ -201,6 +202,11 @@ class Client {
|
|
201
202
|
}
|
202
203
|
}
|
203
204
|
|
205
|
+
/** @async */
|
206
|
+
waitUntilDisconnected() {
|
207
|
+
return this._whenAppDisconnected.promise;
|
208
|
+
}
|
209
|
+
|
204
210
|
async waitForBackground() {
|
205
211
|
await this.sendAction(new actions.WaitForBackground());
|
206
212
|
}
|
@@ -301,6 +307,8 @@ class Client {
|
|
301
307
|
} else {
|
302
308
|
this._whenAppIsConnected = Deferred.resolved();
|
303
309
|
}
|
310
|
+
|
311
|
+
this._whenAppDisconnected = new Deferred();
|
304
312
|
}
|
305
313
|
|
306
314
|
_onAppReady() {
|
@@ -320,6 +328,10 @@ class Client {
|
|
320
328
|
}
|
321
329
|
|
322
330
|
_onBeforeAppCrash({ params }) {
|
331
|
+
if (this._pendingAppCrash) {
|
332
|
+
return;
|
333
|
+
}
|
334
|
+
|
323
335
|
this._pendingAppCrash = new DetoxRuntimeError({
|
324
336
|
message: 'The app has crashed, see the details below:',
|
325
337
|
debugInfo: params.errorDetails,
|
@@ -338,10 +350,15 @@ class Client {
|
|
338
350
|
this._whenAppIsReady = this._whenAppIsConnected;
|
339
351
|
|
340
352
|
if (this._pendingAppCrash) {
|
353
|
+
this._whenAppDisconnected.reject(this._pendingAppCrash);
|
341
354
|
this._asyncWebSocket.rejectAll(this._pendingAppCrash);
|
342
355
|
this._pendingAppCrash = null;
|
343
356
|
} else if (this._asyncWebSocket.hasPendingActions()) {
|
344
|
-
|
357
|
+
const error = new DetoxRuntimeError('The app has unexpectedly disconnected from Detox server.');
|
358
|
+
this._asyncWebSocket.rejectAll(error);
|
359
|
+
this._whenAppDisconnected.resolve();
|
360
|
+
} else {
|
361
|
+
this._whenAppDisconnected.resolve();
|
345
362
|
}
|
346
363
|
}
|
347
364
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
const { makeResourceTitle, makeResourceSubTitle } = require('./utils');
|
2
2
|
|
3
3
|
function makeURLDescription(url, urlCount) {
|
4
|
-
return makeResourceSubTitle(`URL #${urlCount}: ${url}
|
4
|
+
return makeResourceSubTitle(`URL #${urlCount}: ${url}`);
|
5
5
|
}
|
6
6
|
|
7
7
|
module.exports = function(properties) {
|
@@ -1,9 +1,6 @@
|
|
1
1
|
const _ = require('lodash');
|
2
2
|
|
3
3
|
const argparse = require('../utils/argparse');
|
4
|
-
const log = require('../utils/logger').child({ __filename });
|
5
|
-
|
6
|
-
const { DEVICE_LAUNCH_ARGS_GENERIC_DEPRECATION } = require('./utils/warnings');
|
7
4
|
|
8
5
|
const asBoolean = (value) => {
|
9
6
|
if (typeof value === 'boolean') {
|
@@ -25,14 +22,6 @@ const asNumber = (value) => {
|
|
25
22
|
: undefined;
|
26
23
|
};
|
27
24
|
|
28
|
-
const deprecateDeviceLaunchArgs = (value) => {
|
29
|
-
if (value) {
|
30
|
-
log.warn(DEVICE_LAUNCH_ARGS_GENERIC_DEPRECATION);
|
31
|
-
}
|
32
|
-
|
33
|
-
return value;
|
34
|
-
};
|
35
|
-
|
36
25
|
function collectCliConfig({ argv }) {
|
37
26
|
const env = (key) => argparse.getArgValue(key);
|
38
27
|
const get = (key, fallback) => {
|
@@ -51,7 +40,7 @@ function collectCliConfig({ argv }) {
|
|
51
40
|
configPath: get('config-path'),
|
52
41
|
configuration: get('configuration'),
|
53
42
|
debugSynchronization: asNumber(get('debug-synchronization')),
|
54
|
-
deviceBootArgs: get('device-boot-args'
|
43
|
+
deviceBootArgs: get('device-boot-args'),
|
55
44
|
appLaunchArgs: get('app-launch-args'),
|
56
45
|
deviceName: get('device-name'),
|
57
46
|
forceAdbInstall: asBoolean(get('force-adb-install')),
|
@@ -144,6 +144,10 @@ function validateAppConfig({ appConfig, appPath, deviceConfig, errorComposer })
|
|
144
144
|
if (appConfig.launchArgs && !_.isObject(appConfig.launchArgs)) {
|
145
145
|
throw errorComposer.malformedAppLaunchArgs(appPath);
|
146
146
|
}
|
147
|
+
|
148
|
+
if (appConfig.type !== 'android.apk' && appConfig.reversePorts) {
|
149
|
+
throw errorComposer.unsupportedReversePorts(appPath);
|
150
|
+
}
|
147
151
|
}
|
148
152
|
|
149
153
|
module.exports = composeAppsConfig;
|
@@ -2,7 +2,7 @@
|
|
2
2
|
const _ = require('lodash');
|
3
3
|
|
4
4
|
const environmentFactory = require('../environmentFactory');
|
5
|
-
const log = require('../utils/logger').child({
|
5
|
+
const log = require('../utils/logger').child({ cat: 'config' });
|
6
6
|
|
7
7
|
/**
|
8
8
|
* @param {DetoxConfigErrorComposer} opts.errorComposer
|
@@ -7,25 +7,34 @@ const { castLevel, defaultOptions } = require('../logger/DetoxLogger');
|
|
7
7
|
* @param {Detox.DetoxConfig} opts.globalConfig
|
8
8
|
* @param {Detox.DetoxConfiguration} opts.localConfig
|
9
9
|
* @param {*} opts.cliConfig
|
10
|
-
* @returns {Detox.DetoxLoggerConfig}
|
11
10
|
*/
|
12
11
|
function composeLoggerConfig(opts) {
|
13
12
|
const { globalConfig, localConfig, cliConfig } = opts;
|
14
13
|
|
15
|
-
|
14
|
+
const items = [
|
16
15
|
{
|
17
16
|
level: 'info',
|
18
|
-
overrideConsole:
|
19
|
-
options:
|
20
|
-
...defaultOptions,
|
21
|
-
prefixers: {
|
22
|
-
...defaultOptions.prefixers,
|
23
|
-
},
|
24
|
-
},
|
17
|
+
overrideConsole: true,
|
18
|
+
options: defaultOptions,
|
25
19
|
},
|
26
20
|
globalConfig.logger,
|
27
21
|
localConfig.logger,
|
28
22
|
adaptCLI(cliConfig),
|
23
|
+
];
|
24
|
+
|
25
|
+
return items.reduce(
|
26
|
+
/**
|
27
|
+
* @param {Partial<Detox.DetoxLoggerConfig>} acc
|
28
|
+
* @param config
|
29
|
+
*/
|
30
|
+
(acc, config) => {
|
31
|
+
if (!config) return acc;
|
32
|
+
const { options } = config;
|
33
|
+
return _.merge(acc, {
|
34
|
+
options: typeof options === 'function' ? options(acc) : options
|
35
|
+
});
|
36
|
+
},
|
37
|
+
items.reduce((a, b) => _.merge(a, _.omit(b, 'options')))
|
29
38
|
);
|
30
39
|
}
|
31
40
|
|
@@ -37,7 +46,7 @@ function adaptCLI(cliConfig) {
|
|
37
46
|
}
|
38
47
|
|
39
48
|
if (cliConfig.useCustomLogger !== undefined) {
|
40
|
-
result.overrideConsole = cliConfig.useCustomLogger
|
49
|
+
result.overrideConsole = cliConfig.useCustomLogger;
|
41
50
|
}
|
42
51
|
|
43
52
|
if (cliConfig.noColor) {
|
@@ -2,17 +2,19 @@ const os = require('os');
|
|
2
2
|
|
3
3
|
const _ = require('lodash');
|
4
4
|
|
5
|
+
const log = require('../utils/logger');
|
6
|
+
|
5
7
|
/**
|
6
8
|
* @param {object} opts
|
7
9
|
* @param {Detox.DetoxConfig} opts.globalConfig
|
8
10
|
* @param {Detox.DetoxConfiguration} opts.localConfig
|
9
|
-
* @param {DetoxInternals.
|
11
|
+
* @param {DetoxInternals.CLIConfig} opts.cliConfig
|
10
12
|
* @param {Record<string, any>} opts.testRunnerArgv
|
11
13
|
* @param {import('../errors/DetoxConfigErrorComposer')} opts.errorComposer
|
12
14
|
* @returns {Detox.DetoxTestRunnerConfig} opts.testRunnerArgv
|
13
15
|
*/
|
14
16
|
function composeRunnerConfig(opts) {
|
15
|
-
const globalConfig = opts.globalConfig
|
17
|
+
const globalConfig = adaptLegacyRunnerConfig(opts.globalConfig);
|
16
18
|
if (globalConfig != null && typeof globalConfig !== 'object') {
|
17
19
|
throw opts.errorComposer.invalidTestRunnerProperty(true);
|
18
20
|
}
|
@@ -29,8 +31,12 @@ function composeRunnerConfig(opts) {
|
|
29
31
|
{
|
30
32
|
retries: 0,
|
31
33
|
inspectBrk: inspectBrkHookDefault,
|
34
|
+
forwardEnv: false,
|
35
|
+
bail: false,
|
32
36
|
jest: {
|
33
|
-
|
37
|
+
setupTimeout: 300000,
|
38
|
+
teardownTimeout: 30000,
|
39
|
+
retryAfterCircusRetries: false,
|
34
40
|
reportSpecs: undefined,
|
35
41
|
reportWorkerAssign: true,
|
36
42
|
},
|
@@ -50,16 +56,62 @@ function composeRunnerConfig(opts) {
|
|
50
56
|
|
51
57
|
if (typeof merged.inspectBrk === 'function') {
|
52
58
|
if (cliConfig.inspectBrk) {
|
59
|
+
merged.retries = 0;
|
60
|
+
merged.forwardEnv = true;
|
53
61
|
merged.inspectBrk(merged);
|
54
|
-
merged.inspectBrk = true;
|
55
|
-
} else {
|
56
|
-
merged.inspectBrk = false;
|
57
62
|
}
|
63
|
+
|
64
|
+
delete merged.inspectBrk;
|
58
65
|
}
|
59
66
|
|
60
67
|
return merged;
|
61
68
|
}
|
62
69
|
|
70
|
+
function adaptLegacyRunnerConfig(globalConfig) {
|
71
|
+
let isLegacy = false;
|
72
|
+
|
73
|
+
const runnerConfigKey = 'runnerConfig' in globalConfig ? 'runnerConfig' : 'runner-config';
|
74
|
+
if (_.isString(globalConfig[runnerConfigKey])) {
|
75
|
+
isLegacy = true;
|
76
|
+
log.warn(`Detected a deprecated "${runnerConfigKey}" property (string).`);
|
77
|
+
}
|
78
|
+
|
79
|
+
const testRunnerKey = 'testRunner' in globalConfig ? 'testRunner' : 'test-runner';
|
80
|
+
if (_.isString(globalConfig[testRunnerKey])) {
|
81
|
+
isLegacy = true;
|
82
|
+
log.warn(`Detected a deprecated "${testRunnerKey}" property (string).`);
|
83
|
+
}
|
84
|
+
|
85
|
+
if (globalConfig.specs != null) {
|
86
|
+
isLegacy = true;
|
87
|
+
log.warn(`Detected a deprecated "specs" property.`);
|
88
|
+
}
|
89
|
+
|
90
|
+
if (!isLegacy) {
|
91
|
+
return globalConfig.testRunner;
|
92
|
+
}
|
93
|
+
|
94
|
+
log.warn(`Please migrate your Detox config according to the guide:\nhttps://wix.github.io/Detox/docs/guide/migration\n`);
|
95
|
+
const testRunner = globalConfig[testRunnerKey];
|
96
|
+
const runnerConfig = globalConfig[runnerConfigKey];
|
97
|
+
const specs = globalConfig.specs != null ? String(globalConfig.specs) : undefined;
|
98
|
+
|
99
|
+
const args = {};
|
100
|
+
if (_.isString(testRunner)) {
|
101
|
+
args.$0 = testRunner;
|
102
|
+
}
|
103
|
+
|
104
|
+
if (_.isString(runnerConfig)) {
|
105
|
+
args.config = runnerConfig;
|
106
|
+
}
|
107
|
+
|
108
|
+
if (specs) {
|
109
|
+
args._ = [specs];
|
110
|
+
}
|
111
|
+
|
112
|
+
return { args };
|
113
|
+
}
|
114
|
+
|
63
115
|
function hasEmptyPositionalArgs(value, key) {
|
64
116
|
return key === '_' ? _.isEmpty(value) : false;
|
65
117
|
}
|
@@ -68,9 +120,10 @@ function hasEmptyPositionalArgs(value, key) {
|
|
68
120
|
* @param {Detox.DetoxTestRunnerConfig} config
|
69
121
|
*/
|
70
122
|
function inspectBrkHookDefault(config) {
|
71
|
-
|
72
|
-
|
73
|
-
|
123
|
+
/* istanbul ignore next */
|
124
|
+
config.args.$0 = os.platform() !== 'win32'
|
125
|
+
? `node --inspect-brk ./node_modules/.bin/jest`
|
126
|
+
: `node --inspect-brk ./node_modules/jest/bin/jest.js`;
|
74
127
|
config.args.runInBand = true;
|
75
128
|
delete config.args.w;
|
76
129
|
delete config.args.workers;
|