more fixes

Author: mykola-mokhnach

.github/workflows/functional-test.yml

@@ -50,23 +50,16 @@ jobs:
         model: ${{ env.IPHONE_MODEL }}
         os_version: ${{ env.IOS_VERSION }}
 
-    # needed?
-    - run: brew install ffmpeg
-
     # Start Appium
     - run: npm install -g appium
     - run: |
         appium driver install xcuitest
-        appium driver run xcuitest build-wda --sdk=${{ env.IOS_VERSION }} --name='${{ env.IPHONE_MODEL }}'
-        appium plugin install images
-        appium plugin install execute-driver
         nohup appium --use-plugins=images,execute-driver --relaxed-security --log-timestamp --log-no-colors > appium.log &
 
-    - run: |
-        appium driver run xcuitest download-wda-sim  --platform=ios --outdir=${{ github.workspace }}/wda
+    - run: appium driver run xcuitest download-wda-sim  --platform=ios --outdir=${{ github.workspace }}/wda
       name: Downloading prebuilt WDA
 
-    - name: Set up Python 3.12
+    - name: Set up Python
       uses: actions/setup-python@v5
       with:
         python-version: 3.12

appium/options/ios/xcuitest/base.py

@@ -72,6 +72,7 @@
 from .wda.keychain_path_option import KeychainPathOption
 from .wda.max_typing_frequency_option import MaxTypingFrequencyOption
 from .wda.mjpeg_server_port_option import MjpegServerPortOption
+from .wda.prebuilt_wda_path_option import PrebuiltWdaPathOption
 from .wda.process_arguments_option import ProcessArgumentsOption
 from .wda.result_bundle_path_option import ResultBundlePathOption
 from .wda.screenshot_quality_option import ScreenshotQualityOption
@@ -83,6 +84,7 @@
 from .wda.use_native_caching_strategy_option import UseNativeCachingStrategyOption
 from .wda.use_new_wda_option import UseNewWdaOption
 from .wda.use_prebuilt_wda_option import UsePrebuiltWdaOption
+from .wda.use_preinstalled_wda_option import UsePreinstalledWdaOption
 from .wda.use_simple_build_test_option import UseSimpleBuildTestOption
 from .wda.use_xctestrun_file_option import UseXctestrunFileOption
 from .wda.wait_for_idle_timeout_option import WaitForIdleTimeoutOption
@@ -171,6 +173,7 @@ class XCUITestOptions(
     KeychainPathOption,
     MaxTypingFrequencyOption,
     MjpegServerPortOption,
+    PrebuiltWdaPathOption,
     ProcessArgumentsOption,
     ResultBundlePathOption,
     ScreenshotQualityOption,
@@ -182,6 +185,7 @@ class XCUITestOptions(
     UseNativeCachingStrategyOption,
     UseNewWdaOption,
     UsePrebuiltWdaOption,
+    UsePreinstalledWdaOption,
     UseSimpleBuildTestOption,
     UseXctestrunFileOption,
     WaitForIdleTimeoutOption,

appium/options/ios/xcuitest/wda/prebuilt_wda_path_option.py

@@ -0,0 +1,39 @@
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied.  See the License for the specific
+# language governing permissions and limitations
+# under the License.
+
+from typing import Optional
+
+from appium.options.common.supports_capabilities import SupportsCapabilities
+
+PREBUILT_WDA_PATH = 'prebuiltWDAPath'
+
+
+class PrebuiltWdaPathOption(SupportsCapabilities):
+    @property
+    def prebuilt_wda_path(self) -> Optional[str]:
+        """
+        The path to the prebuilt WebDriverAgent.
+        """
+        return self.get_capability(PREBUILT_WDA_PATH)
+
+    @prebuilt_wda_path.setter
+    def prebuilt_wda_path(self, value: str) -> None:
+        """
+        The path to the prebuilt WebDriverAgent. This should be the path to the
+        WebDriverAgent.xcarchive file or the WebDriverAgent.app bundle.
+        """
+        self.set_capability(PREBUILT_WDA_PATH, value)

appium/options/ios/xcuitest/wda/use_preinstalled_wda_option.py

@@ -0,0 +1,40 @@
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied.  See the License for the specific
+# language governing permissions and limitations
+# under the License.
+
+from typing import Optional
+
+from appium.options.common.supports_capabilities import SupportsCapabilities
+
+USE_PREINSTALLED_WDA = 'usePreinstalledWDA'
+
+
+class UsePreinstalledWdaOption(SupportsCapabilities):
+    @property
+    def use_preinstalled_wda(self) -> Optional[bool]:
+        """
+        Whether to use a preinstalled WebDriverAgent.
+        """
+        return self.get_capability(USE_PREINSTALLED_WDA)
+
+    @use_preinstalled_wda.setter
+    def use_preinstalled_wda(self, value: bool) -> None:
+        """
+        Whether to use a preinstalled WebDriverAgent. If true, Appium will not
+        build and install the WebDriverAgent, but will use an existing one.
+        Defaults to false.
+        """
+        self.set_capability(USE_PREINSTALLED_WDA, value)