[java] WebSocket connection for vnc session is not using the --sub-pa…

…th argument Signed-off-by: Viet Nguyen Duc <[email protected]>
NDViet · Nov 29, 2023 · 0a8db17 · 0a8db17
1 parent 36585d1
commit 0a8db17
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/java/src/org/openqa/selenium/grid/node/local/LocalNode.java b/java/src/org/openqa/selenium/grid/node/local/LocalNode.java
@@ -838,6 +838,9 @@ private Session createExternalSession(
   private URI rewrite(String path) {
     try {
       String scheme = "https".equals(gridUri.getScheme()) ? "wss" : "ws";
+      if (gridUri.getPath() != null && !gridUri.getPath().isEmpty()) {
+        path = gridUri.getPath() + path;
+      }
       return new URI(
           scheme, gridUri.getUserInfo(), gridUri.getHost(), gridUri.getPort(), path, null, null);
     } catch (URISyntaxException e) {

diff --git a/java/test/org/openqa/selenium/grid/node/config/NodeOptionsTest.java b/java/test/org/openqa/selenium/grid/node/config/NodeOptionsTest.java
@@ -235,6 +235,36 @@ void platformNameIsAddedByDefault() {
         .hasSize(reported.size());
   }
 
+  @Test
+  void seVncUrlSeCdpUrlCapabilityWhenGridUrlWithSubPath() {
+    String gridUrl = "http://localhost:4444/subPath";
+    Config config = new MapConfig(singletonMap("node", singletonMap("grid-url", gridUrl)));
+
+    List<Capabilities> reported = new ArrayList<>();
+    NodeOptions nodeOptions = new NodeOptions(config);
+    NodeOptions nodeOptionsSpy = Mockito.spy(nodeOptions);
+    Mockito.doReturn(true).when(nodeOptionsSpy).isVncEnabled();
+    nodeOptionsSpy.getSessionFactories(
+      caps -> {
+        reported.add(caps);
+        return Collections.singleton(HelperFactory.create(config, caps));
+      });
+
+    assertThat(reported)
+      .filteredOn(
+        capabilities ->
+          capabilities.getCapability("se:vnc") != null
+          && String.valueOf(capabilities.getCapability("se:vnc")).contains(gridUrl))
+      .hasSize(reported.size());
+
+    assertThat(reported)
+      .filteredOn(
+        capabilities ->
+          capabilities.getCapability("se:cdp") != null
+          && String.valueOf(capabilities.getCapability("se:cdp")).contains(gridUrl))
+      .hasSize(reported.size());
+  }
+
   @Test
   void vncEnabledCapabilityIsAddedWhenEnvVarIsTrue() {
     Config config = new MapConfig(singletonMap("node", singletonMap("detect-drivers", "false")));