appium-webdriveragent 3.9.2 → 3.12.0

package/WebDriverAgentTests/IntegrationTests/XCUIElementFBFindTests.m

@@ -18,6 +18,7 @@
 #import "XCElementSnapshot+FBHelpers.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElement+FBClassChain.h"
+#import "XCUIElement+FBResolve.h"
 #import "FBXPath.h"
 #import "FBXCodeCompatibility.h"
 
@@ -86,6 +87,16 @@
   XCTAssertEqualObjects(matchingSnapshots.lastObject.label, @"Alerts");
 }
 
+- (void)testStableInstance
+{
+  NSArray<XCUIElement *> *matchingSnapshots = [self.testedView fb_descendantsMatchingIdentifier:@"Alerts" shouldReturnAfterFirstMatch:YES];
+  XCTAssertEqual(matchingSnapshots.count, 1);
+  for (XCUIElement *el in @[matchingSnapshots.lastObject, matchingSnapshots.lastObject.fb_stableInstance]) {
+    XCTAssertEqual(el.elementType, XCUIElementTypeButton);
+    XCTAssertEqualObjects(el.label, @"Alerts");
+  }
+}
+
 - (void)testSingleDescendantWithMissingIdentifier
 {
   NSArray<XCUIElement *> *matchingSnapshots = [self.testedView fb_descendantsMatchingIdentifier:@"blabla" shouldReturnAfterFirstMatch:YES];

package/WebDriverAgentTests/UnitTests/Doubles/FBApplicationDouble.h

@@ -12,4 +12,7 @@
 @interface FBApplicationDouble : NSObject
 @property (nonatomic, assign, readonly) BOOL didTerminate;
 @property (nonatomic, strong) NSString* bundleID;
+@property (nonatomic) BOOL fb_shouldWaitForQuiescence;
+
+- (BOOL)running;
 @end

package/WebDriverAgentTests/UnitTests/Doubles/FBApplicationDouble.m

@@ -49,4 +49,19 @@
   return nil;
 }
 
+- (BOOL)fb_shouldWaitForQuiescence
+{
+  return NO;
+}
+
+-(void)setFb_shouldWaitForQuiescence:(BOOL)value
+{
+
+}
+
+- (BOOL)running
+{
+  return NO;
+}
+
 @end

package/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.h

@@ -16,6 +16,7 @@
 @interface XCUIElementDouble : NSObject<FBElement>
 @property (nonatomic, strong, nonnull) XCUIApplication *application;
 @property (nonatomic, readwrite, assign) CGRect frame;
+@property (nonatomic, readwrite, nullable) id lastSnapshot;
 @property (nonatomic, assign) BOOL fb_isObstructedByAlert;
 @property (nonatomic, readonly, nonnull) NSString *fb_cacheId;
 @property (nonatomic, nullable) NSNumber *fb_isResolvedFromCache;

package/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.m

@@ -41,6 +41,7 @@
     self.elementType = XCUIElementTypeOther;
     self.wdType = @"XCUIElementTypeOther";
     self.wdUID = @"0";
+    self.lastSnapshot = nil;
   }
   return self;
 }

package/WebDriverAgentTests/UnitTests/FBSessionTests.m

@@ -11,10 +11,12 @@
 
 #import "FBApplicationDouble.h"
 #import "FBSession.h"
+#import "FBConfiguration.h"
 
 @interface FBSessionTests : XCTestCase
 @property (nonatomic, strong) FBSession *session;
 @property (nonatomic, strong) FBApplication *testedApplication;
+@property (nonatomic) BOOL shouldTerminateAppValue;
 @end
 
 @implementation FBSessionTests
@@ -23,9 +25,18 @@
 {
   [super setUp];
   self.testedApplication = (id)FBApplicationDouble.new;
+  self.shouldTerminateAppValue = FBConfiguration.shouldTerminateApp;
+  [FBConfiguration setShouldTerminateApp:NO];
   self.session = [FBSession initWithApplication:self.testedApplication];
 }
 
+- (void)tearDown
+{
+  [self.session kill];
+  [FBConfiguration setShouldTerminateApp:self.shouldTerminateAppValue];
+  [super tearDown];
+}
+
 - (void)testSessionFetching
 {
   FBSession *fetchedSession = [FBSession sessionWithIdentifier:self.session.identifier];
@@ -51,7 +62,6 @@
 - (void)testActiveSessionIsNilAfterKilling
 {
   [self.session kill];
-  XCTAssertTrue(((FBApplicationDouble *)self.testedApplication).didTerminate);
   XCTAssertNil([FBSession activeSession]);
 }
 

package/WebDriverAgentTests/UnitTests/FBXPathTests.m

@@ -42,7 +42,9 @@
   XCTAssertEqual(rc, 0);
   XCTAssertEqual(1, [elementStore count]);
 
-  return [NSString stringWithCString:(const char *)xmlbuff encoding:NSUTF8StringEncoding];
+  NSString *result = [NSString stringWithCString:(const char *)xmlbuff encoding:NSUTF8StringEncoding];
+  xmlFree(xmlbuff);
+  return result;
 }
 
 - (void)testDefaultXPathPresentation

package/WebDriverAgentTests/UnitTests_tvOS/Doubles/XCUIElementDouble.h

@@ -16,6 +16,7 @@
 @interface XCUIElementDouble : NSObject<FBElement>
 @property (nonatomic, strong, nonnull) XCUIApplication *application;
 @property (nonatomic, readwrite, assign) CGRect frame;
+@property (nonatomic, readwrite, nullable) id lastSnapshot;
 @property (nonatomic, assign) BOOL fb_isObstructedByAlert;
 @property (nonatomic, nullable) NSNumber *fb_isResolvedFromCache;
 @property (nonatomic, readwrite, copy, nonnull) NSDictionary *wdRect;

package/WebDriverAgentTests/UnitTests_tvOS/Doubles/XCUIElementDouble.m

@@ -41,6 +41,7 @@
     self.elementType = XCUIElementTypeOther;
     self.wdType = @"XCUIElementTypeOther";
     self.wdUID = @"0";
+    self.lastSnapshot = nil;
   }
   return self;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "3.9.2",
+  "version": "3.12.0",
   "description": "Package bundling WebDriverAgent",
   "main": "build/index.js",
   "scripts": {
@@ -52,9 +52,9 @@
     "glob": "^7.1.0",
     "gulp": "^4.0.2",
     "ios-uicatalog": "^3.5.0",
-    "mocha": "^8.0.1",
+    "mocha": "^9.0.0",
     "pre-commit": "^1.2.2",
-    "sinon": "^10.0.0",
+    "sinon": "^11.0.0",
     "wd": "^1.11.4"
   },
   "dependencies": {

package/WebDriverAgent.xcodeproj/project.xcworkspace/xcuserdata/kazuaki.xcuserdatad/WorkspaceSettings.xcsettings

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildLocationStyle</key>
-	<string>UseAppPreferences</string>
-	<key>CustomBuildLocationType</key>
-	<string>RelativeToDerivedData</string>
-	<key>DerivedDataLocationStyle</key>
-	<string>Default</string>
-	<key>EnabledFullIndexStoreVisibility</key>
-	<false/>
-	<key>IssueFilterStyle</key>
-	<string>ShowActiveSchemeOnly</string>
-	<key>LiveSourceIssuesEnabled</key>
-	<true/>
-	<key>ShowSharedSchemesAutomaticallyEnabled</key>
-	<true/>
-</dict>
-</plist>