detox 21.0.0-breaking.new-global-lifecycle.0 → 21.0.1-rc.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (304) hide show
  1. package/.eslintrc.js +2 -7
  2. package/Detox-android/com/wix/detox/{21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-javadoc.jar → 21.0.1-rc.0/detox-21.0.1-rc.0-javadoc.jar} +0 -0
  3. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0-javadoc.jar.md5 +1 -0
  4. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0-javadoc.jar.sha1 +1 -0
  5. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0-javadoc.jar.sha256 +1 -0
  6. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0-javadoc.jar.sha512 +1 -0
  7. package/Detox-android/com/wix/detox/{21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-sources.jar → 21.0.1-rc.0/detox-21.0.1-rc.0-sources.jar} +0 -0
  8. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0-sources.jar.md5 +1 -0
  9. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0-sources.jar.sha1 +1 -0
  10. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0-sources.jar.sha256 +1 -0
  11. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0-sources.jar.sha512 +1 -0
  12. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0.aar +0 -0
  13. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0.aar.md5 +1 -0
  14. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0.aar.sha1 +1 -0
  15. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0.aar.sha256 +1 -0
  16. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0.aar.sha512 +1 -0
  17. package/Detox-android/com/wix/detox/{21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.pom → 21.0.1-rc.0/detox-21.0.1-rc.0.pom} +22 -10
  18. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0.pom.md5 +1 -0
  19. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0.pom.sha1 +1 -0
  20. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0.pom.sha256 +1 -0
  21. package/Detox-android/com/wix/detox/21.0.1-rc.0/detox-21.0.1-rc.0.pom.sha512 +1 -0
  22. package/Detox-android/com/wix/detox/maven-metadata.xml +4 -4
  23. package/Detox-android/com/wix/detox/maven-metadata.xml.md5 +1 -1
  24. package/Detox-android/com/wix/detox/maven-metadata.xml.sha1 +1 -1
  25. package/Detox-android/com/wix/detox/maven-metadata.xml.sha256 +1 -1
  26. package/Detox-android/com/wix/detox/maven-metadata.xml.sha512 +1 -1
  27. package/Detox-ios-framework.tbz +0 -0
  28. package/Detox-ios-src.tbz +0 -0
  29. package/Detox-ios-xcuitest.tbz +0 -0
  30. package/README.md +1 -1
  31. package/android/build.gradle +13 -8
  32. package/android/detox/build.gradle +24 -13
  33. package/android/detox/proguard-rules-app.pro +6 -0
  34. package/android/detox/proguard-rules.pro +3 -0
  35. package/android/detox/publish-pom.gradle +5 -1
  36. package/android/detox/publishing.gradle +35 -33
  37. package/android/detox/src/full/java/com/wix/detox/DetoxCrashHandler.kt +1 -1
  38. package/android/detox/src/full/java/com/wix/detox/LaunchArgs.java +9 -0
  39. package/android/detox/src/full/java/com/wix/detox/TestEngineFacade.kt +4 -4
  40. package/android/detox/src/full/java/com/wix/detox/adapters/server/QueryStatusActionHandler.kt +12 -80
  41. package/android/detox/src/full/java/com/wix/detox/adapters/server/WebSocketClient.java +3 -1
  42. package/android/detox/src/full/java/com/wix/detox/common/UIExtensions.kt +28 -0
  43. package/android/detox/src/full/java/com/wix/detox/espresso/DetoxAction.java +37 -3
  44. package/android/detox/src/full/java/com/wix/detox/espresso/DetoxMatcher.java +11 -1
  45. package/android/detox/src/full/java/com/wix/detox/espresso/UiAutomatorHelper.java +1 -1
  46. package/android/detox/src/full/java/com/wix/detox/espresso/action/AdjustSliderToPositionAction.kt +22 -0
  47. package/android/detox/src/{main → full}/java/com/wix/detox/espresso/action/GetAttributesAction.kt +17 -4
  48. package/android/detox/src/full/java/com/wix/detox/espresso/action/RNDetoxAccessibilityAction.kt +46 -0
  49. package/android/detox/src/full/java/com/wix/detox/espresso/common/SliderHelper.kt +75 -0
  50. package/android/detox/src/full/java/com/wix/detox/espresso/common/UiControllerImplReflected.kt +16 -0
  51. package/android/detox/src/full/java/com/wix/detox/espresso/idlingresources/DescriptiveIdlingResource.kt +8 -0
  52. package/android/detox/src/full/java/com/wix/detox/espresso/matcher/ViewMatchers.kt +24 -28
  53. package/android/detox/src/full/java/com/wix/detox/espresso/matcher/WithAccessibilityLabelMatcher.kt +23 -0
  54. package/android/detox/src/full/java/com/wix/detox/espresso/registry/BusyResourcesInquirer.kt +48 -0
  55. package/android/detox/src/full/java/com/wix/detox/inquiry/DetoxBusyResource.kt +92 -0
  56. package/android/detox/src/full/java/com/wix/detox/inquiry/DetoxBusyResourceDescription.kt +26 -0
  57. package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeExtension.kt +15 -2
  58. package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeIdlingResources.kt +43 -38
  59. package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeLoadingMonitor.kt +54 -8
  60. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/AnimatedModuleIdlingResource.java +18 -7
  61. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/AsyncStorageIdlingResource.kt +3 -4
  62. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/BridgeIdlingResource.java +12 -6
  63. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/DetoxBaseIdlingResource.java +2 -0
  64. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/NetworkIdlingResource.java +43 -34
  65. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/DelegatedIdleInterrogationStrategy.kt +7 -27
  66. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/IdleInterrogationStrategy.kt +1 -11
  67. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/TimersIdlingResource.kt +2 -6
  68. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/uimodule/RN66Workaround.kt +13 -4
  69. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/uimodule/UIManagerModuleReflected.kt +1 -1
  70. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/uimodule/UIModuleIdlingResource.kt +4 -6
  71. package/android/detox/src/full/java/com/wix/detox/reactnative/ui/UIExtensions.kt +37 -0
  72. package/android/detox/src/full/java/com/wix/detox/reactnative/utils/RNUtils.kt +6 -0
  73. package/android/detox/src/main/java/com/wix/detox/common/DetoxErrors.java +4 -1
  74. package/android/detox/src/main/java/com/wix/detox/common/TextFileReader.kt +1 -1
  75. package/android/detox/src/main/java/com/wix/detox/espresso/UiControllerSpy.kt +2 -1
  76. package/android/detox/src/main/java/com/wix/detox/espresso/action/common/ReflectUtils.kt +10 -0
  77. package/android/detox/src/main/java/com/wix/detox/espresso/action/common/utils/UiControllerUtils.kt +1 -1
  78. package/android/detox/src/testFull/java/com/wix/detox/UTHelpers.kt +12 -0
  79. package/android/detox/src/testFull/java/com/wix/detox/adapters/server/QueryStatusActionHandlerSpec.kt +35 -94
  80. package/android/detox/src/testFull/java/com/wix/detox/common/UIExtensionsTest.kt +107 -0
  81. package/android/detox/src/testFull/java/com/wix/detox/espresso/action/DetoxMultiTapSpec.kt +4 -3
  82. package/android/detox/src/testFull/java/com/wix/detox/espresso/action/GetAttributesActionTest.kt +22 -9
  83. package/android/detox/src/testFull/java/com/wix/detox/espresso/common/SliderHelperTest.kt +39 -0
  84. package/android/detox/src/testFull/java/com/wix/detox/espresso/matcher/ViewAtIndexMatcherSpec.kt +1 -2
  85. package/android/detox/src/testFull/java/com/wix/detox/espresso/registry/{IRStatusInquirerTest.kt → BusyResourcesInquirerTest.kt} +46 -7
  86. package/android/detox/src/testFull/java/com/wix/detox/{reactnative/idlingresources/IdlingResourceDescriptionSpec.kt → inquiry/DetoxBusyResourceDescriptionSpec.kt} +6 -6
  87. package/android/detox/src/testFull/java/com/wix/detox/inquiry/DetoxBusyResourceSpec.kt +134 -0
  88. package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/AsyncStorageIdlingResourceSpec.kt +4 -5
  89. package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/NetworkIdlingResourcesTest.kt +61 -0
  90. package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/timers/DelegatedIdleInterrogationStrategySpec.kt +3 -11
  91. package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/timers/TimersIdlingResourceSpec.kt +4 -6
  92. package/android/gradle/wrapper/gradle-wrapper.properties +2 -1
  93. package/android/gradlew +181 -107
  94. package/index.d.ts +239 -83
  95. package/index.js +12 -1
  96. package/internals.d.ts +219 -45
  97. package/internals.js +10 -3
  98. package/local-cli/build-framework-cache.js +1 -1
  99. package/local-cli/build-xcuitest-cache.js +16 -0
  100. package/local-cli/build.js +2 -2
  101. package/local-cli/clean-framework-cache.js +1 -1
  102. package/local-cli/clean-xcuitest-cache.js +19 -0
  103. package/local-cli/cli.js +13 -7
  104. package/local-cli/init.js +61 -21
  105. package/local-cli/rebuild-framework-cache.js +4 -4
  106. package/local-cli/rebuild-xcuitest-cache.js +21 -0
  107. package/local-cli/reset-lock-file.js +16 -0
  108. package/local-cli/run-server.js +12 -1
  109. package/local-cli/start.js +49 -0
  110. package/local-cli/startCommand/AppStartCommand.js +65 -0
  111. package/local-cli/templates/jest.js +13 -10
  112. package/local-cli/test.js +14 -8
  113. package/local-cli/testCommand/TestRunnerCommand.js +126 -77
  114. package/local-cli/testCommand/TestRunnerError.js +13 -0
  115. package/local-cli/testCommand/builder.js +5 -1
  116. package/local-cli/testCommand/middlewares.js +4 -13
  117. package/local-cli/testCommand/warnings.js +0 -3
  118. package/local-cli/utils/cliErrorHandling.js +15 -0
  119. package/local-cli/utils/jestInternals.js +4 -1
  120. package/package.json +46 -26
  121. package/runners/deprecation.js +42 -44
  122. package/runners/jest/globalSetup.js +1 -1
  123. package/runners/jest/globalTeardown.js +1 -1
  124. package/runners/jest/index.d.ts +61 -0
  125. package/runners/jest/index.js +3 -8
  126. package/runners/jest/reporters/DetoxReporter.js +33 -2
  127. package/runners/jest/testEnvironment/index.js +119 -68
  128. package/runners/jest/testEnvironment/listeners/DetoxCoreListener.js +97 -51
  129. package/runners/jest/testEnvironment/listeners/DetoxPlatformFilterListener.js +1 -1
  130. package/runners/jest/testEnvironment/listeners/SpecReporter.js +15 -17
  131. package/runners/jest/testEnvironment/listeners/WorkerAssignReporter.js +3 -7
  132. package/runners/jest/testEnvironment/utils/assertJestCircus27.js +17 -3
  133. package/scripts/build_framework.ios.sh +26 -60
  134. package/scripts/build_local_framework.ios.sh +62 -0
  135. package/scripts/build_local_xcuitest.ios.sh +53 -0
  136. package/scripts/build_xcuitest.ios.sh +23 -0
  137. package/scripts/pack_ios.sh +14 -5
  138. package/scripts/postinstall.js +10 -4
  139. package/src/DetoxWorker.js +112 -64
  140. package/src/android/actions/native.js +16 -0
  141. package/src/android/core/NativeElement.js +72 -20
  142. package/src/android/core/NativeExpect.js +28 -9
  143. package/src/android/core/NativeMatcher.js +31 -10
  144. package/src/android/core/NativeWaitFor.js +8 -0
  145. package/src/android/espressoapi/DetoxAction.js +37 -0
  146. package/src/android/espressoapi/DetoxMatcher.js +24 -0
  147. package/src/android/espressoapi/EspressoDetox.js +1 -1
  148. package/src/android/espressoapi/web/WebElement.js +1 -1
  149. package/src/android/interactions/native.js +25 -18
  150. package/src/android/matchers/index.js +2 -2
  151. package/src/android/matchers/native.js +10 -3
  152. package/src/artifacts/ArtifactsManager.js +14 -47
  153. package/src/artifacts/instruments/ios/SimulatorInstrumentsRecording.js +3 -3
  154. package/src/artifacts/log/android/ADBLogcatRecording.js +11 -28
  155. package/src/artifacts/log/ios/SimulatorLogRecording.js +1 -1
  156. package/src/artifacts/screenshot/SimulatorScreenshotPlugin.js +1 -1
  157. package/src/artifacts/templates/artifact/Artifact.js +1 -1
  158. package/src/artifacts/templates/plugin/ArtifactPlugin.js +2 -2
  159. package/src/artifacts/templates/plugin/TwoSnapshotsPerTestPlugin.js +2 -1
  160. package/src/artifacts/templates/plugin/WholeTestRecorderPlugin.js +3 -2
  161. package/src/artifacts/timeline/TimelineContextTypes.js +7 -0
  162. package/src/artifacts/utils/temporaryPath.js +47 -8
  163. package/src/artifacts/video/SimulatorRecordVideoPlugin.js +1 -1
  164. package/src/client/AsyncWebSocket.js +11 -19
  165. package/src/client/Client.js +35 -3
  166. package/src/client/actions/SyncStatusSchema.json +21 -0
  167. package/src/client/actions/actions.js +38 -0
  168. package/src/client/actions/formatters/SyncStatusFormatter.js +2 -0
  169. package/src/client/actions/formatters/sync-resources/BgThreadFormatter.js +5 -0
  170. package/src/client/actions/formatters/sync-resources/NetworkFormatter.js +1 -1
  171. package/src/configuration/collectCliConfig.js +3 -13
  172. package/src/configuration/composeAppsConfig.js +5 -1
  173. package/src/configuration/composeDeviceConfig.js +1 -1
  174. package/src/configuration/composeLoggerConfig.js +20 -10
  175. package/src/configuration/composeRunnerConfig.js +62 -9
  176. package/src/configuration/index.js +14 -9
  177. package/src/configuration/loadExternalConfig.js +1 -1
  178. package/src/devices/allocation/DeviceAllocator.js +15 -2
  179. package/src/devices/allocation/drivers/AllocationDriverBase.js +10 -2
  180. package/src/devices/allocation/drivers/android/attached/AttachedAndroidAllocDriver.js +10 -1
  181. package/src/devices/allocation/drivers/android/emulator/AVDValidator.js +5 -5
  182. package/src/devices/allocation/drivers/android/emulator/EmulatorAllocDriver.js +28 -29
  183. package/src/devices/allocation/drivers/android/emulator/EmulatorAllocationHelper.js +1 -1
  184. package/src/devices/allocation/drivers/android/emulator/EmulatorLauncher.js +6 -5
  185. package/src/devices/allocation/drivers/android/emulator/EmulatorVersionResolver.js +4 -6
  186. package/src/devices/allocation/drivers/android/emulator/launchEmulatorProcess.js +4 -17
  187. package/src/devices/allocation/drivers/android/genycloud/GenyAllocDriver.js +27 -18
  188. package/src/devices/allocation/drivers/android/genycloud/GenyInstanceAllocationHelper.js +1 -1
  189. package/src/devices/allocation/drivers/ios/SimulatorAllocDriver.js +12 -7
  190. package/src/devices/allocation/factories/base.js +1 -1
  191. package/src/devices/common/drivers/android/exec/ADB.js +9 -0
  192. package/src/devices/common/drivers/android/genycloud/exec/GenyCloudExec.js +1 -1
  193. package/src/devices/common/drivers/android/genycloud/services/GenyInstanceNaming.js +3 -3
  194. package/src/devices/common/drivers/android/genycloud/services/GenyRecipesService.js +1 -1
  195. package/src/devices/common/drivers/android/tools/AppInstallHelper.js +4 -4
  196. package/src/devices/common/drivers/android/tools/EmulatorTelnet.js +1 -1
  197. package/src/devices/common/drivers/android/tools/{FileXfer.js → FileTransfer.js} +2 -2
  198. package/src/devices/common/drivers/android/tools/FreeDeviceFinder.js +1 -1
  199. package/src/devices/common/drivers/android/tools/MonitoredInstrumentation.js +1 -1
  200. package/src/devices/common/drivers/android/tools/TempFileTransfer.js +14 -0
  201. package/src/devices/common/drivers/ios/tools/AppleSimUtils.js +21 -4
  202. package/src/devices/lifecycle/GenyGlobalLifecycleHandler.js +13 -15
  203. package/src/devices/runtime/RuntimeDevice.js +24 -12
  204. package/src/devices/runtime/drivers/DeviceDriverBase.js +2 -1
  205. package/src/devices/runtime/drivers/android/AndroidDriver.js +17 -8
  206. package/src/devices/runtime/drivers/ios/SimulatorDriver.js +42 -2
  207. package/src/devices/runtime/drivers/ios/XCUITestUtils.js +209 -0
  208. package/src/devices/runtime/drivers/ios/allowNetworkPermissionsXCUITest.scpt +14 -0
  209. package/src/devices/runtime/factories/android.js +6 -5
  210. package/src/devices/runtime/factories/base.js +3 -2
  211. package/src/errors/DetoxConfigErrorComposer.js +18 -3
  212. package/src/errors/DetoxError.js +5 -1
  213. package/src/ios/expectTwo.js +199 -78
  214. package/src/ipc/IPCClient.js +36 -27
  215. package/src/ipc/IPCServer.js +40 -21
  216. package/src/ipc/SessionState.js +60 -0
  217. package/src/logger/DetoxLogger.js +287 -154
  218. package/src/logger/index.js +5 -0
  219. package/src/logger/utils/BunyanLogger.js +105 -0
  220. package/src/logger/utils/CategoryThreadDispatcher.js +37 -0
  221. package/src/logger/utils/DetoxLogFinalizer.js +166 -0
  222. package/src/logger/utils/MessageStack.js +35 -0
  223. package/src/logger/utils/ThreadDispatcher.js +61 -0
  224. package/src/logger/{customConsoleLogger.js → utils/customConsoleLogger.js} +23 -6
  225. package/src/logger/utils/getMainCategory.js +5 -0
  226. package/src/logger/utils/sanitizeBunyanContext.js +30 -0
  227. package/src/logger/utils/streams/BunyanTransformer.js +72 -0
  228. package/src/logger/utils/streams/ChromeTraceTransformer.js +132 -0
  229. package/src/logger/utils/streams/DetoxJSONLParser.js +31 -0
  230. package/src/logger/utils/streams/JSONLStringer.js +55 -0
  231. package/src/logger/utils/streams/index.js +7 -0
  232. package/src/logger/utils/streams/transformers.js +39 -0
  233. package/src/logger/utils/tracerLegacy.js +37 -0
  234. package/src/realms/DetoxContext.js +83 -66
  235. package/src/realms/DetoxInternalsFacade.js +9 -13
  236. package/src/realms/DetoxPrimaryContext.js +117 -74
  237. package/src/realms/DetoxSecondaryContext.js +32 -35
  238. package/src/{symbols.js → realms/symbols.js} +16 -22
  239. package/src/server/DetoxConnection.js +18 -23
  240. package/src/server/DetoxServer.js +7 -10
  241. package/src/server/DetoxSession.js +9 -6
  242. package/src/server/DetoxSessionManager.js +2 -1
  243. package/src/server/handlers/AnonymousConnectionHandler.js +1 -0
  244. package/src/server/handlers/RegisteredConnectionHandler.js +1 -2
  245. package/src/servicelocator/android/index.js +2 -2
  246. package/src/utils/ExclusiveLockfile.js +1 -0
  247. package/src/utils/Timer.js +59 -36
  248. package/src/utils/argparse.js +11 -27
  249. package/src/utils/childProcess/exec.js +4 -2
  250. package/src/utils/childProcess/spawn.js +1 -1
  251. package/src/utils/dateUtils.js +5 -0
  252. package/src/utils/environment.js +55 -16
  253. package/src/utils/errorUtils.js +24 -3
  254. package/src/utils/invocationTraceDescriptions.js +44 -0
  255. package/src/utils/isPromise.js +8 -1
  256. package/src/utils/logger.js +2 -2
  257. package/src/utils/pathUtils.js +11 -0
  258. package/src/utils/shellUtils.js +17 -0
  259. package/src/utils/traceInvocationCall.js +21 -0
  260. package/src/utils/traceMethods.js +15 -0
  261. package/src/validation/ios/IosSimulatorEnvValidator.js +7 -4
  262. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-javadoc.jar.md5 +0 -1
  263. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-javadoc.jar.sha1 +0 -1
  264. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-javadoc.jar.sha256 +0 -1
  265. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-javadoc.jar.sha512 +0 -1
  266. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-sources.jar.md5 +0 -1
  267. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-sources.jar.sha1 +0 -1
  268. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-sources.jar.sha256 +0 -1
  269. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0-sources.jar.sha512 +0 -1
  270. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.aar +0 -0
  271. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.aar.md5 +0 -1
  272. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.aar.sha1 +0 -1
  273. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.aar.sha256 +0 -1
  274. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.aar.sha512 +0 -1
  275. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.pom.md5 +0 -1
  276. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.pom.sha1 +0 -1
  277. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.pom.sha256 +0 -1
  278. package/Detox-android/com/wix/detox/21.0.0-breaking.new-global-lifecycle.0/detox-21.0.0-breaking.new-global-lifecycle.0.pom.sha512 +0 -1
  279. package/Detox-ios.tbz +0 -0
  280. package/android/detox/src/full/java/com/wix/detox/espresso/registry/IRStatusInquirer.kt +0 -24
  281. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/DescriptiveIdlingResource.kt +0 -10
  282. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/IdlingResourceDescription.kt +0 -20
  283. package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/timers/DefaultIdleInterrogationStrategy.kt +0 -84
  284. package/android/detox/src/main/java/com/wix/detox/espresso/action/AdjustSliderToPositionAction.kt +0 -36
  285. package/android/detox/src/testFull/java/com/wix/detox/espresso/action/AdjustSliderToPositionActionTest.kt +0 -59
  286. package/android/detox/src/testFull/java/com/wix/detox/reactnative/idlingresources/timers/DefaultIdleInterrogationStrategySpec.kt +0 -115
  287. package/local-cli/build.test.js +0 -104
  288. package/local-cli/run-server.test.js +0 -23
  289. package/local-cli/test.test.js +0 -515
  290. package/runners/jest/deprecation.js +0 -25
  291. package/runners/jest/testEnvironment/utils/assertJestCircus27.test.js +0 -23
  292. package/scripts/build_universal_framework.sh +0 -14
  293. package/scripts/build_universal_framework_legacy.sh +0 -76
  294. package/scripts/build_universal_framework_modern.sh +0 -28
  295. package/src/configuration/utils/warnings.js +0 -12
  296. package/src/devices/common/drivers/android/tools/TempFileXfer.js +0 -16
  297. package/src/ipc/state.js +0 -76
  298. package/src/logger/DetoxTraceEventBuilder.js +0 -21
  299. package/src/logger/DetoxTracer.js +0 -133
  300. package/src/logger/TraceThreadDispatcher.js +0 -52
  301. package/src/realms/index.js +0 -10
  302. package/src/utils/ChromeTracingExporter.js +0 -53
  303. package/src/utils/streamUtils.js +0 -214
  304. package/src/utils/trace.js +0 -19
