npm - appium-webdriveragent - Versions diffs - 4.8.0 → 4.8.3 - Mend

appium-webdriveragent 4.8.0 → 4.8.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.m CHANGED Viewed

@@ -29,7 +29,7 @@
 - (id<FBXCElementSnapshot>)fb_snapshotForAttributeName:(NSString *)name
 {
-  // These attrbiutes are special, because we can only retrieve them from
+  // These attributes are special, because we can only retrieve them from
   // the snapshot if we explicitly ask XCTest to include them into the query while taking it.
   // That is why fb_snapshotWithAllAttributes method must be used instead of the default snapshot
   // call

package/WebDriverAgentLib/Commands/FBElementCommands.m CHANGED Viewed

@@ -134,7 +134,8 @@
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
                        resolveForAdditionalAttributes:additionalAttributes
                                           andMaxDepth:maxDepth];
-  id attributeValue = [element.lastSnapshot fb_valueForWDAttributeName:attributeName];
+  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot];
+  id attributeValue = [wrappedSnapshot fb_valueForWDAttributeName:attributeName];
   return FBResponseWithObject(attributeValue ?: [NSNull null]);
 }

package/WebDriverAgentLib/Utilities/FBPasteboard.m CHANGED Viewed

@@ -9,7 +9,16 @@
 #import "FBPasteboard.h"
+#import <mach/mach_time.h>
+#import "FBAlert.h"
+#import "FBApplication.h"
 #import "FBErrorBuilder.h"
+#import "FBMacros.h"
+#import "XCUIApplication+FBAlert.h"
+#define ALERT_TIMEOUT_SEC 30
+// Must not be less than FB_MONTORING_INTERVAL in FBAlertsMonitor
+#define ALERT_CHECK_INTERVAL_SEC 2
 #if !TARGET_OS_TV
 @implementation FBPasteboard
@@ -50,21 +59,100 @@
   return YES;
 }
