ci: Bump iOS version

.github/workflows/gradle.yml

@@ -22,9 +22,10 @@ env:
   ANDROID_SDK_VERSION: "28"
   ANDROID_EMU_NAME: test
   ANDROID_EMU_TARGET: default
-  XCODE_VERSION: "14.2"
-  IOS_DEVICE_NAME: iPhone 12
-  IOS_PLATFORM_VERSION: "16.2"
+  # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
+  XCODE_VERSION: "15.4"
+  IOS_DEVICE_NAME: iPhone 15
+  IOS_PLATFORM_VERSION: "17.5"
 
 jobs:
   build:
@@ -34,7 +35,7 @@ jobs:
         include:
           - java: 11
             # Need to use specific (not `-latest`) version of macOS to be sure the required version of Xcode/simulator is available
-            platform: macos-12
+            platform: macos-14
             e2e-tests: ios
           - java: 17
             platform: ubuntu-latest
@@ -100,19 +101,18 @@ jobs:
       uses: maxim-lobanov/setup-xcode@v1
       with:
         xcode-version: "${{ env.XCODE_VERSION }}"
+    - name: Prepare iOS simulator
+      if: matrix.e2e-tests == 'ios'
+      uses: futureware-tech/simulator-action@v3
+      with:
+        model: "${{ env.IOS_DEVICE_NAME }}"
+        os_version: "${{ env.IOS_PLATFORM_VERSION }}"
     - name: Install XCUITest driver
       if: matrix.e2e-tests == 'ios'
       run: appium driver install xcuitest
     - name: Prebuild XCUITest driver
       if: matrix.e2e-tests == 'ios'
       run: appium driver run xcuitest build-wda
-    - name: Prepare iOS simulator
-      if: matrix.e2e-tests == 'ios'
-      run: |
-        xcrun simctl list
-        target_sim_id=$(xcrun simctl list devices available | grep "$IOS_DEVICE_NAME (" | cut -d "(" -f2 | cut -d ")" -f1)
-        open -Fn "/Applications/Xcode_$XCODE_VERSION.app/Contents/Developer/Applications/Simulator.app"
-        xcrun simctl bootstatus $target_sim_id -b
     - name: Run iOS E2E tests
       if: matrix.e2e-tests == 'ios'
       run: ./gradlew e2eIosTest -PisCI -Pselenium.version=$latest_snapshot

.github/workflows/pr-title.yml

@@ -10,6 +10,6 @@ jobs:
     steps:
     - uses: beemojs/conventional-pr-action@v2
       with:
-          config-preset: angular
+        config-preset: angular
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -242,6 +242,7 @@ testing {
                     filter {
                         exclude '**/IOSScreenRecordTest.class'
                         exclude '**/ImagesComparisonTest.class'
+                        exclude '**/IOSNativeWebTapSettingTest.class'
                     }
                 }
             }

src/e2eIosTest/java/io/appium/java_client/ios/BaseIOSWebViewTest.java

@@ -27,17 +27,19 @@
 public class BaseIOSWebViewTest extends BaseIOSTest {
     private static final String VODQA_ZIP = TestUtils.resourcePathToAbsolutePath("vodqa.zip").toString();
 
-    private static final Duration WEB_VIEW_DETECT_INTERVAL = Duration.ofSeconds(1);
-    private static final Duration WEB_VIEW_DETECT_DURATION = Duration.ofSeconds(15);
+    private static final Duration WEB_VIEW_DETECT_INTERVAL = Duration.ofSeconds(2);
+    private static final Duration WEB_VIEW_DETECT_DURATION = Duration.ofSeconds(30);
 
     @BeforeAll
     public static void beforeClass() {
         startAppiumServer();
 
         XCUITestOptions options = new XCUITestOptions()
+                .setPlatformVersion(PLATFORM_VERSION)
                 .setDeviceName(DEVICE_NAME)
                 .setWdaLaunchTimeout(WDA_LAUNCH_TIMEOUT)
                 .setCommandTimeouts(Duration.ofSeconds(240))
+                .setShowIosLog(true)
                 .setApp(VODQA_ZIP);
         Supplier<IOSDriver> createDriver = () -> new IOSDriver(service.getUrl(), options);
         try {

src/e2eIosTest/java/io/appium/java_client/ios/BaseSafariTest.java

@@ -20,13 +20,12 @@
 import io.appium.java_client.remote.MobileBrowserType;
 import org.junit.jupiter.api.BeforeAll;
 
-import java.io.IOException;
 import java.time.Duration;
 
 public class BaseSafariTest extends BaseIOSTest {
     private static final Duration WEBVIEW_CONNECT_TIMEOUT = Duration.ofSeconds(30);
 
-    @BeforeAll public static void beforeClass() throws IOException {
+    @BeforeAll public static void beforeClass() {
         startAppiumServer();
 
         XCUITestOptions options = new XCUITestOptions()

src/e2eIosTest/java/io/appium/java_client/ios/IOSNativeWebTapSettingTest.java

@@ -1,6 +1,5 @@
 package io.appium.java_client.ios;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
@@ -14,7 +13,6 @@
 public class IOSNativeWebTapSettingTest extends BaseSafariTest {
 
     @Test
-    @Disabled("https://github.com/appium/appium/issues/17014")
     public void nativeWebTapSettingTest() {
         assertTrue(driver.isBrowser());
         driver.get("https://saucelabs.com/test/guinea-pig");