appium-webdriveragent 4.5.0 → 4.5.1

package/README.md

@@ -51,3 +51,4 @@ projects has been integrated directly in the WebDriverAgent source tree.
 You can find the source files and their licenses in the `WebDriverAgentLib/Vendor` directory.
 
 Have fun!
+

package/WebDriverAgentLib/Utilities/FBW3CActionsSynthesizer.m

@@ -21,6 +21,7 @@
 #import "FBXCTestDaemonsProxy.h"
 #import "XCElementSnapshot+FBHelpers.h"
 #import "XCUIApplication+FBHelpers.h"
+#import "XCUIDevice.h"
 #import "XCUIElement+FBCaching.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElement+FBUtilities.h"
@@ -218,12 +219,28 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
       return @[];
     }
   }
-  XCPointerEventPath *result = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition offset:FBMillisToSeconds(self.offset)];
-  if (nil != self.pressure && nil != result.pointerEvents.lastObject) {
-    XCPointerEvent *pointerEvent = (XCPointerEvent *)result.pointerEvents.lastObject;
-    pointerEvent.pressure = self.pressure.doubleValue;
+  if (nil == self.pressure) {
+    XCPointerEventPath *result = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition
+                                                                          offset:FBMillisToSeconds(self.offset)];
+    return @[result];
   }
-  return @[result];
+
+  if (nil == eventPath) {
+    NSString *description = [NSString stringWithFormat:@"'%@' action with pressure must be preceeded with at least one '%@' action without this option", self.class.actionName, self.class.actionName];
+    if (error) {
+      *error = [[FBErrorBuilder.builder withDescription:description] build];
+    }
+    return nil;
+  }
+  if (![XCUIDevice sharedDevice].supportsPressureInteraction) {
+    if (error) {
+      *error = [[FBErrorBuilder.builder withDescription:@"This device does not support force press interactions"] build];
+    }
+    return nil;
+  }
+  [eventPath pressDownWithPressure:self.pressure.doubleValue
+                          atOffset:FBMillisToSeconds(self.offset)];
+  return @[];
 }
 
 @end

package/WebDriverAgentTests/IntegrationTests/FBW3CTouchActionsIntegrationTests.m

@@ -12,6 +12,7 @@
 #import "FBIntegrationTestCase.h"
 
 #import "XCUIElement.h"
+#import "XCUIDevice.h"
 #import "XCUIApplication+FBTouchAction.h"
 #import "FBTestMacros.h"
 #import "XCUIDevice+FBRotation.h"
@@ -309,13 +310,13 @@
       @"id": @"finger1",
       @"parameters": @{@"pointerType": @"touch"},
       @"actions": @[
-          @{@"type": @"pointerMove", @"duration": @0, @"origin": self.testedApplication.buttons[FBShowAlertButtonName], @"x": @0, @"y": @0},
+          @{@"type": @"pointerMove", @"duration": @0, @"origin": self.testedApplication.buttons[FBShowAlertButtonName]},
           @{@"type": @"pointerDown"},
-          @{@"type": @"pause", @"duration": @100},
+          @{@"type": @"pause", @"duration": @50},
           @{@"type": @"pointerUp"},
-          @{@"type": @"pause", @"duration": @40},
+          @{@"type": @"pause", @"duration": @200},
           @{@"type": @"pointerDown"},
-          @{@"type": @"pause", @"duration": @100},
+          @{@"type": @"pause", @"duration": @50},
           @{@"type": @"pointerUp"},
           ],
       },
@@ -371,6 +372,32 @@
   [self verifyGesture:gesture orientation:orientation];
 }
 
+- (void)testForceTap
+{
+  if (![XCUIDevice.sharedDevice supportsPressureInteraction]) {
+    return;
+  }
+
+  NSArray<NSDictionary<NSString *, id> *> *gesture =
+  @[@{
+      @"type": @"pointer",
+      @"id": @"finger1",
+      @"parameters": @{@"pointerType": @"touch"},
+      @"actions": @[
+          @{@"type": @"pointerMove", @"duration": @0, @"origin": self.testedApplication.buttons[FBShowAlertButtonName]},
+          @{@"type": @"pointerDown"},
+          @{@"type": @"pause", @"duration": @500},
+          @{@"type": @"pointerDown", @"pressure": @1.0},
+          @{@"type": @"pause", @"duration": @50},
+          @{@"type": @"pointerDown", @"pressure": @1.0},
+          @{@"type": @"pause", @"duration": @50},
+          @{@"type": @"pointerUp"},
+          ],
+      },
+    ];
+  [self verifyGesture:gesture orientation:UIDeviceOrientationLandscapeLeft];
+}
+
 @end
 
 

package/WebDriverAgentTests/IntegrationTests/XCUIDeviceHelperTests.m

@@ -23,18 +23,28 @@
 
 @implementation XCUIDeviceHelperTests
 
+- (void)restorePortraitOrientation
+{
+  if ([XCUIDevice sharedDevice].orientation != UIDeviceOrientationPortrait) {
+    [[XCUIDevice sharedDevice] fb_setDeviceInterfaceOrientation:UIDeviceOrientationPortrait];
+  }
+}
+
 - (void)setUp
 {
   [super setUp];
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    [self launchApplication];
-  });
+  [self launchApplication];
+  [self restorePortraitOrientation];
+}
+
+- (void)tearDown
+{
+  [self restorePortraitOrientation];
+  [super tearDown];
 }
 
 - (void)testScreenshot
 {
-  [[XCUIDevice sharedDevice] fb_setDeviceInterfaceOrientation:UIDeviceOrientationPortrait];
   NSError *error = nil;
   NSData *screenshotData = [[XCUIDevice sharedDevice] fb_screenshotWithError:&error];
   XCTAssertNotNil(screenshotData);
@@ -56,7 +66,7 @@
 
 - (void)testLandscapeScreenshot
 {
-  [[XCUIDevice sharedDevice] fb_setDeviceInterfaceOrientation:UIDeviceOrientationLandscapeLeft];
+  XCTAssertTrue([[XCUIDevice sharedDevice] fb_setDeviceInterfaceOrientation:UIDeviceOrientationLandscapeLeft]);
   NSError *error = nil;
   NSData *screenshotData = [[XCUIDevice sharedDevice] fb_screenshotWithError:&error];
   XCTAssertNotNil(screenshotData);

package/package.json

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