appium-webdriveragent 5.15.9 → 6.0.0

package/WebDriverAgentTests/IntegrationTests/XCUIApplicationHelperTests.m

@@ -11,11 +11,11 @@
 
 #import <mach/mach_time.h>
 
-#import "FBApplication.h"
 #import "FBIntegrationTestCase.h"
 #import "FBElement.h"
 #import "FBMacros.h"
 #import "FBTestMacros.h"
+#import "XCUIApplication.h"
 #import "XCUIApplication+FBHelpers.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "FBXCodeCompatibility.h"
@@ -34,8 +34,8 @@
 - (void)testQueringSpringboard
 {
   [self goToSpringBoardFirstPage];
-  XCTAssertTrue(FBApplication.fb_systemApplication.icons[@"Safari"].exists);
-  XCTAssertTrue(FBApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.exists);
+  XCTAssertTrue(XCUIApplication.fb_systemApplication.icons[@"Safari"].exists);
+  XCTAssertTrue(XCUIApplication.fb_systemApplication.icons[@"Calendar"].firstMatch.exists);
 }
 
 - (void)testApplicationTree
@@ -58,10 +58,10 @@
 
 - (void)testActiveApplication
 {
-  FBApplication *systemApp = FBApplication.fb_systemApplication;
-  XCTAssertTrue([FBApplication fb_activeApplication].buttons[@"Alerts"].fb_isVisible);
+  XCUIApplication *systemApp = XCUIApplication.fb_systemApplication;
+  XCTAssertTrue([XCUIApplication fb_activeApplication].buttons[@"Alerts"].fb_isVisible);
   [self goToSpringBoardFirstPage];
-  XCTAssertEqualObjects([FBApplication fb_activeApplication].bundleID, systemApp.bundleID);
+  XCTAssertEqualObjects([XCUIApplication fb_activeApplication].bundleID, systemApp.bundleID);
   XCTAssertTrue(systemApp.icons[@"Safari"].fb_isVisible);
 }
 
@@ -102,14 +102,14 @@
   }
 
   NSError *error;
-  NSArray *auditIssues1 = [FBApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypes:~0UL
+  NSArray *auditIssues1 = [XCUIApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypes:~0UL
                                                                                                    error:&error];
   XCTAssertNotNil(auditIssues1);
   XCTAssertNil(error);
 
   NSMutableSet *set = [NSMutableSet new];
   [set addObject:@"XCUIAccessibilityAuditTypeAll"];
-  NSArray *auditIssues2 = [FBApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypesSet:set.copy
+  NSArray *auditIssues2 = [XCUIApplication.fb_activeApplication fb_performAccessibilityAuditWithAuditTypesSet:set.copy
                                                                                                       error:&error];
   XCTAssertEqualObjects(auditIssues1, auditIssues2);
   XCTAssertNil(error);

package/WebDriverAgentTests/IntegrationTests/XCUIDeviceHelperTests.m

@@ -9,11 +9,12 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FBApplication.h"
 #import "FBIntegrationTestCase.h"
 #import "FBImageUtils.h"
 #import "FBMacros.h"
 #import "FBTestMacros.h"
+#import "XCUIApplication.h"
+#import "XCUIApplication+FBHelpers.h"
 #import "XCUIDevice+FBHelpers.h"
 #import "XCUIDevice+FBRotation.h"
 #import "XCUIScreen.h"
@@ -101,7 +102,7 @@
   NSError *error;
   XCTAssertTrue([[XCUIDevice sharedDevice] fb_goToHomescreenWithError:&error]);
   XCTAssertNil(error);
-  XCTAssertTrue([FBApplication fb_activeApplication].icons[@"Safari"].exists);
+  XCTAssertTrue([XCUIApplication fb_activeApplication].icons[@"Safari"].exists);
 }
 
 - (void)testLockUnlockScreen
@@ -124,7 +125,7 @@
 
   NSError *error;
   XCTAssertTrue([XCUIDevice.sharedDevice fb_openUrl:@"https://apple.com" error:&error]);
-  FBAssertWaitTillBecomesTrue([FBApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
+  FBAssertWaitTillBecomesTrue([XCUIApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
   XCTAssertNil(error);
 }
 
@@ -138,7 +139,7 @@
   XCTAssertTrue([XCUIDevice.sharedDevice fb_openUrl:@"https://apple.com"
                                     withApplication:@"com.apple.mobilesafari"
                                               error:&error]);
-  FBAssertWaitTillBecomesTrue([FBApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
+  FBAssertWaitTillBecomesTrue([XCUIApplication.fb_activeApplication.bundleID isEqualToString:@"com.apple.mobilesafari"]);
   XCTAssertNil(error);
 }
 

package/WebDriverAgentTests/IntegrationTests/XCUIElementHelperIntegrationTests.m

@@ -10,7 +10,6 @@
 #import <XCTest/XCTest.h>
 #import "XCTest/XCUIElementTypes.h"
 
-#import "FBApplication.h"
 #import "FBIntegrationTestCase.h"
 #import "FBTestMacros.h"
 #import "FBElement.h"

package/WebDriverAgentTests/UnitTests/Doubles/{FBApplicationDouble.h → XCUIApplicationDouble.h}

@@ -9,7 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-@interface FBApplicationDouble : NSObject
+@interface XCUIApplicationDouble : NSObject
 @property (nonatomic, assign, readonly) BOOL didTerminate;
 @property (nonatomic, strong) NSString* bundleID;
 @property (nonatomic) BOOL fb_shouldWaitForQuiescence;

package/WebDriverAgentTests/UnitTests/Doubles/{FBApplicationDouble.m → XCUIApplicationDouble.m}

@@ -7,13 +7,13 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "FBApplicationDouble.h"
+#import "XCUIApplicationDouble.h"
 
-@interface FBApplicationDouble ()
+@interface XCUIApplicationDouble ()
 @property (nonatomic, assign, readwrite) BOOL didTerminate;
 @end
 
-@implementation FBApplicationDouble
+@implementation XCUIApplicationDouble
 
 - (instancetype)init
 {

package/WebDriverAgentTests/UnitTests/FBSessionTests.m

@@ -9,13 +9,13 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FBApplicationDouble.h"
 #import "FBSession.h"
 #import "FBConfiguration.h"
+#import "XCUIApplicationDouble.h"
 
 @interface FBSessionTests : XCTestCase
 @property (nonatomic, strong) FBSession *session;
-@property (nonatomic, strong) FBApplication *testedApplication;
+@property (nonatomic, strong) XCUIApplication *testedApplication;
 @property (nonatomic) BOOL shouldTerminateAppValue;
 @end
 
@@ -24,7 +24,7 @@
 - (void)setUp
 {
   [super setUp];
-  self.testedApplication = (id)FBApplicationDouble.new;
+  self.testedApplication = (id)XCUIApplicationDouble.new;
   self.shouldTerminateAppValue = FBConfiguration.shouldTerminateApp;
   [FBConfiguration setShouldTerminateApp:NO];
   self.session = [FBSession initWithApplication:self.testedApplication];

package/package.json

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