[cdp] Make sure that CDP commands work over the Grid

Author: shs96c

java/client/test/org/openqa/selenium/devtools/BUILD.bazel

@@ -10,6 +10,9 @@ java_selenium_test_suite(
         "firefox",
         "edge",
     ],
+    tags = [
+        "selenium-remote",
+    ],
     deps = [
         ":test-lib",
         "//java/client/src/org/openqa/selenium/devtools",

java/client/test/org/openqa/selenium/devtools/CdpFacadeTest.java

@@ -28,6 +28,9 @@
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.http.Route;
 import org.openqa.selenium.support.devtools.NetworkInterceptor;
+import org.openqa.selenium.testing.Ignore;
+import org.openqa.selenium.testing.NotYetImplemented;
+import org.openqa.selenium.testing.drivers.Browser;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assumptions.assumeThat;
@@ -50,6 +53,7 @@ public static void stopServer() {
   }
 
   @Test
+  @NotYetImplemented(value = Browser.FIREFOX, reason = "Network interception not yet supported")
   public void networkInterceptorAndAuthHandlersDoNotFight() {
     assumeThat(driver).isInstanceOf(HasAuthentication.class);
 
@@ -81,6 +85,7 @@ public void networkInterceptorAndAuthHandlersDoNotFight() {
   }
 
   @Test
+  @NotYetImplemented(value = Browser.FIREFOX, reason = "Network interception not yet supported")
   public void canAuthenticate() {
     assumeThat(driver).isInstanceOf(HasAuthentication.class);
 

java/client/test/org/openqa/selenium/devtools/ChangeUserAgentTest.java

@@ -17,22 +17,23 @@
 
 package org.openqa.selenium.devtools;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.devtools.idealized.Network;
+import org.openqa.selenium.testing.NotYetImplemented;
+import org.openqa.selenium.testing.drivers.Browser;
 
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class ChangeUserAgentTest extends DevToolsTestBase {
 
   @Test
-  public void canChangeUserAgent() throws InterruptedException, ExecutionException, TimeoutException {
+  @NotYetImplemented(value = Browser.FIREFOX, reason = "Network interception not yet supported")
+  public void canChangeUserAgent() {
     devTools.getDomains().network().setUserAgent(
       new Network.UserAgent("Camembert 1.0")
         .platform("FreeBSD").acceptLanguage("da, en-gb, *"));

java/client/test/org/openqa/selenium/devtools/ConsoleEventsTest.java

@@ -23,6 +23,8 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.devtools.events.ConsoleEvent;
 import org.openqa.selenium.environment.webserver.Page;
+import org.openqa.selenium.testing.NotYetImplemented;
+import org.openqa.selenium.testing.drivers.Browser;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -32,6 +34,7 @@
 public class ConsoleEventsTest extends DevToolsTestBase {
 
   @Test
+  @NotYetImplemented(value = Browser.FIREFOX, reason = "`Log` domain not yet supported")
   public void canWatchConsoleEvents() throws InterruptedException, ExecutionException, TimeoutException {
     String page = appServer.create(
       new Page()

java/client/test/org/openqa/selenium/devtools/JavascriptExceptionsTest.java

@@ -17,21 +17,24 @@
 
 package org.openqa.selenium.devtools;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptException;
 import org.openqa.selenium.environment.webserver.Page;
+import org.openqa.selenium.testing.NotYetImplemented;
+import org.openqa.selenium.testing.drivers.Browser;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class JavascriptExceptionsTest extends DevToolsTestBase {
 
   @Test
+  @NotYetImplemented(value = Browser.FIREFOX, reason = "`Log` domain not yet supported")
   public void canWatchJavascriptExceptions() throws InterruptedException, ExecutionException, TimeoutException {
     String page = appServer.create(
       new Page()

java/client/test/org/openqa/selenium/testing/drivers/OutOfProcessSeleniumServer.java

@@ -66,9 +66,17 @@ public OutOfProcessSeleniumServer start(String mode, String... extraFlags) {
     String localAddress = new NetworkUtils().getPrivateLocalAddress();
     baseUrl = String.format("http://%s:%d", localAddress, port);
 
-    command = new CommandLine("java", Stream.concat(
+    // Make sure we inherit system properties.
+    Stream<String> javaFlags = System.getProperties().entrySet().stream()
+      .filter(entry -> {
+        String key = String.valueOf(entry.getKey());
+        return key.startsWith("selenium") || key.startsWith("webdriver");
+      })
+      .map(entry -> "-D" + entry.getKey() + "=" + entry.getValue());
+
+    command = new CommandLine("java", Stream.concat(javaFlags, Stream.concat(
       Stream.of("-jar", serverJar, mode, "--port", String.valueOf(port)),
-      Stream.of(extraFlags)).toArray(String[]::new));
+      Stream.of(extraFlags))).toArray(String[]::new));
     if (Platform.getCurrent().is(Platform.WINDOWS)) {
       File workingDir = findBinRoot(new File(".").getAbsoluteFile());
       command.setWorkingDirectory(workingDir.getAbsolutePath());

java/client/test/org/openqa/selenium/testing/drivers/RemoteSupplier.java

@@ -19,6 +19,7 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.remote.Augmenter;
 import org.openqa.selenium.remote.LocalFileDetector;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
@@ -59,7 +60,7 @@ public WebDriver get() {
 
     RemoteWebDriver driver = new RemoteWebDriver(serverUrl, desiredCapabilities);
     driver.setFileDetector(new LocalFileDetector());
-    return driver;
+    return new Augmenter().augment(driver);
   }
 
   private synchronized void startServer() {