++ (nullable id)pasteboardContentForItem:(NSString *)item
+                               instance:(UIPasteboard *)pbInstance
+                                timeout:(NSTimeInterval)timeout
+                                  error:(NSError **)error
+{
+  SEL selector = NSSelectorFromString(item);
+  NSMethodSignature *methodSignature = [pbInstance methodSignatureForSelector:selector];
+  if (nil == methodSignature) {
+    NSString *description = [NSString stringWithFormat:@"Cannot retrieve '%@' from a UIPasteboard instance", item];
+    if (error) {
+      *error = [[FBErrorBuilder.builder withDescription:description] build];
+    }
+    return nil;
+  }
+  NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:methodSignature];
+  [invocation setSelector:selector];
+  [invocation setTarget:pbInstance];
+  if (SYSTEM_VERSION_LESS_THAN(@"16.0")) {
+    [invocation invoke];
+    id __unsafe_unretained result;
+    [invocation getReturnValue:&result];
+    return result;
+  }
+  // https://github.com/appium/appium/issues/17392
+  __block id pasteboardContent;
+  dispatch_queue_t backgroundQueue = dispatch_queue_create("GetPasteboard", NULL);
+  __block BOOL didFinishGetPasteboard = NO;
+  dispatch_async(backgroundQueue, ^{
+    [invocation invoke];
+    id __unsafe_unretained result;
+    [invocation getReturnValue:&result];
+    pasteboardContent = result;
+    didFinishGetPasteboard = YES;
+  });
+  uint64_t timeStarted = mach_absolute_time();
+  while (!didFinishGetPasteboard) {
+    [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:ALERT_CHECK_INTERVAL_SEC]];
+    if (didFinishGetPasteboard) {
+      break;
+    }
+    XCUIElement *alertElement = FBApplication.fb_systemApplication.fb_alertElement;
+    if (nil != alertElement) {
+      FBAlert *alert = [FBAlert alertWithElement:alertElement];
+      [alert acceptWithError:nil];
+    }
+    uint64_t timeElapsed = mach_absolute_time() - timeStarted;
+    if (timeElapsed / NSEC_PER_SEC > timeout) {
+      NSString *description = [NSString stringWithFormat:@"Cannot handle pasteboard alert within %@s timeout", @(timeout)];
+      if (error) {
+        *error = [[FBErrorBuilder.builder withDescription:description] build];
+      }
+      return nil;
+    }
+  }
+  return pasteboardContent;
+}
 + (NSData *)dataForType:(NSString *)type error:(NSError **)error
 {
   UIPasteboard *pb = UIPasteboard.generalPasteboard;
   if ([type.lowercaseString isEqualToString:@"plaintext"]) {
     if (pb.hasStrings) {
-      return [[pb.strings componentsJoinedByString:@"\n"] dataUsingEncoding:NSUTF8StringEncoding];
+      id result = [self.class pasteboardContentForItem:@"strings"
+                                              instance:pb
+                                               timeout:ALERT_TIMEOUT_SEC
+                                                 error:error
+      ];
+      return nil == result
+        ? nil
+        : [[(NSArray *)result componentsJoinedByString:@"\n"] dataUsingEncoding:NSUTF8StringEncoding];
     }
   } else if ([type.lowercaseString isEqualToString:@"image"]) {
     if (pb.hasImages) {
-      return UIImagePNGRepresentation((UIImage *)pb.image);
+      id result = [self.class pasteboardContentForItem:@"image"
+                                              instance:pb
+                                               timeout:ALERT_TIMEOUT_SEC
+                                                 error:error
+      ];
+      return nil == result ? nil : UIImagePNGRepresentation((UIImage *)result);
     }
   } else if ([type.lowercaseString isEqualToString:@"url"]) {
     if (pb.hasURLs) {
+      id result = [self.class pasteboardContentForItem:@"URLs"
+                                              instance:pb
+                                               timeout:ALERT_TIMEOUT_SEC
+                                                 error:error
+      ];
+      if (nil == result) {
+        return nil;
+      }
       NSMutableArray<NSString *> *urls = [NSMutableArray array];
-      for (NSURL *url in pb.URLs) {
+      for (NSURL *url in (NSArray *)result) {
         if (nil != url.absoluteString) {
           [urls addObject:(id)url.absoluteString];
         }

package/WebDriverAgentRunner-Runner.app.zip CHANGED Viewed

Binary file

package/WebDriverAgentTests/IntegrationTests/FBPasteboardTests.m CHANGED Viewed

@@ -71,11 +71,7 @@
   FBWaitExact(1.0);
   NSData *result = [FBPasteboard dataForType:@"plaintext" error:&error];
   XCTAssertNil(error);
-  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"16.0")) {
-    // Pasteboard permission appears in a simulator. Not in a real device.
-  } else {
-    XCTAssertEqualObjects(textField.value, [[NSString alloc] initWithData:result encoding:NSUTF8StringEncoding]);
-  }
+  XCTAssertEqualObjects(textField.value, [[NSString alloc] initWithData:result encoding:NSUTF8StringEncoding]);
 }
 - (void)testUrlCopyPaste

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "4.8.0",
+  "version": "4.8.3",
   "description": "Package bundling WebDriverAgent",
   "main": "build/index.js",
   "scripts": {
@@ -72,7 +72,7 @@
     "lodash": "^4.17.11",
     "node-simctl": "^7.0.1",
     "source-map-support": "^0.x",
-    "teen_process": "^1.14.1"
+    "teen_process": "^2.0.0"
   },
   "files": [
     "index.js",

package/WebDriverAgent.xcodeproj/project.xcworkspace/xcuserdata/elf.xcuserdatad/UserInterfaceState.xcuserstate DELETED Viewed

Binary file

package/WebDriverAgent.xcodeproj/xcuserdata/elf.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist DELETED Viewed

@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   uuid = "2F0174F2-ED3F-4D11-9A17-7C590053D796"
-   type = "1"
-   version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
-         <BreakpointContent
-            uuid = "471ECA8C-2C53-4C59-88DB-1C1CB3D61601"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            breakpointStackSelectionBehavior = "1"
-            scope = "1"
-            stopOnStyle = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "C2E06865-6A52-4686-9771-279AF13ABF8A"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m"
-            timestampString = "0"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "264"
-            endingLineNumber = "264">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "54216FE6-E240-47F1-88D3-D450CF0AF44E"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "WebDriverAgentLib/Categories/XCUIElement+FBResolve.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "37"
-            endingLineNumber = "37"
-            landmarkName = "-fb_stableInstance"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "54216FE6-E240-47F1-88D3-D450CF0AF44E - b09f4ce1ce926e6"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "-[XCUIElement(FBResolve) fb_stableInstance]"
-                  moduleName = "WebDriverAgentLib"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/elf/code/WebDriverAgent/WebDriverAgentLib/Categories/XCUIElement+FBResolve.m"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "37"
-                  endingLineNumber = "37"
-                  offsetFromSymbolStart = "19">
-               </Location>
-               <Location
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  usesParentBreakpointCondition = "Yes"
-                  offsetFromSymbolStart = "0">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "D3009B57-42BC-4905-99BC-70232544FAFB"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "WebDriverAgentTests/IntegrationTests/FBAlertTests.m"
-            startingColumnNumber = "5"
-            endingColumnNumber = "64"
-            startingLineNumber = "32"
-            endingLineNumber = "32"
-            landmarkName = "-setUp"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
-</Bucket>

package/WebDriverAgent.xcodeproj/xcuserdata/elf.xcuserdatad/xcschemes/xcschememanagement.plist DELETED Viewed

@@ -1,59 +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>SchemeUserState</key>
-	<dict>
-		<key>IntegrationApp.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-		<key>IntegrationTests_1.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>1</integer>
-		</dict>
-		<key>IntegrationTests_2.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>2</integer>
-		</dict>
-		<key>IntegrationTests_3.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>3</integer>
-		</dict>
-		<key>WebDriverAgentLib copy.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>9</integer>
-		</dict>
-		<key>WebDriverAgentLib.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>4</integer>
-		</dict>
-		<key>WebDriverAgentLib_tvOS.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>5</integer>
-		</dict>
-		<key>WebDriverAgentRunner-nodebug.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>7</integer>
-		</dict>
-		<key>WebDriverAgentRunner.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>6</integer>
-		</dict>
-		<key>WebDriverAgentRunner_tvOS.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>8</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>