appium-mac2-driver 1.18.1 → 1.19.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.19.0](https://github.com/appium/appium-mac2-driver/compare/v1.18.2...v1.19.0) (2024-08-01)
+
+
+### Features
+
+* Add open-wda script ([#312](https://github.com/appium/appium-mac2-driver/issues/312)) ([f5cfa81](https://github.com/appium/appium-mac2-driver/commit/f5cfa8104b11d569a19122482543e90dfa2e4735))
+
+## [1.18.2](https://github.com/appium/appium-mac2-driver/compare/v1.18.1...v1.18.2) (2024-07-21)
+
+
+### Bug Fixes
+
+* do nothing for an empty array in w3c actions ([#308](https://github.com/appium/appium-mac2-driver/issues/308)) ([a1aa636](https://github.com/appium/appium-mac2-driver/commit/a1aa636d8856c97b8edb1c091b3919a45a6d6716))
+
 ## [1.18.1](https://github.com/appium/appium-mac2-driver/compare/v1.18.0...v1.18.1) (2024-07-20)
 
 

package/README.md

@@ -730,6 +730,15 @@ boundElementsByIndex | boolean | Whether to use elements binding by index (`true
 useDefaultUiInterruptionsHandling | boolean | Whether to use the default XCTest UI interruptions handling (`true`, the default setting) or to disable it for the [Application Under Test](#application-under-test-concept) (`false`). It makes sense to disable the default handler if it is necessary to validate the interrupting element's presence in your test or do some other actions on it rather than just closing the view implicitly. Check [this WWDC presentation](https://developer.apple.com/videos/play/wwdc2020/10220/) from Apple to get more details on the UI interruptions handling.
 
 
+## Scripts
+
+The Mac2 driver supports the following scripts:
+
+### open-wda
+
+Run `appium driver run mac2 open-wda` to open the bundled WebDriverAgentMac source in Xcode and to print the path to the main .xcodeproj file into the Terminal.
+
+
 ## Examples
 
 ```python

package/WebDriverAgentMac/IntegrationTests/AMW3CActionsTests.m

@@ -370,4 +370,25 @@
   XCTAssertEqualObjects(edit.value, @"NBA");
 }
 
+- (void)testKeysWithEmptyActions
+{
+  [self switchToEditsTab];
+  XCUIElement *edit = self.testedApplication.textFields.firstMatch;
+  [edit click];
+
+  NSArray<NSDictionary<NSString *, id> *> *gesture =
+  @[@{
+    @"type": @"key",
+    @"id": @"keyboard",
+    @"actions": @[],
+  },
+  ];
+  NSError *error;
+  XCTAssertTrue([self.testedApplication fb_performW3CActions:gesture
+                                                elementCache:nil
+                                                       error:&error]);
+  XCTAssertNil(error);
+  XCTAssertEqualObjects(edit.value, @"");
+}
+
 @end

package/WebDriverAgentMac/WebDriverAgentLib/Utilities/FBW3CActionsSynthesizer.m

@@ -260,7 +260,7 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
     }
     return nil;
   }
-  
+
   XCUIElement *element = isOriginAnElement ? (XCUIElement *)origin : nil;
   NSNumber *x = [self.actionItem objectForKey:FB_ACTION_ITEM_KEY_X];
   NSNumber *y = [self.actionItem objectForKey:FB_ACTION_ITEM_KEY_Y];
@@ -272,7 +272,7 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
     }
     return nil;
   }
-  
+
   if (nil != element) {
     if (nil == x && nil == y) {
       return [self hitpointWithElement:element
@@ -283,13 +283,13 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
                       positionOffset:[NSValue am_valueWithCGPoint:CGPointMake(x.floatValue, y.floatValue)]
                                error:error];
   }
-  
+
   if ([origin isKindOfClass:NSString.class] && [origin isEqualToString:FB_ORIGIN_TYPE_VIEWPORT]) {
     return [self hitpointWithElement:nil
                       positionOffset:[NSValue am_valueWithCGPoint:CGPointMake(x.floatValue, y.floatValue)]
                                error:error];
   }
-  
+
   // origin == FB_ORIGIN_TYPE_POINTER
   if (nil == self.previousItem) {
     NSString *errorDescription = [NSString stringWithFormat:@"There is no previous item for '%@' action item, however %@ is set to '%@'", self.actionItem, FB_ACTION_ITEM_KEY_ORIGIN, FB_ORIGIN_TYPE_POINTER];
@@ -734,7 +734,7 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
       shouldCancelNextItem = YES;
       continue;
     }
-    
+
     if (nil == self.elementCache) {
       [result addObject:actionItem];
       continue;
@@ -874,7 +874,7 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
 
   NSArray<NSDictionary<NSString *, id> *> *actionItems = [actionDescription objectForKey:FB_KEY_ACTIONS];
   if (nil == actionItems || 0 == actionItems.count) {
-   NSString *description = [NSString stringWithFormat:@"It is mandatory to have at least one gesture item defined for each action. Action with id '%@' contains none", actionId];
+    NSString *description = [NSString stringWithFormat:@"It is mandatory to have at least one gesture item defined for each action. Action with id '%@' contains none", actionId];
     if (error) {
       *error = [[FBErrorBuilder.builder withDescription:description] build];
     }
@@ -959,6 +959,19 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
       }
       return nil;
     }
+    NSArray<NSDictionary<NSString *, id> *> *actionItems = [action objectForKey:FB_KEY_ACTIONS];
+    if (nil == actionItems) {
+     NSString *description = [NSString stringWithFormat:@"It is mandatory to have at least one item defined for each action. Action with id '%@' contains none", actionId];
+      if (error) {
+        *error = [[FBErrorBuilder.builder withDescription:description] build];
+      }
+      return nil;
+    }
+    if (0 == actionItems.count) {
+      [FBLogger logFmt:@"Action items in the action id '%@' had an empty array. Skipping the action.", actionId];
+      continue;
+    }
+
     [actionIds addObject:actionId];
     [actionsMapping setObject:action forKey:actionId];
   }