Merge branch 'develop' into feature/ios-device-provider

MarathonLabs · Oct 17, 2024 · 2074a45 · 2074a45
2 parents 4ec5ebd + 56693c9
commit 2074a45
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/xctestrun/v2/TestTarget.kt b/...vendor-apple/base/src/main/kotlin/com/malinskiy/marathon/apple/xctestrun/v2/TestTarget.kt
@@ -279,5 +279,5 @@ class TestTarget : TestTarget {
      * Added in xcode 15, possible values are [screenshots, screenRecording]. Defaults to screenRecording
      * Ignored by previous versions of xcode
      */
-    var preferredScreenCaptureFormat: String? by delegate.optionalDelegateFor("preferredScreenCaptureFormat")
+    var preferredScreenCaptureFormat: String? by delegate.optionalDelegateFor("PreferredScreenCaptureFormat")
 }
diff --git a/...vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleSimulatorDevice.kt b/...vendor-apple/ios/src/main/kotlin/com/malinskiy/marathon/apple/ios/AppleSimulatorDevice.kt
@@ -190,7 +190,8 @@ class AppleSimulatorDevice(
 
             deviceFeatures = detectFeatures()
 
-            supportsTranscoding = executeWorkerCommand(listOf(vendorConfiguration.screenRecordConfiguration.videoConfiguration.transcoding.binary, "-version"))?.let {
+            val transcodingVideoConfiguration = vendorConfiguration.screenRecordConfiguration.videoConfiguration.transcoding
+            supportsTranscoding = transcodingVideoConfiguration.enabled && executeWorkerCommand(listOf(transcodingVideoConfiguration.binary, "-version"))?.let {
                 if (it.successful) {
                     true
                 } else {