Merge pull request #4014 from wmathurin/fix/ios18-advanced-auth-ui-tests

Fix iOS 18 advanced auth UI tests and add iOS 18 to CI

Author: wmathurin

.github/workflows/pr.yaml

@@ -138,9 +138,20 @@ jobs:
 
   ui-tests-pr:
     needs: [test-orchestrator]
+    strategy:
+      fail-fast: false
+      matrix:
+        ios: [^26, ^18]
+        include:
+          - ios: ^26
+            xcode: ^26
+          - ios: ^18
+            xcode: ^16
     uses: ./.github/workflows/reusable-ui-test-workflow.yaml
     with:
       is_pr: true
+      ios: ${{ matrix.ios }}
+      xcode: ${{ matrix.xcode }}
       pr_test: "AuthFlowTesterUITests/LegacyLoginTests/testCAOpaque_DefaultScopes_WebServerFlow"
       short_timeout: "2"
       long_timeout: "7"

.github/workflows/ui-test-nightly.yaml

@@ -7,10 +7,19 @@ on:
 
 jobs:
   ios-ui-test-nightly:
+    strategy:
+      fail-fast: false
+      matrix:
+        ios: [^26, ^18]
+        include:
+          - ios: ^26
+            xcode: ^26
+          - ios: ^18
+            xcode: ^16
     uses: ./.github/workflows/reusable-ui-test-workflow.yaml
     with:
-      ios: "^26"
-      xcode: "^26"
+      ios: ${{ matrix.ios }}
+      xcode: ${{ matrix.xcode }}
       short_timeout: "2"
       long_timeout: "7"
     secrets: inherit

native/SampleApps/AuthFlowTester/AuthFlowTesterUITests/PageObjects/LoginPageObject.swift

@@ -221,7 +221,13 @@ class LoginPageObject {
     }
 
     private func advancedAuthCloseButton() -> XCUIElement {
-        return app.otherElements["TopBrowserBar"].buttons["Close"]
+        let topBar = app.otherElements["TopBrowserBar"]
+        let closeButton = topBar.buttons["Close"]
+        if closeButton.exists {
+            return closeButton
+        }
+        // Earlier iOS versions use "Cancel"
+        return topBar.buttons["Cancel"]
     }
 
     // MARK: - Actions