Marionette: Fixing error handling to conform to the standard

Author: barancev

java/client/src/org/openqa/selenium/remote/JsonToBeanConverter.java

@@ -112,6 +112,12 @@ private <T> T convert(Class<T> clazz, Object source, int depth) {
                         ? (JsonObject) source
                         : new JsonParser().parse((String) source).getAsJsonObject();
 
+      if (json.has("error") && ! json.get("error").isJsonNull()) {
+        String state = json.get("error").getAsString();
+        response.setState(state);
+        response.setStatus(ErrorCodes.toStatus(state));
+        response.setValue(convert(Object.class, json.get("message")));
+      }
       if (json.has("state") && ! json.get("state").isJsonNull()) {
         String state = json.get("state").getAsString();
         response.setState(state);

java/client/test/org/openqa/selenium/TypingTest.java

@@ -632,7 +632,7 @@ public void testShouldNotTypeIntoElementsThatPreventKeyDownEvents() {
   }
 
   @JavascriptEnabled
-  @Ignore(value = {PHANTOMJS})
+  @Ignore(value = {PHANTOMJS, MARIONETTE})
   @NotYetImplemented(HTMLUNIT)
   @Test
   public void testGenerateKeyPressEventEvenWhenElementPreventsDefault() {