[bazel] Get the chrome tests running on EngFlow

Author: shs96c

java/test/org/openqa/selenium/chrome/ChromeDriverFunctionalTest.java

@@ -24,10 +24,13 @@
 import static org.assertj.core.api.Assumptions.assumeThat;
 import static org.openqa.selenium.testing.drivers.Browser.CHROME;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.Uninterruptibles;
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
+
+import org.assertj.core.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.JavascriptExecutor;
@@ -44,6 +47,7 @@
 import org.openqa.selenium.testing.Ignore;
 import org.openqa.selenium.testing.JupiterTestBase;
 import org.openqa.selenium.testing.NoDriverBeforeTest;
+import org.openqa.selenium.testing.drivers.Browser;
 
 class ChromeDriverFunctionalTest extends JupiterTestBase {
 
@@ -53,6 +57,9 @@ class ChromeDriverFunctionalTest extends JupiterTestBase {
   @Test
   @NoDriverBeforeTest
   public void builderGeneratesDefaultChromeOptions() {
+    // This test won't pass if we want to use Chrome in a non-standard location
+    Assumptions.assumeThat(System.getProperty("webdriver.chrome.binary")).isNull();
+
     localDriver = ChromeDriver.builder().build();
     Capabilities capabilities = ((ChromeDriver) localDriver).getCapabilities();
 
@@ -63,7 +70,7 @@ public void builderGeneratesDefaultChromeOptions() {
   @Test
   @NoDriverBeforeTest
   public void builderOverridesDefaultChromeOptions() {
-    ChromeOptions options = new ChromeOptions();
+    ChromeOptions options = (ChromeOptions) CHROME.getCapabilities();
     options.setImplicitWaitTimeout(Duration.ofMillis(1));
     localDriver = ChromeDriver.builder().oneOf(options).build();
     assertThat(localDriver.manage().timeouts().getImplicitWaitTimeout())
@@ -80,7 +87,7 @@ public void driverOverridesDefaultClientConfig() {
               localDriver =
                   new ChromeDriver(
                       ChromeDriverService.createDefaultService(),
-                      new ChromeOptions(),
+                    (ChromeOptions) CHROME.getCapabilities(),
                       clientConfig);
             })
         .isInstanceOf(SessionNotCreatedException.class);
@@ -89,7 +96,7 @@ public void driverOverridesDefaultClientConfig() {
   @Test
   void builderWithClientConfigThrowsException() {
     ClientConfig clientConfig = ClientConfig.defaultConfig().readTimeout(Duration.ofMinutes(1));
-    RemoteWebDriverBuilder builder = ChromeDriver.builder().config(clientConfig);
+    RemoteWebDriverBuilder builder = ChromeDriver.builder().oneOf(CHROME.getCapabilities()).config(clientConfig);
 
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(builder::build)

java/test/org/openqa/selenium/chrome/ChromeOptionsFunctionalTest.java

@@ -17,33 +17,37 @@
 
 package org.openqa.selenium.chrome;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Base64;
+import com.google.common.collect.ImmutableMap;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.build.InProject;
 import org.openqa.selenium.testing.JupiterTestBase;
 import org.openqa.selenium.testing.NoDriverBeforeTest;
-import org.openqa.selenium.testing.TestUtilities;
+import org.openqa.selenium.testing.drivers.Browser;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Base64;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
 
 class ChromeOptionsFunctionalTest extends JupiterTestBase {
 
   private static final String EXT_PATH = "common/extensions/webextensions-selenium-example.crx";
 
+  @AfterAll
+  public static void resetBrowser() {
+    seleniumExtension.removeDriver();
+  }
+
   @Test
-  @NoDriverBeforeTest
   public void canStartChromeWithCustomOptions() {
-    ChromeOptions options = new ChromeOptions();
-    if (TestUtilities.isOnTravis()) {
-      options.addArguments("--headless=chrome");
-    }
+    ChromeOptions options = (ChromeOptions) Browser.CHROME.getCapabilities();
     options.addArguments("user-agent=foo;bar");
-    localDriver = new ChromeDriver(options);
+    localDriver = seleniumExtension.createNewDriver(options);
 
     localDriver.get(pages.clickJacker);
     Object userAgent =
@@ -63,12 +67,9 @@ void optionsStayEqualAfterSerialization() {
   @Test
   @NoDriverBeforeTest
   public void canSetAcceptInsecureCerts() {
-    ChromeOptions options = new ChromeOptions();
-    if (TestUtilities.isOnTravis()) {
-      options.addArguments("--headless=chrome");
-    }
+    ChromeOptions options = (ChromeOptions) Browser.CHROME.getCapabilities();
     options.setAcceptInsecureCerts(true);
-    localDriver = new ChromeDriver(options);
+    localDriver = seleniumExtension.createNewDriver(options);
 
     assertThat(((ChromeDriver) localDriver).getCapabilities().getCapability(ACCEPT_INSECURE_CERTS))
         .isEqualTo(true);
@@ -77,15 +78,11 @@ public void canSetAcceptInsecureCerts() {
   @Test
   @NoDriverBeforeTest
   public void canAddExtensionFromFile() {
-    ChromeOptions options = new ChromeOptions();
-    if (TestUtilities.isOnTravis()) {
-      options.addArguments("--headless=chrome");
-    }
+    ChromeOptions options = createChromeOptionsForExtensions();
     options.addExtensions(InProject.locate(EXT_PATH).toFile());
-    localDriver = new ChromeDriver(options);
-
-    localDriver.get(pages.echoPage);
+    localDriver = seleniumExtension.createNewDriver(options);
 
+    localDriver.get(toLocalUrl(pages.echoPage));
     WebElement footerElement = localDriver.findElement(By.id("webextensions-selenium-example"));
 
     String footText = footerElement.getText();
@@ -95,13 +92,10 @@ public void canAddExtensionFromFile() {
   @Test
   @NoDriverBeforeTest
   public void canAddExtensionFromStringEncodedInBase64() throws IOException {
-    ChromeOptions options = new ChromeOptions();
-    if (TestUtilities.isOnTravis()) {
-      options.addArguments("--headless=chrome");
-    }
+    ChromeOptions options = createChromeOptionsForExtensions();
     options.addEncodedExtensions(
         Base64.getEncoder().encodeToString(Files.readAllBytes(InProject.locate(EXT_PATH))));
-    localDriver = new ChromeDriver(options);
+    localDriver = seleniumExtension.createNewDriver(options);
 
     localDriver.get(pages.echoPage);
 
@@ -110,4 +104,9 @@ public void canAddExtensionFromStringEncodedInBase64() throws IOException {
     String footText = footerElement.getText();
     assertThat(footText).isEqualTo("Content injected by webextensions-selenium-example");
   }
+
+  private ChromeOptions createChromeOptionsForExtensions() {
+    ChromeOptions options = (ChromeOptions) Browser.CHROME.getCapabilities();
+    return options.setExperimentalOption("prefs", ImmutableMap.of("extensions.ui.developer_mode", true));
+  }
 }

java/test/org/openqa/selenium/testing/JupiterTestBase.java

@@ -19,6 +19,8 @@
 
 import static org.assertj.core.api.Assumptions.assumeThat;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.time.Duration;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -35,7 +37,7 @@
 
 public abstract class JupiterTestBase {
 
-  @RegisterExtension static SeleniumExtension seleniumExtension = new SeleniumExtension();
+  @RegisterExtension protected static SeleniumExtension seleniumExtension = new SeleniumExtension();
 
   protected TestEnvironment environment;
   protected AppServer appServer;
@@ -79,6 +81,15 @@ public void removeDriver() {
     seleniumExtension.removeDriver();
   }
 
+  public String toLocalUrl(String url) {
+    try {
+      URL original = new URL(url);
+      return new URL(original.getProtocol(), "localhost", original.getPort(), original.getFile()).toString();
+    } catch (MalformedURLException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   protected WebDriverWait wait(WebDriver driver) {
     return new WebDriverWait(driver, Duration.ofSeconds(10));
   }

java/test/org/openqa/selenium/testing/drivers/Browser.java

@@ -48,11 +48,10 @@ public Capabilities getCapabilities() {
       }
 
       if (Boolean.getBoolean("webdriver.headless")) {
-        options.addArguments("--headless=chrome");
+        options.addArguments("--headless=new");
       }
 
       options.addArguments(
-          "disable-extensions",
           "disable-infobars",
           "disable-breakpad",
           "disable-dev-shm-usage",

java/test/org/openqa/selenium/virtualauthenticator/VirtualAuthenticatorTest.java

@@ -79,14 +79,7 @@ public void setup() throws MalformedURLException {
     // over HTTPS, the `registerCredential` method is missing. Let's
     // make the assumption that the server being used is running on
     // `localhost` and rewrite URLs from there.
-    URL url = new URL(appServer.whereIs("virtual-authenticator.html"));
-    String localUrl = new URL(
-      url.getProtocol(),
-      "localhost",
-      url.getPort(),
-      url.getFile()).toString();
-
-    driver.get(localUrl);
+    driver.get(toLocalUrl(appServer.whereIs("virtual-authenticator.html")));
   }
 
   private void createRKEnabledU2FAuthenticator() {