chore: roll driver v1.10.0 (#360)

Author: yury-s

playwright/src/main/java/com/microsoft/playwright/Browser.java

@@ -124,11 +124,14 @@ class NewContextOptions {
      */
     public Boolean recordHarOmitContent;
     /**
-     * Path on the filesystem to write the HAR file to.
+     * Enables <a href="http://www.softwareishard.com/blog/har-12-spec">HAR</a> recording for all pages into the specified HAR
+     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link BrowserContext#close
+     * BrowserContext.close()} for the HAR to be saved.
      */
     public Path recordHarPath;
     /**
-     * Path to the directory to put videos into.
+     * Enables video recording for all pages into the specified directory. If not specified videos are not recorded. Make sure
+     * to call {@link BrowserContext#close BrowserContext.close()} for videos to be saved.
      */
     public Path recordVideoDir;
     /**
@@ -344,11 +347,14 @@ class NewPageOptions {
      */
     public Boolean recordHarOmitContent;
     /**
-     * Path on the filesystem to write the HAR file to.
+     * Enables <a href="http://www.softwareishard.com/blog/har-12-spec">HAR</a> recording for all pages into the specified HAR
+     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link BrowserContext#close
+     * BrowserContext.close()} for the HAR to be saved.
      */
     public Path recordHarPath;
     /**
-     * Path to the directory to put videos into.
+     * Enables video recording for all pages into the specified directory. If not specified videos are not recorded. Make sure
+     * to call {@link BrowserContext#close BrowserContext.close()} for videos to be saved.
      */
     public Path recordVideoDir;
     /**

playwright/src/main/java/com/microsoft/playwright/BrowserType.java

@@ -69,19 +69,9 @@ class LaunchOptions {
      */
     public List<String> args;
     /**
-     * Chromium distribution channel, one of
-     * <ul>
-     * <li> chrome</li>
-     * <li> chrome-beta</li>
-     * <li> chrome-dev</li>
-     * <li> chrome-canary</li>
-     * <li> msedge</li>
-     * <li> msedge-beta</li>
-     * <li> msedge-dev</li>
-     * <li> msedge-canary</li>
-     * </ul>
-     */
-    public String channel;
+     * Browser distribution channel.
+     */
+    public BrowserChannel channel;
     /**
      * Enable Chromium sandboxing. Defaults to {@code false}.
      */
@@ -158,7 +148,7 @@ public LaunchOptions setArgs(List<String> args) {
       this.args = args;
       return this;
     }
-    public LaunchOptions setChannel(String channel) {
+    public LaunchOptions setChannel(BrowserChannel channel) {
       this.channel = channel;
       return this;
     }
@@ -241,19 +231,9 @@ class LaunchPersistentContextOptions {
      */
     public Boolean bypassCSP;
     /**
-     * Chromium distribution channel, one of
-     * <ul>
-     * <li> chrome</li>
-     * <li> chrome-beta</li>
-     * <li> chrome-dev</li>
-     * <li> chrome-canary</li>
-     * <li> msedge</li>
-     * <li> msedge-beta</li>
-     * <li> msedge-dev</li>
-     * <li> msedge-canary</li>
-     * </ul>
+     * Browser distribution channel.
      */
-    public String channel;
+    public BrowserChannel channel;
     /**
      * Enable Chromium sandboxing. Defaults to {@code true}.
      */
@@ -365,11 +345,14 @@ class LaunchPersistentContextOptions {
      */
     public Boolean recordHarOmitContent;
     /**
-     * Path on the filesystem to write the HAR file to.
+     * Enables <a href="http://www.softwareishard.com/blog/har-12-spec">HAR</a> recording for all pages into the specified HAR
+     * file on the filesystem. If not specified, the HAR is not recorded. Make sure to call {@link BrowserContext#close
+     * BrowserContext.close()} for the HAR to be saved.
      */
     public Path recordHarPath;
     /**
-     * Path to the directory to put videos into.
+     * Enables video recording for all pages into the specified directory. If not specified videos are not recorded. Make sure
+     * to call {@link BrowserContext#close BrowserContext.close()} for videos to be saved.
      */
     public Path recordVideoDir;
     /**
@@ -415,7 +398,7 @@ public LaunchPersistentContextOptions setBypassCSP(boolean bypassCSP) {
       this.bypassCSP = bypassCSP;
       return this;
     }
-    public LaunchPersistentContextOptions setChannel(String channel) {
+    public LaunchPersistentContextOptions setChannel(BrowserChannel channel) {
       this.channel = channel;
       return this;
     }

playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java

@@ -38,6 +38,7 @@ static Gson gson() {
     if (gson == null) {
       gson = new GsonBuilder()
         .registerTypeAdapter(SameSiteAttribute.class, new SameSiteAdapter().nullSafe())
+        .registerTypeAdapter(BrowserChannel.class, new BrowserChannelSerializer())
         .registerTypeAdapter(ColorScheme.class, new ColorSchemeAdapter().nullSafe())
         .registerTypeAdapter(Media.class, new MediaSerializer())
         .registerTypeAdapter(ScreenshotType.class, new ToLowerCaseSerializer<ScreenshotType>())
@@ -295,6 +296,13 @@ public JsonElement serialize(Map<String, String> src, Type typeOfSrc, JsonSerial
     }
   }
 
+  private static class BrowserChannelSerializer implements JsonSerializer<BrowserChannel> {
+    @Override
+    public JsonElement serialize(BrowserChannel src, Type typeOfSrc, JsonSerializationContext context) {
+      return new JsonPrimitive(src.toString().toLowerCase().replace('_', '-'));
+    }
+  }
+
   private static class MediaSerializer implements JsonSerializer<Media> {
     @Override
     public JsonElement serialize(Media src, Type typeOfSrc, JsonSerializationContext context) {

playwright/src/main/java/com/microsoft/playwright/options/BrowserChannel.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.options;
+
+public enum BrowserChannel {
+  CHROME,
+  CHROME_BETA,
+  CHROME_DEV,
+  CHROME_CANARY,
+  MSEDGE,
+  MSEDGE_BETA,
+  MSEDGE_DEV,
+  MSEDGE_CANARY
+}

playwright/src/test/java/com/microsoft/playwright/TestBase.java

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.options.BrowserChannel;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -53,8 +54,22 @@ static boolean isFirefox() {
     return "firefox".equals(getBrowserNameFromEnv());
   }
 
-  private static String getBrowserChannelFromEnv() {
-    return System.getenv("BROWSER_CHANNEL");
+  private static BrowserChannel getBrowserChannelFromEnv() {
+    String channel = System.getenv("BROWSER_CHANNEL");
+    if (channel == null) {
+      return null;
+    }
+    switch (channel) {
+      case "chrome": return BrowserChannel.CHROME;
+      case "chrome-beta": return BrowserChannel.CHROME_BETA;
+      case "chrome-dev": return BrowserChannel.CHROME_DEV;
+      case "chrome-canary": return BrowserChannel.CHROME_CANARY;
+      case "msedge": return BrowserChannel.MSEDGE;
+      case "msedge-beta": return BrowserChannel.MSEDGE_BETA;
+      case "msedge-dev": return BrowserChannel.MSEDGE_DEV;
+      case "msedge-canary": return BrowserChannel.MSEDGE_CANARY;
+      default: throw new IllegalArgumentException("Unknown BROWSER_CHANNEL " + channel);
+    }
   }
 
   static BrowserType.LaunchOptions createLaunchOptions() {

scripts/CLI_VERSION

@@ -1 +1 @@
-1.10.0-next-1616100617000
+1.10.0