Stop propagating grid-specific capabilities and capabilities with nul…

…l values to the driver
SeleniumHQ · Dec 1, 2017 · 9f5c1e8 · 9f5c1e8
1 parent 7055d6f
commit 9f5c1e8
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/java/server/src/org/openqa/selenium/remote/server/SeleniumServer.java b/java/server/src/org/openqa/selenium/remote/server/SeleniumServer.java
@@ -28,6 +28,7 @@
 import org.openqa.grid.shared.GridNodeServer;
 import org.openqa.grid.web.servlet.DisplayHelpServlet;
 import org.openqa.grid.web.servlet.beta.ConsoleServlet;
+import org.openqa.selenium.ImmutableCapabilities;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.remote.server.handler.DeleteSession;
@@ -47,6 +48,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import javax.servlet.Servlet;
 
@@ -205,6 +207,10 @@ private NewSessionPipeline createPipeline(StandaloneConfiguration configuration)
           caps -> {
             builder.addCapabilitiesMutator(new ChromeMutator(caps));
             builder.addCapabilitiesMutator(new FirefoxMutator(caps));
+            builder.addCapabilitiesMutator(c -> new ImmutableCapabilities(c.asMap().entrySet().stream()
+                .filter(e -> ! e.getKey().startsWith("se:"))
+                .filter(e -> e.getValue() != null)
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))));
           }
       );
     }