appium-webdriveragent 7.0.0 → 7.0.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [7.0.2](https://github.com/appium/WebDriverAgent/compare/v7.0.1...v7.0.2) (2024-02-28)
+
+
+### Miscellaneous Chores
+
+* Tune alert detection if system app is active ([#854](https://github.com/appium/WebDriverAgent/issues/854)) ([857d3de](https://github.com/appium/WebDriverAgent/commit/857d3decf497935098ba6acb61654be1da173b11))
+
+## [7.0.1](https://github.com/appium/WebDriverAgent/compare/v7.0.0...v7.0.1) (2024-02-21)
+
+
+### Miscellaneous Chores
+
+* Simplify the logic of alert element detection ([#851](https://github.com/appium/WebDriverAgent/issues/851)) ([54f91f1](https://github.com/appium/WebDriverAgent/commit/54f91f198e45535ea9d86b7eee40b21f43f84294))
+
 ## [7.0.0](https://github.com/appium/WebDriverAgent/compare/v6.1.1...v7.0.0) (2024-02-12)
 
 

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m

@@ -533,7 +533,7 @@ NSDictionary<NSNumber *, NSString *> *auditTypeValuesToNames(void) {
   if (nil == otherApp) {
     return NO;
   }
-  return [self.bundleID isEqualToString:(NSString *)otherApp.bundleID];
+  return self == otherApp || [self.bundleID isEqualToString:(NSString *)otherApp.bundleID];
 }
 
 @end

package/WebDriverAgentLib/FBAlert.m

@@ -261,15 +261,11 @@
 - (XCUIElement *)alertElement
 {
   if (nil == self.element) {
-    self.element = self.application.fb_alertElement;
-    if (nil == self.element) {
-      XCUIApplication *systemApp = XCUIApplication.fb_systemApplication;
-      for (XCUIApplication *activeApp in XCUIApplication.fb_activeApplications) {
-        if (systemApp.processID == activeApp.processID) {
-          self.element = activeApp.fb_alertElement;
-          break;
-        }
-      }
+    XCUIApplication *systemApp = XCUIApplication.fb_systemApplication;
+    if ([systemApp fb_isSameAppAs:self.application]) {
+      self.element = systemApp.fb_alertElement;
+    } else {
+      self.element = systemApp.fb_alertElement ?: self.application.fb_alertElement;
     }
   }
   return self.element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "scripts": {