If a remote end does not explicitly state JavaScript support we suppo…

…se it's a "normal" browser that supports JavaScript
SeleniumHQ · Mar 30, 2017 · 70539cd · 70539cd
1 parent db0bcb3
commit 70539cd
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java b/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java
@@ -277,6 +277,17 @@ protected void startSession(Capabilities desiredCapabilities,
     }
     returnedCapabilities.setPlatform(platform);
 
+    if (rawCapabilities.containsKey(SUPPORTS_JAVASCRIPT)) {
+      Object raw = rawCapabilities.get(SUPPORTS_JAVASCRIPT);
+      if (raw instanceof String) {
+        returnedCapabilities.setCapability(SUPPORTS_JAVASCRIPT, Boolean.parseBoolean((String) raw));
+      } else if (raw instanceof Boolean) {
+        returnedCapabilities.setCapability(SUPPORTS_JAVASCRIPT, ((Boolean) raw).booleanValue());
+      }
+    } else {
+      returnedCapabilities.setCapability(SUPPORTS_JAVASCRIPT, true);
+    }
+
     capabilities = returnedCapabilities;
     sessionId = new SessionId(response.getSessionId());
   }