@@ -7,54 +7,74 @@ const { getFullTestName, hasTimedOut } = require('../utils');
7
7
 
8
8
  const RETRY_TIMES = Symbol.for('RETRY_TIMES');
9
9
 
10
+ const log = detoxInternals.log.child({ cat: 'lifecycle,jest-environment' });
11
+
10
12
  class DetoxCoreListener {
11
13
  constructor({ env }) {
12
- this._startedTests = new WeakSet();
13
- this._testsFailedBeforeStart = new WeakSet();
14
+ this._startedTests = new Set();
15
+ this._skippedTests = new Set();
16
+ this._testsFailedBeforeStart = new Set();
14
17
  this._env = env;
15
- this._testRunTimes = 1;
16
- }
17
-
18
- _getTestInvocations(test) {
19
- const { DETOX_RERUN_INDEX } = process.env;
20
-
21
- if (!isNaN(DETOX_RERUN_INDEX)) {
22
- return Number(DETOX_RERUN_INDEX) * this._testRunTimes + test.invocations;
23
- } else {
24
- return test.invocations;
25
- }
18
+ this._circusRetryTimes = 1;
26
19
  }
27
20
 
28
21
  async setup() {
29
22
  // Workaround to override Jest's expect
30
- if (detoxInternals.config.behaviorConfig.init.exposeGlobals) {
23
+ if (detoxInternals.config.behavior.init.exposeGlobals) {
31
24
  this._env.global.expect = detox.expect;
32
25
  }
33
26
  }
34
27
 
35
- async run_describe_start({ describeBlock: { name, children } }) {
36
- if (children.length) {
37
- await detoxInternals.onRunDescribeStart({ name });
28
+ async run_describe_start({ describeBlock }) {
29
+ if (describeBlock.children.length) {
30
+ log.trace.begin(describeBlock.parent ? describeBlock.name : 'run the tests');
31
+ await detoxInternals.onRunDescribeStart({
32
+ name: describeBlock.name,
33
+ });
38
34
  }
39
35
  }
40
36
 
41
- async run_describe_finish({ describeBlock: { name, children } }) {
42
- if (children.length) {
43
- await detoxInternals.onRunDescribeFinish({ name });
37
+ async run_describe_finish({ describeBlock }) {
38
+ if (describeBlock.children.length) {
39
+ await detoxInternals.onRunDescribeFinish({ name: describeBlock.name });
40
+ log.trace.end();
44
41
  }
45
42
  }
46
43
 
47
44
  async test_start({ test }) {
48
- if (!_.isEmpty(test.errors)) {
45
+ const metadata = this._getTestMetadata(test);
46
+ if (metadata.status === 'failed') {
49
47
  this._testsFailedBeforeStart.add(test);
50
48
  }
51
49
 
50
+ log.trace.begin({
51
+ context: 'test',
52
+ status: metadata.status,
53
+ fullName: metadata.fullName,
54
+ invocations: metadata.invocations,
55
+ }, metadata.title);
56
+
52
57
  const circusRetryTimes = +this._env.global[RETRY_TIMES];
53
- this._testRunTimes = isNaN(circusRetryTimes) ? 1 : 1 + circusRetryTimes;
58
+ this._circusRetryTimes = isNaN(circusRetryTimes) ? 1 : 1 + circusRetryTimes;
59
+ }
60
+
61
+ async test_skip({ test }) {
62
+ log.trace.end({ status: 'skip' }, getFullTestName(test));
63
+ this._skippedTests.add(test);
54
64
  }
55
65
 
56
- async hook_start(_event, state) {
66
+ async test_todo({ test }) {
67
+ log.trace.end({ status: 'todo' }, getFullTestName(test));
68
+ this._skippedTests.add(test);
69
+ }
70
+
71
+ async hook_start(event, state) {
57
72
  await this._onBeforeActualTestStart(state.currentlyRunningTest);
73
+ log.trace.begin({ functionCode: event.hook.fn.toString() }, event.hook.type);
74
+ }
75
+
76
+ async hook_success() {
77
+ log.trace.end({ success: true });
58
78
  }
59
79
 
60
80
  async hook_failure({ error, hook }) {
@@ -62,61 +82,87 @@ class DetoxCoreListener {
62
82
  error,
63
83
  hook: hook.type,
64
84
  });
85
+
86
+ log.trace.end({ success: false, error });
65
87
  }
66
88
 
67
89
  async test_fn_start({ test }) {
68
90
  await this._onBeforeActualTestStart(test);
91
+
92
+ if (!this._testsFailedBeforeStart.has(test)) {
93
+ // Jest bug workaround: beforeAll hook errors result into an unterminated test_fn_start event.
94
+ log.trace.begin({ functionCode: test.fn.toString() }, 'test_fn');
95
+ }
96
+ }
97
+
98
+ async test_fn_success() {
99
+ log.trace.end({ success: true });
69
100
  }
70
101
 
71
102
  async test_fn_failure({ error }) {
72
103
  await detoxInternals.onTestFnFailure({ error });
104
+ log.trace.end({ success: false, error });
105
+ }
106
+
107
+ async test_done({ test }) {
108
+ const metadata = this._getTestMetadata(test);
109
+
110
+ if (this._startedTests.has(test)) {
111
+ await detoxInternals.onTestDone(metadata);
112
+ this._startedTests.delete(test);
113
+ }
114
+
115
+ log.trace.end(_.pick(metadata, ['status', 'timedOut']));
73
116
  }
74
117
 
75
118
  async _onBeforeActualTestStart(test) {
76
- if (!test || test.status === 'skip' || this._startedTests.has(test) || this._testsFailedBeforeStart.has(test)) {
119
+ if (!this._isTestActuallyStarting(test)) {
77
120
  return;
78
121
  }
79
122
 
80
123
  this._startedTests.add(test);
124
+ await detoxInternals.onTestStart(this._getTestMetadata(test));
125
+ }
81
126
 
82
- await detoxInternals.onTestStart({
127
+ _isTestActuallyStarting(test) {
128
+ return test && !this._isTestSkipped(test) && !this._startedTests.has(test) && !this._testsFailedBeforeStart.has(test);
129
+ }
130
+
131
+ _isTestSkipped(test) {
132
+ return test && this._skippedTests.has(test);
133
+ }
134
+
135
+ _getTestMetadata(test) {
136
+ const result = {
83
137
  title: test.name,
84
138
  fullName: getFullTestName(test),
85
- status: 'running',
139
+ status: this._getTestStatus(test),
86
140
  invocations: this._getTestInvocations(test),
87
- });
88
- }
141
+ };
89
142
 
90
- async test_done({ test }) {
91
- if (this._startedTests.has(test)) {
92
- await detoxInternals.onTestDone({
93
- title: test.name,
94
- fullName: getFullTestName(test),
95
- status: test.errors.length ? 'failed' : 'passed',
96
- invocations: this._getTestInvocations(test),
97
- timedOut: hasTimedOut(test)
98
- });
99
-
100
- this._startedTests.delete(test);
143
+ if (result.status === 'failed') {
144
+ result.timedOut = hasTimedOut(test);
101
145
  }
146
+
147
+ return result;
102
148
  }
103
149
 
104
- async run_finish(_event, state) {
105
- if (this._hasFailedTests(state.rootDescribeBlock)) {
106
- await detoxInternals.reportFailedTests([this._env.testPath]);
150
+ /** @returns { 'failed' | 'passed' | 'running'} */
151
+ _getTestStatus(test) {
152
+ if (!_.isEmpty(test.errors)) {
153
+ return 'failed';
107
154
  }
108
- }
109
155
 
110
- _hasFailedTests(block) {
111
- if (block.children) {
112
- for (const child of block.children) {
113
- if (this._hasFailedTests(child)) {
114
- return true;
115
- }
116
- }
156
+ if (test.status === 'done') {
157
+ return 'passed';
158
+ } else {
159
+ return test.status || 'running';
117
160
  }
161
+ }
118
162
 
119
- return block.errors ? block.errors.length > 0 : false;
163
+ _getTestInvocations(test) {
164
+ const { testSessionIndex } = detoxInternals.session;
165
+ return testSessionIndex * this._circusRetryTimes + test.invocations;
120
166
  }
121
167
  }
122
168
 
@@ -5,7 +5,7 @@ const { device } = require('../../../..');
5
5
  const PLATFORM_REGEXP = /^:([^:]+):/;
6
6
 
7
7
  class DetoxPlatformFilterListener {
8
- constructor() {
8
+ setup() {
9
9
  this._platform = device.getPlatform();
10
10
  }
11
11
 
@@ -1,4 +1,5 @@
1
- const chalk = require('chalk').default;
1
+ const chalk = require('chalk');
2
+ const noop = require('lodash/noop');
2
3
 
3
4
  const { config, log, session } = require('../../../../internals');
4
5
  const { traceln } = require('../utils/stdout');
@@ -15,16 +16,21 @@ class SpecReporter {
15
16
  this._suitesDesc = '';
16
17
  }
17
18
 
18
- get enabled() {
19
- const jestSection = config.runnerConfig.jest;
19
+ setup() {
20
+ const jestSection = config.testRunner.jest;
20
21
  const reportSpecs = jestSection && jestSection.reportSpecs;
21
-
22
- return reportSpecs !== undefined ? reportSpecs : session.workersCount === 1;
22
+ const enabled = reportSpecs !== undefined ? reportSpecs : session.workersCount === 1;
23
+
24
+ if (!enabled) {
25
+ this.run_describe_start = noop;
26
+ this.run_describe_finish = noop;
27
+ this.test_start = noop;
28
+ this.test_done = noop;
29
+ this.test_skip = noop;
30
+ }
23
31
  }
24
32
 
25
33
  run_describe_start(event) {
26
- if (!this.enabled) return;
27
-
28
34
  if (event.describeBlock.parent !== undefined) {
29
35
  this._onSuiteStart({
30
36
  description: event.describeBlock.name,
@@ -33,16 +39,12 @@ class SpecReporter {
33
39
  }
34
40
 
35
41
  run_describe_finish(event) {
36
- if (!this.enabled) return;
37
-
38
42
  if (event.describeBlock.parent !== undefined) {
39
43
  this._onSuiteEnd();
40
44
  }
41
45
  }
42
46
 
43
47
  test_start(event) {
44
- if (!this.enabled) return;
45
-
46
48
  const { test } = event;
47
49
  this._onTestStart({
48
50
  description: test.name,
@@ -51,8 +53,6 @@ class SpecReporter {
51
53
  }
52
54
 
53
55
  test_done(event) {
54
- if (!this.enabled) return;
55
-
56
56
  const { test } = event;
57
57
  const testInfo = {
58
58
  description: test.name,
@@ -62,8 +62,6 @@ class SpecReporter {
62
62
  }
63
63
 
64
64
  test_skip(event) {
65
- if (!this.enabled) return;
66
-
67
65
  const testInfo = {
68
66
  description: event.test.name,
69
67
  };
@@ -110,7 +108,7 @@ class SpecReporter {
110
108
  .concat(suite.description)
111
109
  .concat((index === total - 1) ? ': ' : '');
112
110
  });
113
- this._suitesDesc = chalk.bold.white(this._suitesDesc);
111
+ this._suitesDesc = chalk.bold(this._suitesDesc);
114
112
  }
115
113
 
116
114
  _traceTest({ description, invocations }, _status = undefined) {
@@ -118,7 +116,7 @@ class SpecReporter {
118
116
  const retriesDescription = (invocations > 1) ? chalk.gray(` [Retry #${invocations - 1}]`) : '';
119
117
  const status = chalk.gray(_status ? ` [${_status}]` : '');
120
118
  const desc = this._suitesDesc + testDescription + retriesDescription + status;
121
- log.info({ event: 'SPEC_STATE_CHANGE' }, desc);
119
+ log.info({ cat: 'lifecycle' }, desc);
122
120
  }
123
121
  }
124
122
 
@@ -1,6 +1,6 @@
1
1
  const path = require('path');
2
2
 
3
- const chalk = require('chalk').default;
3
+ const chalk = require('chalk');
4
4
  const _ = require('lodash');
5
5
 
6
6
  const { device } = require('../../../..');
@@ -12,8 +12,8 @@ class WorkerAssignReporter {
12
12
  }
13
13
 
14
14
  run_start() {
15
- if (config.runnerConfig.jest.reportWorkerAssign) {
16
- log.info({ event: 'WORKER_ASSIGN' }, `${this._formatTestName()} is assigned to ${this._formatDeviceName()}`);
15
+ if (config.testRunner.jest.reportWorkerAssign) {
16
+ log.info({ cat: 'lifecycle' }, `${chalk.bold(this._testName)} is assigned to ${this._formatDeviceName()}`);
17
17
  }
18
18
  }
19
19
 
@@ -25,10 +25,6 @@ class WorkerAssignReporter {
25
25
 
26
26
  return formattedDeviceName;
27
27
  }
28
-
29
- _formatTestName() {
30
- return chalk.whiteBright(this._testName);
31
- }
32
28
  }
33
29
 
34
30
  module.exports = WorkerAssignReporter;
@@ -1,8 +1,10 @@
1
1
  const fs = require('fs');
2
2
  const path = require('path');
3
3
 
4
+ const resolveFrom = require('resolve-from');
4
5
  const semver = require('semver');
5
6
 
7
+ const { log } = require('../../../../internals');
6
8
  const detoxPackageJson = require('../../../../package.json');
7
9
  const { DetoxRuntimeError } = require('../../../../src/errors');
8
10
 
@@ -25,6 +27,10 @@ function assertJestCircus27(maybeProjectConfig) {
25
27
  });
26
28
  }
27
29
 
30
+ const jestManifestPath = resolveFrom(process.cwd(), 'jest/package.json');
31
+ const jestManifest = require(jestManifestPath);
32
+ assertSupportedVersion(jestManifest.version);
33
+
28
34
  const circusVersion = require(circusPackageJson).version;
29
35
  if (!circusVersion) {
30
36
  throw new DetoxRuntimeError({
@@ -33,7 +39,14 @@ function assertJestCircus27(maybeProjectConfig) {
33
39
  });
34
40
  }
35
41
 
36
- assertSupportedVersion(circusVersion);
42
+ if (jestManifest.version !== circusVersion) {
43
+ log.warn([
44
+ `jest-circus@${circusVersion} does not match jest@${jestManifest.version}.\n`,
45
+ `- jest@${jestManifest.version} resolved path:\n\t${jestManifestPath}`,
46
+ `- jest-circus@${circusVersion} resolved path:\n\t${circusPackageJson}`,
47
+ `\nPlease make sure that your versions match to avoid unexpected behavior!`,
48
+ ].join('\n'));
49
+ }
37
50
 
38
51
  return maybeProjectConfig;
39
52
  }
@@ -41,11 +54,12 @@ function assertJestCircus27(maybeProjectConfig) {
41
54
  function assertSupportedVersion(actualVersion) {
42
55
  const supportedRange = detoxPackageJson.peerDependencies.jest;
43
56
  const minSupportedVersion = semver.minVersion(supportedRange);
57
+ const action = semver.lt(actualVersion, minSupportedVersion) ? 'upgrade' : 'downgrade';
44
58
 
45
- if (semver.lt(actualVersion, minSupportedVersion)) {
59
+ if (!semver.satisfies(actualVersion, supportedRange, { includePrerelease: true })) {
46
60
  throw new DetoxRuntimeError({
47
61
  message: `Detected an unsupported jest@${actualVersion} version.`,
48
- hint: `Please upgrade your Jest test runner to the supported range: ${supportedRange}.`
62
+ hint: `Please ${action} your Jest test runner to the supported range: ${supportedRange}.`
49
63
  });
50
64
  }
51
65
  }
@@ -1,62 +1,28 @@
1
1
  #!/bin/bash -e
2
2
 
3
- # Ensure Xcode is installed or print a warning message and return.
4
- xcodebuild -version &>/dev/null || { echo "WARNING: Xcode is not installed on this machine. Skipping iOS framework build phase"; exit 0; }
5
-
6
- detoxRootPath="$(dirname "$(dirname "$0")")"
7
- detoxVersion=`node -p "require('${detoxRootPath}/package.json').version"`
8
-
9
- sha1=`(echo "${detoxVersion}" && xcodebuild -version) | shasum | awk '{print $1}' #"${2}"`
10
- detoxFrameworkDirPath="$HOME/Library/Detox/ios/${sha1}"
11
- detoxFrameworkPath="${detoxFrameworkDirPath}/Detox.framework"
12
-
13
-
14
- function prepareAndBuildFramework () {
15
- if [ -d "$detoxRootPath"/ios ]; then
16
- detoxSourcePath="${detoxRootPath}"/ios
17
- echo "Dev mode, building from ${detoxSourcePath}"
18
- buildFramework "${detoxSourcePath}"
19
- else
20
- extractFramework
21
- fi
22
- }
23
-
24
- function extractFramework () {
25
- echo "Extracting Detox framework..."
26
- mkdir -p "${detoxFrameworkDirPath}"
27
- tar -xjf "${detoxRootPath}"/Detox-ios.tbz -C "${detoxFrameworkDirPath}"
28
- }
29
-
30
- function buildFramework () {
31
- detoxSourcePath="${1}"
32
- echo "Building Detox.framework from ${detoxSourcePath} into ${detoxFrameworkDirPath}"
33
- mkdir -p "${detoxFrameworkDirPath}"
34
- logPath="${detoxFrameworkDirPath}"/detox_ios.log
35
- echo "Build log: ${logPath}"
36
- echo -n "" > "${logPath}"
37
- "${detoxRootPath}"/scripts/build_universal_framework.sh "${detoxSourcePath}"/Detox.xcodeproj "${detoxFrameworkDirPath}" &> "${logPath}" || {
38
- echo -e "#################################\nError building Detox.framework:\n----------------------------------\n"
39
- cat "${logPath}"
40
- echo "#################################"
41
- exit 1
42
- }
43
- }
44
-
45
- function main () {
46
- if [ -d "${detoxFrameworkDirPath}" ]; then
47
- if [ ! -d "${detoxFrameworkPath}" ]; then
48
- echo "${detoxFrameworkDirPath} was found, but could not find Detox.framework inside it. This means that the Detox framework build process was interrupted.
49
- deleting ${detoxFrameworkDirPath} and trying to rebuild."
50
- rm -rf "${detoxFrameworkDirPath}"
51
- prepareAndBuildFramework
52
- else
53
- echo "Detox.framework exists, skipping..."
54
- fi
55
- else
56
- prepareAndBuildFramework
57
- fi
58
-
59
- echo "Done"
60
- }
61
-
62
- main
3
+ PROJECT=$1
4
+ FRAMEWORK_OUTPUT_DIR=$2
5
+ CONFIGURATION=Release
6
+ PROJECT_NAME=Detox
7
+
8
+ # Make sure the output directory exists
9
+
10
+ rm -fr "${FRAMEWORK_OUTPUT_DIR}"
11
+ mkdir -p "${FRAMEWORK_OUTPUT_DIR}"
12
+
13
+ # Step 0. Xcode version
14
+
15
+ USE_NEW_BUILD_SYSTEM="YES"
16
+ echo "Using -UseNewBuildSystem=${USE_NEW_BUILD_SYSTEM}"
17
+
18
+ # Step 1. Build Device and Simulator versions
19
+
20
+ BUILD_SIM=`xcodebuild -project "${PROJECT}" -scheme "Detox" -UseNewBuildSystem=${USE_NEW_BUILD_SYSTEM} -configuration "${CONFIGURATION}" -sdk iphonesimulator -destination "generic/platform=iOS Simulator" build -showBuildSettings | awk -F= '/TARGET_BUILD_DIR/{x=$NF; gsub(/^[ \t]+|[ \t]+$/,"",x); print x}'`
21
+
22
+ echo ${BUILD_SIM}
23
+
24
+ xcodebuild -project "${PROJECT}" -scheme "Detox" -UseNewBuildSystem=${USE_NEW_BUILD_SYSTEM} -configuration "${CONFIGURATION}" -sdk iphonesimulator -destination "generic/platform=iOS Simulator" build -quiet
25
+
26
+ # Step 2. Copy the framework to output folder
27
+
28
+ cp -fR "${BUILD_SIM}/${PROJECT_NAME}.framework" "${FRAMEWORK_OUTPUT_DIR}"/
@@ -0,0 +1,62 @@
1
+ #!/bin/bash -e
2
+
3
+ # Ensure Xcode is installed or print a warning message and return.
4
+ xcodebuild -version &>/dev/null || { echo "WARNING: Xcode is not installed on this machine. Skipping iOS framework build phase"; exit 0; }
5
+
6
+ detoxRootPath="$(dirname "$(dirname "$0")")"
7
+ detoxVersion=`node -p "require('${detoxRootPath}/package.json').version"`
8
+
9
+ sha1=`(echo "${detoxVersion}" && xcodebuild -version) | shasum | awk '{print $1}' #"${2}"`
10
+ detoxFrameworkDirPath="$HOME/Library/Detox/ios/framework/${sha1}"
11
+ detoxFrameworkPath="${detoxFrameworkDirPath}/Detox.framework"
12
+
13
+
14
+ function prepareAndBuildFramework () {
15
+ if [ -d "$detoxRootPath"/ios ]; then
16
+ detoxSourcePath="${detoxRootPath}"/ios
17
+ echo "Dev mode, building from ${detoxSourcePath}"
18
+ buildFramework "${detoxSourcePath}"
19
+ else
20
+ extractFramework
21
+ fi
22
+ }
23
+
24
+ function extractFramework () {
25
+ echo "Extracting Detox framework..."
26
+ mkdir -p "${detoxFrameworkDirPath}"
27
+ tar -xjf "${detoxRootPath}"/Detox-ios-framework.tbz -C "${detoxFrameworkDirPath}"
28
+ }
29
+
30
+ function buildFramework () {
31
+ detoxSourcePath="${1}"
32
+ echo "Building Detox.framework from ${detoxSourcePath} into ${detoxFrameworkDirPath}"
33
+ mkdir -p "${detoxFrameworkDirPath}"
34
+ logPath="${detoxFrameworkDirPath}"/detox_ios.log
35
+ echo "Build log: ${logPath}"
36
+ echo -n "" > "${logPath}"
37
+ "${detoxRootPath}"/scripts/build_framework.ios.sh "${detoxSourcePath}"/Detox.xcodeproj "${detoxFrameworkDirPath}" &> "${logPath}" || {
38
+ echo -e "#################################\nError building Detox.framework:\n----------------------------------\n"
39
+ cat "${logPath}"
40
+ echo "#################################"
41
+ exit 1
42
+ }
43
+ }
44
+
45
+ function main () {
46
+ if [ -d "${detoxFrameworkDirPath}" ]; then
47
+ if [ ! -d "${detoxFrameworkPath}" ]; then
48
+ echo "${detoxFrameworkDirPath} was found, but could not find Detox.framework inside it. This means that the Detox framework build process was interrupted.
49
+ deleting ${detoxFrameworkDirPath} and trying to rebuild."
50
+ rm -rf "${detoxFrameworkDirPath}"
51
+ prepareAndBuildFramework
52
+ else
53
+ echo "Detox.framework exists, skipping..."
54
+ fi
55
+ else
56
+ prepareAndBuildFramework
57
+ fi
58
+
59
+ echo "Done"
60
+ }
61
+
62
+ main
@@ -0,0 +1,53 @@
1
+ #!/bin/bash -e
2
+
3
+ # Ensure Xcode is installed or print a warning message and return.
4
+ xcodebuild -version &>/dev/null || { echo "WARNING: Xcode is not installed on this machine. Skipping iOS xctest runner build phase"; exit 0; }
5
+
6
+ detoxRootPath="$(dirname "$(dirname "$0")")"
7
+ detoxVersion=`node -p "require('${detoxRootPath}/package.json').version"`
8
+
9
+ sha1=`(echo "${detoxVersion}" && xcodebuild -version) | shasum | awk '{print $1}' #"${2}"`
10
+ detoxXctestRunnerDirPath="$HOME/Library/Detox/ios/xcuitest-runner/${sha1}"
11
+
12
+ function prepareAndBuildXctestRunner () {
13
+ if [ -d "$detoxRootPath"/ios ]; then
14
+ detoxSourcePath="${detoxRootPath}"/ios
15
+ echo "Dev mode, building XCUITest runner from ${detoxSourcePath}"
16
+ buildXctestRunner "${detoxSourcePath}"
17
+ else
18
+ extractXctestRunner
19
+ fi
20
+ }
21
+
22
+ function extractXctestRunner () {
23
+ echo "Extracting Detox XCUITest runner..."
24
+ mkdir -p "${detoxXctestRunnerDirPath}"
25
+ tar -xjf "${detoxRootPath}"/Detox-ios-xcuitest.tbz -C "${detoxXctestRunnerDirPath}"
26
+ }
27
+
28
+ function buildXctestRunner () {
29
+ detoxSourcePath="${1}"
30
+ echo "Building XCUITest runner from ${detoxSourcePath} into ${detoxXctestRunnerDirPath}"
31
+ mkdir -p "${detoxXctestRunnerDirPath}"
32
+ logPath="${detoxXctestRunnerDirPath}"/detox_ios_xcuitest.log
33
+ echo "Build log: ${logPath}"
34
+ echo -n "" > "${logPath}"
35
+ "${detoxRootPath}"/scripts/build_xcuitest.ios.sh "${detoxSourcePath}"/DetoxTester.xcworkspace "${detoxXctestRunnerDirPath}" &> "${logPath}" || {
36
+ echo -e "#################################\nError building DetoxTester.xctestrun:\n----------------------------------\n"
37
+ cat "${logPath}"
38
+ echo "#################################"
39
+ exit 1
40
+ }
41
+ }
42
+
43
+ function main () {
44
+ if [ ! -d "${detoxXctestRunnerDirPath}" ]; then
45
+ prepareAndBuildXctestRunner
46
+ else
47
+ echo "XCUITest-runner exists, skipping..."
48
+ fi
49
+
50
+ echo "Done"
51
+ }
52
+
53
+ main
@@ -0,0 +1,23 @@
1
+ #!/bin/bash -e
2
+
3
+ WORKSPACE=$1
4
+ XCUITEST_OUTPUT_DIR=$2
5
+ CONFIGURATION=Release
6
+ PROJECT_NAME=DetoxTester
7
+
8
+ # Clean up the output directory
9
+
10
+ rm -fr "${XCUITEST_OUTPUT_DIR}"
11
+
12
+ # Make sure the output directory exists
13
+
14
+ mkdir -p "${XCUITEST_OUTPUT_DIR}"
15
+
16
+ # Xcode version
17
+
18
+ USE_NEW_BUILD_SYSTEM="YES"
19
+ echo "Using -UseNewBuildSystem=${USE_NEW_BUILD_SYSTEM}"
20
+
21
+ # Build Simulator version
22
+
23
+ xcodebuild -workspace "${WORKSPACE}" -scheme "${PROJECT_NAME}" -UseNewBuildSystem=${USE_NEW_BUILD_SYSTEM} -configuration "${CONFIGURATION}" -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -derivedDataPath "${XCUITEST_OUTPUT_DIR}" -allowProvisioningUpdates build-for-testing -quiet
@@ -1,23 +1,32 @@
1
1
  #!/bin/bash -e
2
2
 
3
3
  rm -rf Detox-ios-src.tbz
4
- rm -rf Detox-ios.tbz
4
+ rm -rf Detox-ios-framework.tbz
5
+ rm -rf Detox-ios-xcuitest.tbz
5
6
  rm -rf build_temp
6
7
 
7
8
  find ./ios -name Build -type d -exec rm -rf {} \;
8
9
 
9
- #Package sources
10
+ # Package sources
10
11
  pushd . &> /dev/null
11
12
  cd ios
12
13
  tar --exclude-from=.tbzignore -cjf ../Detox-ios-src.tbz .
13
14
  popd &> /dev/null
14
15
 
15
- #Package prebuilt framework
16
+ # Package prebuilt framework
16
17
  mkdir build_temp
17
- scripts/build_universal_framework.sh "ios/Detox.xcodeproj" "build_temp" &> build_temp/detox_ios.log
18
+ scripts/build_framework.ios.sh "ios/Detox.xcodeproj" "build_temp" &> build_temp/detox_ios.log
18
19
  pushd . &> /dev/null
19
20
  cd build_temp
20
- tar --exclude-from=../ios/.tbzignore -cjf ../Detox-ios.tbz .
21
+ tar --exclude-from=../ios/.tbzignore -cjf ../Detox-ios-framework.tbz .
21
22
  popd &> /dev/null
22
23
 
24
+ # Package prebuilt xcuitest runner
25
+ scripts/build_xcuitest.ios.sh "ios/DetoxTester.xcworkspace" "build_temp" &> build_temp/detox_ios_xcuitest.log
26
+ pushd . &> /dev/null
27
+ cd build_temp
28
+ tar --exclude-from=../ios/.tbzignore -cjf ../Detox-ios-xcuitest.tbz .
29
+ popd &> /dev/null
30
+
31
+ # Cleanup
23
32
  rm -fr build_temp
@@ -1,5 +1,11 @@
1
- if (process.platform === 'darwin' && !process.env.DETOX_DISABLE_POSTINSTALL) {
2
- require('child_process').execFileSync(`${__dirname}/build_framework.ios.sh`, {
3
- stdio: 'inherit'
4
- });
1
+ const { platform, env } = process;
2
+
3
+ const isDarwin = platform === 'darwin';
4
+ const shouldInstallDetox = !env.DETOX_DISABLE_POSTINSTALL;
5
+
6
+ if (isDarwin && shouldInstallDetox) {
7
+ const execFileSync = require('child_process').execFileSync;
8
+
9
+ execFileSync(`${__dirname}/build_local_framework.ios.sh`, { stdio: 'inherit' });
10
+ execFileSync(`${__dirname}/build_local_xcuitest.ios.sh`, { stdio: 'inherit' });
5
11
  }