fix: Sync the session creation arguments and status response with W3C spec (#203)

Author: mykola-mokhnach

WebDriverAgentLib/Commands/FBSessionCommands.m

@@ -80,7 +80,11 @@ + (NSArray *)routes
 {
   NSDictionary<NSString *, id> *requirements;
   NSError *error;
-  if (nil == (requirements = FBParseCapabilities(request.arguments, &error))) {
+  if (![request.arguments[@"capabilities"] isKindOfClass:NSDictionary.class]) {
+    return FBResponseWithStatus([FBCommandStatus sessionNotCreatedError:@"'capabilities' is mandatory to create a new session"
+                                                              traceback:nil]);
+  }
+  if (nil == (requirements = FBParseCapabilities(request.arguments[@"capabilities"], &error))) {
     return FBResponseWithStatus([FBCommandStatus sessionNotCreatedError:error.description traceback:nil]);
   }
   [FBConfiguration setShouldUseTestManagerForVisibilityDetection:[requirements[@"shouldUseTestManagerForVisibilityDetection"] boolValue]];
@@ -188,6 +192,8 @@ + (NSArray *)routes
 
   return FBResponseWithObject(
     @{
+      @"ready" : @YES,
+      @"message" : @"WebDriverAgent is ready to accept commands",
       @"state" : @"success",
       @"os" :
         @{

WebDriverAgentLib/Utilities/FBAppiumActionsSynthesizer.m

@@ -397,7 +397,7 @@ @implementation FBAppiumActionsSynthesizer
       continue;
     }
     NSMutableDictionary<NSString *, id> *processedItem = touchItem.mutableCopy;
-    [processedItem setObject:FBInsertElement((id) [processedItem objectForKey:FB_OPTIONS_KEY], element)
+    [processedItem setObject:FBInsertElement(FBCleanupElements(options), element)
                       forKey:FB_OPTIONS_KEY];
     [result addObject:processedItem.copy];
   }

WebDriverAgentLib/Utilities/FBProtocolHelpers.h

@@ -28,6 +28,14 @@ NSDictionary *FBInsertElement(NSDictionary *dst, id element);
  */
 id _Nullable FBExtractElement(NSDictionary *src);
 
+/**
+ Cleanup items having element keys from the dictionary
+ 
+ @param src The source dictionary
+ @returns The resulting dictionary
+ */
+NSDictionary *FBCleanupElements(NSDictionary *src);
+
 /**
  Parses key/value pairs of valid W3C capabilities
 

WebDriverAgentLib/Utilities/FBProtocolHelpers.m

@@ -39,6 +39,18 @@ id FBExtractElement(NSDictionary *src)
   return nil;
 }
 
+NSDictionary *FBCleanupElements(NSDictionary *src)
+{
+  NSMutableDictionary *result = src.mutableCopy;
+  for (NSString* key in src) {
+    if ([key.lowercaseString isEqualToString:W3C_ELEMENT_KEY.lowercaseString]
+        || [key.lowercaseString isEqualToString:JSONWP_ELEMENT_KEY.lowercaseString]) {
+      [result removeObjectForKey:key];
+    }
+  }
+  return result.copy;
+}
+
 NSArray<NSString *> *standardCapabilities(void)
 {
   static NSArray<NSString *> *standardCaps;