appium-webdriveragent 16.1.2 → 16.1.3

package/WebDriverAgentLib/Utilities/FBPasteboard.m

@@ -11,6 +11,7 @@
 #import <mach/mach_time.h>
 #import "FBAlert.h"
 #import "FBErrorBuilder.h"
+#import "FBExceptions.h"
 #import "FBMacros.h"
 #import "XCUIApplication+FBHelpers.h"
 #import "XCUIApplication+FBAlert.h"
@@ -100,10 +101,13 @@
       break;
     }
 
-    XCUIElement *alertElement = XCUIApplication.fb_systemApplication.fb_alertElement;
-    if (nil != alertElement) {
-      FBAlert *alert = [FBAlert alertWithElement:alertElement];
-      [alert acceptWithError:nil];
+    @try {
+      [[FBAlert alertWithApplication:XCUIApplication.fb_systemApplication] accept];
+    } @catch (NSException *e) {
+      if (![e.name isEqualToString:FBAlertNotPresentException]) {
+        @throw e;
+      }
+      // No alert is present on this tick - expected on most iterations of this poll loop
     }
     uint64_t timeElapsed = clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW) - timeStarted;
     if (timeElapsed / NSEC_PER_SEC > timeout) {

package/WebDriverAgentTests/IntegrationTests/FBAlertTests.m

@@ -69,60 +69,54 @@
 
 - (void)testAlertPresence
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertFalse(alert.isPresent);
+  XCTAssertFalse([FBAlert alertWithApplication:self.testedApplication].isPresent);
   [self showApplicationAlert];
-  XCTAssertTrue(alert.isPresent);
+  XCTAssertTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
 }
 
 - (void)testAlertText
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.text);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].text);
   [self showApplicationAlert];
-  XCTAssertTrue([alert.text containsString:@"Magic"]);
-  XCTAssertTrue([alert.text containsString:@"Should read"]);
+  NSString *text = [FBAlert alertWithApplication:self.testedApplication].text;
+  XCTAssertTrue([text containsString:@"Magic"]);
+  XCTAssertTrue([text containsString:@"Should read"]);
 }
 
 - (void)testAlertLabels
 {
-  FBAlert* alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.buttonLabels);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].buttonLabels);
   [self showApplicationAlert];
-  XCTAssertNotNil(alert.buttonLabels);
-  XCTAssertEqual(1, alert.buttonLabels.count);
-  XCTAssertEqualObjects(@"Will do", alert.buttonLabels[0]);
+  NSArray *labels = [FBAlert alertWithApplication:self.testedApplication].buttonLabels;
+  XCTAssertNotNil(labels);
+  XCTAssertEqual(1, labels.count);
+  XCTAssertEqualObjects(@"Will do", labels[0]);
 }
 
 - (void)testClickAlertButton
 {
-  FBAlert* alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertFalse([alert clickAlertButton:@"Invalid" error:nil]);
+  XCTAssertThrows([[FBAlert alertWithApplication:self.testedApplication] clickAlertButton:@"Invalid"]);
   [self showApplicationAlert];
-  XCTAssertFalse([alert clickAlertButton:@"Invalid" error:nil]);
-  FBAssertWaitTillBecomesTrue(alert.isPresent);
-  XCTAssertTrue([alert clickAlertButton:@"Will do" error:nil]);
-  FBAssertWaitTillBecomesTrue(!alert.isPresent);
+  XCTAssertThrows([[FBAlert alertWithApplication:self.testedApplication] clickAlertButton:@"Invalid"]);
+  FBAssertWaitTillBecomesTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
+  XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] clickAlertButton:@"Will do"]);
+  FBAssertWaitTillBecomesTrue(![FBAlert alertWithApplication:self.testedApplication].isPresent);
 }
 
 - (void)testAcceptingAlert
 {
-  NSError *error;
   [self showApplicationAlert];
-  XCTAssertTrue([[FBAlert alertWithApplication:self.testedApplication] acceptWithError:&error]);
+  XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] accept]);
   FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
-  XCTAssertNil(error);
 }
 
 - (void)testAcceptingAlertWithCustomLocator
 {
-  NSError *error;
   [self showApplicationAlert];
   [FBConfiguration setAcceptAlertButtonSelector:@"**/XCUIElementTypeButton[-1]"];
   @try {
-    XCTAssertTrue([[FBAlert alertWithApplication:self.testedApplication] acceptWithError:&error]);
+    XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] accept]);
     FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
-    XCTAssertNil(error);
   } @finally {
     [FBConfiguration setAcceptAlertButtonSelector:@""];
   }
@@ -130,65 +124,52 @@
 
 - (void)testDismissingAlert
 {
-  NSError *error;
   [self showApplicationAlert];
-  XCTAssertTrue([[FBAlert alertWithApplication:self.testedApplication] dismissWithError:&error]);
+  XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] dismiss]);
   FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
