Skip to content

Commit 9f5c1e8

Browse files
committed
Stop propagating grid-specific capabilities and capabilities with null values to the driver
1 parent 7055d6f commit 9f5c1e8

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

java/server/src/org/openqa/selenium/remote/server/SeleniumServer.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.openqa.grid.shared.GridNodeServer;
2929
import org.openqa.grid.web.servlet.DisplayHelpServlet;
3030
import org.openqa.grid.web.servlet.beta.ConsoleServlet;
31+
import org.openqa.selenium.ImmutableCapabilities;
3132
import org.openqa.selenium.Platform;
3233
import org.openqa.selenium.remote.SessionId;
3334
import org.openqa.selenium.remote.server.handler.DeleteSession;
@@ -47,6 +48,7 @@
4748
import java.util.Map;
4849
import java.util.concurrent.TimeUnit;
4950
import java.util.logging.Logger;
51+
import java.util.stream.Collectors;
5052

5153
import javax.servlet.Servlet;
5254

@@ -205,6 +207,10 @@ private NewSessionPipeline createPipeline(StandaloneConfiguration configuration)
205207
caps -> {
206208
builder.addCapabilitiesMutator(new ChromeMutator(caps));
207209
builder.addCapabilitiesMutator(new FirefoxMutator(caps));
210+
builder.addCapabilitiesMutator(c -> new ImmutableCapabilities(c.asMap().entrySet().stream()
211+
.filter(e -> ! e.getKey().startsWith("se:"))
212+
.filter(e -> e.getValue() != null)
213+
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))));
208214
}
209215
);
210216
}

0 commit comments

Comments
 (0)