chore: Tune alert detection if system app is active (#854)

appium · Feb 28, 2024 · 857d3de · 857d3de
1 parent 878b62a
commit 857d3de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m b/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m
@@ -533,7 +533,7 @@ - (BOOL)fb_isSameAppAs:(nullable XCUIApplication *)otherApp
   if (nil == otherApp) {
     return NO;
   }
-  return [self.bundleID isEqualToString:(NSString *)otherApp.bundleID];
+  return self == otherApp || [self.bundleID isEqualToString:(NSString *)otherApp.bundleID];
 }
 
 @end
diff --git a/WebDriverAgentLib/FBAlert.m b/WebDriverAgentLib/FBAlert.m
@@ -261,7 +261,12 @@ - (BOOL)clickAlertButton:(NSString *)label error:(NSError **)error
 - (XCUIElement *)alertElement
 {
   if (nil == self.element) {
-    self.element = XCUIApplication.fb_systemApplication.fb_alertElement ?: self.application.fb_alertElement;
+    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;
 }