-  XCTAssertNil(error);
 }
 
 - (void)testDismissingAlertWithCustomLocator
 {
-  NSError *error;
   [self showApplicationAlert];
   [FBConfiguration setDismissAlertButtonSelector:@"**/XCUIElementTypeButton[-1]"];
   @try {
-    XCTAssertTrue([[FBAlert alertWithApplication:self.testedApplication] dismissWithError:&error]);
+    XCTAssertNoThrow([[FBAlert alertWithApplication:self.testedApplication] dismiss]);
     FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
-    XCTAssertNil(error);
   } @finally {
     [FBConfiguration setDismissAlertButtonSelector:@""];
   }
 }
 
-- (void)testAlertElement
-{
-  [self showApplicationAlert];
-  XCUIElement *alertElement = [FBAlert alertWithApplication:self.testedApplication].alertElement;
-  XCTAssertTrue(alertElement.exists);
-  XCTAssertTrue(alertElement.elementType == XCUIElementTypeAlert);
-}
-
 - (void)testNotificationAlert
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.text);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].text);
   [self.testedApplication.buttons[@"Create Notification Alert"] tap];
-  FBAssertWaitTillBecomesTrue(alert.isPresent);
+  FBAssertWaitTillBecomesTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
 
-  XCTAssertTrue([alert.text containsString:@"Would Like to Send You Notifications"]);
-  XCTAssertTrue([alert.text containsString:@"Notifications may include"]);
+  NSString *text = [FBAlert alertWithApplication:self.testedApplication].text;
+  XCTAssertTrue([text containsString:@"Would Like to Send You Notifications"]);
+  XCTAssertTrue([text containsString:@"Notifications may include"]);
 }
 
 - (void)testCameraRollAlert
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.text);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].text);
 
   [self.testedApplication.buttons[@"Create Camera Roll Alert"] tap];
-  FBAssertWaitTillBecomesTrue(alert.isPresent);
+  FBAssertWaitTillBecomesTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
 }
 
 - (void)testGPSAccessAlert
 {
-  FBAlert *alert = [FBAlert alertWithApplication:self.testedApplication];
-  XCTAssertNil(alert.text);
+  XCTAssertNil([FBAlert alertWithApplication:self.testedApplication].text);
 
   [self.testedApplication.buttons[@"Create GPS access Alert"] tap];
-  FBAssertWaitTillBecomesTrue(alert.isPresent);
+  FBAssertWaitTillBecomesTrue([FBAlert alertWithApplication:self.testedApplication].isPresent);
 
-  XCTAssertTrue([alert.text containsString:@"location"]);
-  XCTAssertTrue([alert.text containsString:@"Yo Yo"]);
+  NSString *text = [FBAlert alertWithApplication:self.testedApplication].text;
+  XCTAssertTrue([text containsString:@"location"]);
+  XCTAssertTrue([text containsString:@"Yo Yo"]);
 }
 
 @end

package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m

@@ -10,6 +10,7 @@
 
 #import "FBAlert.h"
 #import "FBTestMacros.h"
+#import "FBExceptions.h"
 #import "FBIntegrationTestCase.h"
 #import "FBConfiguration.h"
 #import "FBMacros.h"
@@ -151,7 +152,14 @@ NSArray<NSString *> *const FBMainViewButtonLabels = @[
 - (void)clearAlert
 {
   [self.testedApplication fb_waitUntilStable];
-  [[FBAlert alertWithApplication:self.testedApplication] dismissWithError:nil];
+  @try {
+    [[FBAlert alertWithApplication:self.testedApplication] dismiss];
+  } @catch (NSException *e) {
+    if (![e.name isEqualToString:FBAlertNotPresentException]) {
+      @throw e;
+    }
+    // No alert is present, nothing to clear
+  }
   [self.testedApplication fb_waitUntilStable];
   FBAssertWaitTillBecomesTrue(self.testedApplication.alerts.count == 0);
 }

package/WebDriverAgentTests/IntegrationTests/FBSafariAlertTests.m

@@ -67,7 +67,7 @@
   XCTAssertEqualObjects(buttonLabels.firstObject, @"Close");
   XCTAssertNotNil([self.safariApp fb_descendantsMatchingXPathQuery:@"//XCUIElementTypeButton[@label='Close']"
                                        shouldReturnAfterFirstMatch:YES].firstObject);
-  XCTAssertTrue([alert acceptWithError:nil]);
+  XCTAssertNoThrow([alert accept]);
 }
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "16.1.2",
+  "version": "16.1.3",
   "description": "Package bundling WebDriverAgent",
   "keywords": [
     "Appium",