Merge branch 'appium:master' into main

SonicCloudOrg · Jan 3, 2025 · c18191e · c18191e
2 parents 4a2d0fb + 9734b83
commit c18191e
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 11 deletions.
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
@@ -1,6 +1,6 @@
 # https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml
 variables:
-  MIN_VM_IMAGE: macOS-14
+  MIN_VM_IMAGE: macOS-13
   MIN_XCODE_VERSION: 14.3.1
   MIN_PLATFORM_VERSION: 16.4
   MIN_TV_PLATFORM_VERSION: 16.4

diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml
@@ -13,8 +13,8 @@ jobs:
       matrix:
         test_targets:
           - HOST_OS: 'macos-15'
-            XCODE_VERSION: '16.0.0'
-            IOS_VERSION: '18.0'
+            XCODE_VERSION: '16.1.0'
+            IOS_VERSION: '18.1'
             IOS_MODEL: iPhone 16 Plus
           - HOST_OS: 'macos-14'
             XCODE_VERSION: '15.3'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## [8.12.0](https://github.com/appium/WebDriverAgent/compare/v8.11.3...v8.12.0) (2024-12-13)
+
+### Features
+
+* look for critical notification in respectSystemAlerts ([#962](https://github.com/appium/WebDriverAgent/issues/962)) ([916c8c5](https://github.com/appium/WebDriverAgent/commit/916c8c557a9366608df211f33b5b7fbb0354dad3))
+
+## [8.11.3](https://github.com/appium/WebDriverAgent/compare/v8.11.2...v8.11.3) (2024-12-06)
+
+### Miscellaneous Chores
+
+* **deps:** bump @appium/support from 5.1.8 to 6.0.0 ([#960](https://github.com/appium/WebDriverAgent/issues/960)) ([dbeb09c](https://github.com/appium/WebDriverAgent/commit/dbeb09c89f8c02e00a7bdffe7899650d435f3575))
+
+## [8.11.2](https://github.com/appium/WebDriverAgent/compare/v8.11.1...v8.11.2) (2024-12-03)
+
+### Miscellaneous Chores
+
+* **deps-dev:** bump mocha from 10.8.2 to 11.0.1 ([#959](https://github.com/appium/WebDriverAgent/issues/959)) ([55b49c8](https://github.com/appium/WebDriverAgent/commit/55b49c83581c9e88f70806d98015238de3104f19))
+
 ## [8.11.1](https://github.com/appium/WebDriverAgent/compare/v8.11.0...v8.11.1) (2024-11-11)
 
 ### Miscellaneous Chores

diff --git a/WebDriverAgentLib/Info.plist b/WebDriverAgentLib/Info.plist
@@ -15,11 +15,11 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>8.11.1</string>
+    <string>8.12.0</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>8.11.1</string>
+    <string>8.12.0</string>
     <key>NSPrincipalClass</key>
     <string/>
   </dict>

diff --git a/WebDriverAgentLib/Routing/FBSession.m b/WebDriverAgentLib/Routing/FBSession.m
@@ -178,10 +178,13 @@ - (XCUIApplication *)activeApplication
   if (nil != self.testedApplication) {
     XCUIApplicationState testedAppState = self.testedApplication.state;
     if (testedAppState >= XCUIApplicationStateRunningForeground) {
-      // We look for `SBTransientOverlayWindow` elements for half modals. See https://github.com/appium/WebDriverAgent/pull/946
-      NSPredicate *searchPredicate = [NSPredicate predicateWithFormat:@"%K == %@ OR %K == %@",
+      NSPredicate *searchPredicate = [NSPredicate predicateWithFormat:@"%K == %@ OR %K IN {%@, %@}",
                                       @"elementType", @(XCUIElementTypeAlert), 
-                                      @"identifier", @"SBTransientOverlayWindow"];
+                                      // To look for `SBTransientOverlayWindow` elements. See https://github.com/appium/WebDriverAgent/pull/946
+                                      @"identifier", @"SBTransientOverlayWindow",
+                                      // To look for 'criticalAlertSetting' elements https://developer.apple.com/documentation/usernotifications/unnotificationsettings/criticalalertsetting
+                                      // See https://github.com/appium/appium/issues/20835
+                                      @"NotificationShortLookView"];
       if ([FBConfiguration shouldRespectSystemAlerts]
           && [[XCUIApplication.fb_systemApplication descendantsMatchingType:XCUIElementTypeAny]
               matchingPredicate:searchPredicate].count > 0) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "8.11.1",
+  "version": "8.12.0",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -64,7 +64,7 @@
     "chai-as-promised": "^8.0.0",
     "conventional-changelog-conventionalcommits": "^8.0.0",
     "node-simctl": "^7.0.1",
-    "mocha": "^10.0.0",
+    "mocha": "^11.0.1",
     "prettier": "^3.0.0",
     "semantic-release": "^24.0.0",
     "semver": "^7.3.7",
@@ -75,7 +75,7 @@
   "dependencies": {
     "@appium/base-driver": "^9.0.0",
     "@appium/strongbox": "^0.x",
-    "@appium/support": "^5.0.3",
+    "@appium/support": "^6.0.0",
     "appium-ios-device": "^2.7.25",
     "appium-ios-simulator": "^6.0.0",
     "async-lock": "^1.0.0",