grid hub getting desired capabilites needs to account for w3c only re…

…quests.
SeleniumHQ · Oct 7, 2016 · 1afc18b · 1afc18b
1 parent d247a6f
commit 1afc18b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/java/server/src/org/openqa/grid/web/servlet/handler/WebDriverRequest.java b/java/server/src/org/openqa/grid/web/servlet/handler/WebDriverRequest.java
@@ -67,6 +67,11 @@ public Map<String, Object> extractDesiredCapability() {
     String json = getBody();
     try {
       JsonObject map = new JsonParser().parse(json).getAsJsonObject();
+      // Current W3C has required / desired capabilities wrapped in a 'capabilites' object.
+      // This will need to be updated if/when https://github.com/w3c/webdriver/pull/327 gets merged
+      if (map.has("capabilities")) {
+        return new JsonToBeanConverter().convert(Map.class, map.getAsJsonObject("capabilities").getAsJsonObject("desiredCapabilities"));
+      }
       JsonObject dc = map.get("desiredCapabilities").getAsJsonObject();
       return new JsonToBeanConverter().convert(Map.class, dc);