fix: remove custom actions delimiter configuration

Author: ihor-kravchenko-evinced

WebDriverAgentLib/Categories/XCUIElement+FBCustomActions.m

@@ -89,7 +89,7 @@ - (NSString *)fb_stringAttribute:(NSString *)attributeName
       NSLog(@"[FBCustomActions] Custom action title: %@", title);
     }
 
-    NSString *joined = [stringified componentsJoinedByString:[FBConfiguration customActionsDelimiter]];
+    NSString *joined = [stringified componentsJoinedByString:@","];
     NSMutableDictionary *updated =
       (self.additionalAttributes ?: @{}).mutableCopy;
     updated[symbol] = joined;

WebDriverAgentLib/Commands/FBSessionCommands.m

@@ -356,7 +356,6 @@ + (NSArray *)routes
       FB_SETTING_INCLUDE_NATIVE_FRAME_IN_PAGE_SOURCE: @([FBConfiguration includeNativeFrameInPageSource]),
       FB_SETTING_INCLUDE_MIN_MAX_VALUE_IN_PAGE_SOURCE: @([FBConfiguration includeMinMaxValueInPageSource]),
       FB_SETTING_INCLUDE_CUSTOM_ACTIONS_IN_PAGE_SOURCE: @([FBConfiguration includeCustomActionsInPageSource]),
-      FB_SETTING_CUSTOM_ACTIONS_DELIMITER: [FBConfiguration customActionsDelimiter],
       FB_SETTING_ENFORCE_CUSTOM_SNAPSHOTS: @([FBConfiguration enforceCustomSnapshots]),
       FB_SETTING_LIMIT_XPATH_CONTEXT_SCOPE: @([FBConfiguration limitXpathContextScope]),
 #if !TARGET_OS_TV
@@ -472,9 +471,6 @@ + (NSArray *)routes
   if (nil != [settings objectForKey:FB_SETTING_INCLUDE_CUSTOM_ACTIONS_IN_PAGE_SOURCE]) {
     [FBConfiguration setIncludeCustomActionsInPageSource:[[settings objectForKey:FB_SETTING_INCLUDE_CUSTOM_ACTIONS_IN_PAGE_SOURCE] boolValue]];
   }
-  if (nil != [settings objectForKey:FB_SETTING_CUSTOM_ACTIONS_DELIMITER]) {
-    [FBConfiguration setCustomActionsDelimiter:(NSString *)[settings objectForKey:FB_SETTING_CUSTOM_ACTIONS_DELIMITER]];
-  }
   if (nil != [settings objectForKey:FB_SETTING_ENFORCE_CUSTOM_SNAPSHOTS]) {
     [FBConfiguration setEnforceCustomSnapshots:[[settings objectForKey:FB_SETTING_ENFORCE_CUSTOM_SNAPSHOTS] boolValue]];
   }

WebDriverAgentLib/Utilities/FBConfiguration.h

@@ -387,15 +387,6 @@ typedef NS_ENUM(NSInteger, FBConfigurationKeyboardPreference) {
 + (void)setIncludeCustomActionsInPageSource:(BOOL)enabled;
 + (BOOL)includeCustomActionsInPageSource;
 
-/**
- * Sets the delimiter string used when joining custom action names.
- * Defaults to ", " (comma followed by space).
- *
- * @param delimiter The delimiter string to use when joining custom actions
- */
-+ (void)setCustomActionsDelimiter:(NSString *)delimiter;
-+ (NSString *)customActionsDelimiter;
-
 /**
  * Whether to enforce the use of custom snapshots instead of standard snapshots.
  * When enabled, fb_customSnapshot is always invoked instead of fb_standardSnapshot

WebDriverAgentLib/Utilities/FBConfiguration.m

@@ -65,7 +65,6 @@
 static BOOL FBShouldIncludeMinMaxValueInPageSource = NO;
 static BOOL FBShouldIncludeCustomActionsInPageSource = NO;
 static BOOL FBShouldEnforceCustomSnapshots = NO;
-static NSString *FBCustomActionsDelimiter;
 
 @implementation FBConfiguration
 
@@ -544,7 +543,6 @@ + (void)resetSessionSettings
   FBSetCustomParameterForElementSnapshot(FBSnapshotMaxDepthKey, @50);
   FBUseClearTextShortcut = YES;
   FBLimitXpathContextScope = YES;
-  FBCustomActionsDelimiter = @", ";
 #if !TARGET_OS_TV
   FBScreenshotOrientation = UIInterfaceOrientationUnknown;
 #endif
@@ -700,16 +698,6 @@ + (BOOL)includeCustomActionsInPageSource
   return FBShouldIncludeCustomActionsInPageSource;
 }
 
-+ (void)setCustomActionsDelimiter:(NSString *)delimiter
-{
-  FBCustomActionsDelimiter = delimiter ?: @", ";
-}
-
-+ (NSString *)customActionsDelimiter
-{
-  return FBCustomActionsDelimiter ?: @", ";
-}
-
 + (void)setEnforceCustomSnapshots:(BOOL)enabled
 {
   FBShouldEnforceCustomSnapshots = enabled;

WebDriverAgentLib/Utilities/FBSettings.h

@@ -43,7 +43,6 @@ extern NSString *const FB_SETTING_INCLUDE_HITTABLE_IN_PAGE_SOURCE;
 extern NSString *const FB_SETTING_INCLUDE_NATIVE_FRAME_IN_PAGE_SOURCE;
 extern NSString *const FB_SETTING_INCLUDE_MIN_MAX_VALUE_IN_PAGE_SOURCE;
 extern NSString *const FB_SETTING_INCLUDE_CUSTOM_ACTIONS_IN_PAGE_SOURCE;
-extern NSString *const FB_SETTING_CUSTOM_ACTIONS_DELIMITER;
 extern NSString *const FB_SETTING_ENFORCE_CUSTOM_SNAPSHOTS;
 
 NS_ASSUME_NONNULL_END

WebDriverAgentLib/Utilities/FBSettings.m

@@ -39,5 +39,4 @@
 NSString* const FB_SETTING_INCLUDE_NATIVE_FRAME_IN_PAGE_SOURCE = @"includeNativeFrameInPageSource";
 NSString* const FB_SETTING_INCLUDE_MIN_MAX_VALUE_IN_PAGE_SOURCE = @"includeMinMaxValueInPageSource";
 NSString* const FB_SETTING_INCLUDE_CUSTOM_ACTIONS_IN_PAGE_SOURCE = @"includeCustomActionsInPageSource";
-NSString* const FB_SETTING_CUSTOM_ACTIONS_DELIMITER = @"customActionsDelimiter";
 NSString* const FB_SETTING_ENFORCE_CUSTOM_SNAPSHOTS = @"enforceCustomSnapshots";

WebDriverAgentTests/IntegrationTests/FBElementAttributeTests.m

@@ -258,7 +258,7 @@ - (void)testCustomActionsAttributes
   XCTAssertTrue(buttonElement.exists);
   NSString *customActions = buttonElement.wdCustomActions;
   XCTAssertNotNil(customActions, @"Button should have custom actions");
-  XCTAssertEqualObjects(customActions, @"Custom Action 1, Custom Action 2");
+  XCTAssertEqualObjects(customActions, @"Custom Action 1,Custom Action 2");
 }
 
 @end