chore: set version to 1.48.0 (#1688)

Fixes: https://github.com/microsoft/playwright-java/issues/1643

.azure-pipelines/publish.yml

@@ -47,7 +47,7 @@ extends:
            GPG_PRIVATE_KEY_BASE64: $(GPG_PRIVATE_KEY_BASE64) # secret variable has to be mapped to an env variable
           displayName: "Import gpg key"
         
-        - bash: ./scripts/download_driver_for_all_platforms.sh
+        - bash: ./scripts/download_driver.sh
           displayName: 'Download driver'
         
         - bash: mvn -B deploy -D skipTests --no-transfer-progress --activate-profiles release -D gpg.passphrase=$GPG_PASSPHRASE -DaltDeploymentRepository=snapshot-repo::default::file:$(pwd)/local-build
@@ -55,27 +55,23 @@ extends:
           env:
             GPG_PASSPHRASE: $(GPG_PASSPHRASE) # secret variable has to be mapped to an env variable
         
-        - bash: |
-            for file in $(find snapshots -type f); do
-              echo "processing: $file"
-              if [[ $file =~ \.(md5|sha1|sha256)$ ]]; then
-                continue
-              fi
-              sha256sum "$file" | cut -f1 -d \ > "$file.sha256"
-            done
-          displayName: 'Create .sha256 files'
-        
-        - task: EsrpRelease@4
+        - task: EsrpRelease@7
           inputs:
-            ConnectedServiceName: 'Playwright-ESRP'
-            Intent: 'PackageDistribution'
-            ContentType: 'Maven'
-            ContentSource: 'Folder'
-            FolderLocation: './local-build'
-            WaitForReleaseCompletion: true
-            Owners: 'yurys@microsoft.com'
-            Approvers: 'maxschmitt@microsoft.com'
-            ServiceEndpointUrl: 'https://api.esrp.microsoft.com'
-            MainPublisher: 'Playwright'
-            DomainTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
+            connectedservicename: 'Playwright-ESRP-Azure'
+            keyvaultname: 'pw-publishing-secrets'
+            authcertname: 'ESRP-Release-Auth'
+            signcertname: 'ESRP-Release-Sign'
+            clientid: '13434a40-7de4-4c23-81a3-d843dc81c2c5'
+            intent: 'PackageDistribution'
+            contenttype: 'Maven'
+            # Keeping it commented out as a workaround for:
+            # https://portal.microsofticm.com/imp/v3/incidents/incident/499972482/summary
+            # contentsource: 'folder'
+            folderlocation: './local-build'
+            waitforreleasecompletion: true
+            owners: 'yurys@microsoft.com'
+            approvers: 'maxschmitt@microsoft.com'
+            serviceendpointurl: 'https://api.esrp.microsoft.com'
+            mainpublisher: 'Playwright'
+            domaintenantid: '72f988bf-86f1-41af-91ab-2d7cd011db47'
           displayName: 'ESRP Release to Maven'

.github/dependabot.yml

@@ -3,8 +3,17 @@ updates:
   - package-ecosystem: "maven"
     directory: "/" # Location of the pom.xml file
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10
+    groups:
+      # Create a group of dependencies to be updated together in one pull request
+      all:
+        applies-to: version-updates
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
     allow:
       - dependency-type: "direct" # Optional: Only update direct dependencies
       - dependency-type: "indirect" # Optional: Only update indirect (transitive) dependencies

.github/workflows/publish_docker.yml

@@ -3,29 +3,28 @@ on:
   release:
     types: [published]
   workflow_dispatch:
-    inputs:
-      is_release:
-        required: true
-        type: boolean
-        description: "Is this a release image?"
 jobs:
   publish-canary-docker:
     name: publish to DockerHub
     runs-on: ubuntu-22.04
+    permissions:
+      id-token: write   # This is required for OIDC login (azure/login) to succeed
+      contents: read    # This is required for actions/checkout to succeed
+    environment: Docker
     if: github.repository == 'microsoft/playwright-java'
     steps:
     - uses: actions/checkout@v4
-    - uses: azure/docker-login@v1
+    - name: Azure login
+      uses: azure/login@v2
       with:
-        login-server: playwright.azurecr.io
-        username: playwright
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        client-id: ${{ secrets.AZURE_DOCKER_CLIENT_ID }}
+        tenant-id: ${{ secrets.AZURE_DOCKER_TENANT_ID }}
+        subscription-id: ${{ secrets.AZURE_DOCKER_SUBSCRIPTION_ID }}
+    - name: Login to ACR via OIDC
+      run: az acr login --name playwright
     - name: Set up Docker QEMU for arm64 docker builds
       uses: docker/setup-qemu-action@v3
       with:
         platforms: arm64
     - uses: actions/checkout@v4
     - run: ./utils/docker/publish_docker.sh stable
-      if: (github.event_name != 'workflow_dispatch' && !github.event.release.prerelease) || (github.event_name == 'workflow_dispatch' && github.event.inputs.is_release == 'true')
-    - run: ./utils/docker/publish_docker.sh canary
-      if: (github.event_name != 'workflow_dispatch' && github.event.release.prerelease) || (github.event_name == 'workflow_dispatch' && github.event.inputs.is_release != 'true')

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
         java-version: 8
     - name: Download drivers
       shell: bash
-      run: scripts/download_driver_for_all_platforms.sh
+      run: scripts/download_driver.sh
     - name: Build & Install
       run: mvn -B install -D skipTests --no-transfer-progress
     - name: Run tests
@@ -75,16 +75,20 @@ jobs:
           java-version: 8
       - name: Download drivers
         shell: bash
-        run: scripts/download_driver_for_all_platforms.sh
+        run: scripts/download_driver.sh
       - name: Build & Install
         run: mvn -B install -D skipTests --no-transfer-progress
+      - name: Install MS Edge
+        if: matrix.browser-channel == 'msedge' && matrix.os == 'macos-latest'
+        shell: bash
+        run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install msedge" -f playwright/pom.xml
       - name: Run tests
         run: mvn test --no-transfer-progress --fail-at-end -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
         env:
           BROWSER: chromium
           BROWSER_CHANNEL: ${{ matrix.browser-channel }}
 
-  Java_17:
+  Java_21:
     timeout-minutes: 30
     strategy:
       fail-fast: false
@@ -94,14 +98,14 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: microsoft/playwright-github-action@v1
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: adopt
-          java-version: 17
+          java-version: 21
       - name: Download drivers
         shell: bash
-        run: scripts/download_driver_for_all_platforms.sh
+        run: scripts/download_driver.sh
       - name: Build & Install
         run: mvn -B install -D skipTests --no-transfer-progress
       - name: Run tests

.github/workflows/test_cli.yml

@@ -21,7 +21,7 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: Download drivers
-        run: scripts/download_driver_for_all_platforms.sh
+        run: scripts/download_driver.sh
       - name: Intall Playwright
         run: mvn install -D skipTests --no-transfer-progress
       - name: Test CLI

.github/workflows/test_docker.yml

@@ -11,7 +11,7 @@ on:
     paths:
       - .github/workflows/test_docker.yml
       - '**/Dockerfile*'
-      - scripts/CLI_VERSION
+      - scripts/DRIVER_VERSION
       - '**/pom.xml'
     branches:
       - main
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        flavor: [focal, jammy]
+        flavor: [focal, jammy, noble]
     steps:
       - uses: actions/checkout@v3
       - name: Build Docker image

.github/workflows/verify_api.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: microsoft/playwright-github-action@v1
       - name: Download drivers
-        run: scripts/download_driver_for_all_platforms.sh
+        run: scripts/download_driver.sh
       - name: Regenerate APIs
         run: scripts/generate_api.sh
       - name: Update browser versions in README

CONTRIBUTING.md

@@ -20,14 +20,12 @@ git clone https://github.com/microsoft/playwright-java
 cd playwright-java
 ```
 
-2. Run the following script to download playwright-cli binaries for all platforms into `driver-bundle/src/main/resources/driver/` directory (browser binaries for Chromium, Firefox and WebKit will be automatically downloaded later on first Playwright run).
+2. Run the following script to download Playwright driver for all platforms into `driver-bundle/src/main/resources/driver/` directory (browser binaries for Chromium, Firefox and WebKit will be automatically downloaded later on first Playwright run).
 
 ```bash
-scripts/download_driver_for_all_platforms.sh
+scripts/download_driver.sh
 ```
 
-Names of published driver archives can be found at https://github.com/microsoft/playwright-cli/actions
-
 ### Building and running the tests with Maven
 
 ```bash
@@ -41,25 +39,19 @@ BROWSER=chromium mvn test --projects=playwright -Dtest=TestPageNetworkSizes
 
 ### Generating API
 
-Public Java API is generated from api.json which is produced by `playwright-cli print-api-json`. To regenerate
-Java interfaces for the current driver run the following commands:
+Public Java API is generated from api.json which is produced by `print-api-json` command of playwright CLI. To regenerate Java interfaces for the current driver run the following commands:
 
 ```bash
-./scripts/download_driver_for_all_platforms.sh
+./scripts/download_driver.sh
 ./scripts/generate_api.sh
 ```
 
 #### Updating driver version
 
-Driver version is read from [scripts/CLI_VERSION](https://github.com/microsoft/playwright-java/blob/main/scripts/CLI_VERSION) and can be found in the upstream [GHA build](https://github.com/microsoft/playwright/actions/workflows/publish_canary.yml) logs. To update the driver to a particular version run the following commands:
+Versions of published driver archives can be found in [publish canary](https://github.com/microsoft/playwright/actions/workflows/publish_canary.yml) and [publish release](https://github.com/microsoft/playwright/actions/workflows/publish_release_driver.yml) actions logs. To update the driver to a particular version run the following command:
 
 ```bash
-cat > scripts/CLI_VERSION
-<paste new version>
-^D
-./scripts/download_driver_for_all_platforms.sh -f
-./scripts/generate_api.sh
-./scripts/update_readme.sh
+scripts/roll_driver.sh [version]
 ```
 
 ### Code Style

README.md

@@ -2,8 +2,7 @@
 
 [![javadoc](https://javadoc.io/badge2/com.microsoft.playwright/playwright/javadoc.svg)](https://javadoc.io/doc/com.microsoft.playwright/playwright)
 [![maven version](https://img.shields.io/maven-central/v/com.microsoft.playwright/playwright)](https://search.maven.org/search?q=com.microsoft.playwright)
-[![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.microsoft.playwright/playwright.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/microsoft/playwright/playwright/)
-[![Join Slack](https://img.shields.io/badge/join-slack-infomational)](https://aka.ms/playwright-slack)
+[![Join Discord](https://img.shields.io/badge/join-discord-infomational)](https://aka.ms/playwright/discord)
 
 #### [Website](https://playwright.dev/java/) | [API reference](https://www.javadoc.io/doc/com.microsoft.playwright/playwright/latest/index.html)
 
@@ -11,9 +10,9 @@ Playwright is a Java library to automate [Chromium](https://www.chromium.org/Hom
 
 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->124.0.6367.18<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| WebKit <!-- GEN:webkit-version -->17.4<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->124.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Chromium <!-- GEN:chromium-version -->130.0.6723.31<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| WebKit <!-- GEN:webkit-version -->18.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Firefox <!-- GEN:firefox-version -->131.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 
 Headless execution is supported for all the browsers on all platforms. Check out [system requirements](https://playwright.dev/java/docs/intro#system-requirements) for details.
 
@@ -122,7 +121,7 @@ public class MobileAndGeolocation {
         .setPermissions(asList("geolocation")));
       Page page = context.newPage();
       page.navigate("https://www.openstreetmap.org/");
-      page.click("a[data-original-title=\"Show My Location\"]");
+      page.click("a[data-bs-original-title=\"Show My Location\"]");
       page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("colosseum-pixel2.png")));
     }
   }

ROLLING.md

@@ -2,11 +2,10 @@
 
 * make sure to have at least Java 8 and Maven 3.6.3
 * clone playwright for java: http://github.com/microsoft/playwright-java
-* set new driver version in `scripts/CLI_VERSION`
-* regenerate API: `./scripts/download_driver_for_all_platforms.sh -f && ./scripts/generate_api.sh && ./scripts/update_readme.sh`
+* `./scripts/roll_driver.sh 1.47.0-beta-1726138322000`
 * commit & send PR with the roll
 
-### Finding driver version
+## Finding driver version
 
 For development versions of Playwright, you can find the latest version by looking at [publish_canary](https://github.com/microsoft/playwright/actions/workflows/publish_canary.yml) workflow -> `publish canary NPM & Publish canary Docker` -> `build & publish driver` step -> `PACKAGE_VERSION`
 <img width="960" alt="image" src="https://github.com/microsoft/playwright-java/assets/9798949/4f33a7f1-b39a-4179-8ae7-fb1d84094c75">

SUPPORT.md

@@ -0,0 +1,17 @@
+# Support
+
+## How to file issues and get help
+
+This project uses GitHub issues to track bugs and feature requests. Please search the [existing issues][gh-issues] before filing new ones to avoid duplicates. For new issues, file your bug or feature request as a new issue using corresponding template.
+
+For help and questions about using this project, please see the [docs site for Playwright for Java][docs].
+
+Join our community [Discord Server][discord-server] to connect with other developers using Playwright and ask questions in our 'help-playwright' forum.
+
+## Microsoft Support Policy
+
+Support for Playwright for Java is limited to the resources listed above.
+
+[gh-issues]: https://github.com/microsoft/playwright-java/issues/
+[docs]: https://playwright.dev/java/
+[discord-server]: https://aka.ms/playwright/discord

driver-bundle/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.playwright</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>1.43.0-SNAPSHOT</version>
+    <version>1.48.0</version>
   </parent>
 
   <artifactId>driver-bundle</artifactId>

driver-bundle/src/main/java/com/microsoft/playwright/impl/driver/jar/DriverJar.java

@@ -74,7 +74,7 @@ public class DriverJar extends Driver {
       skip = System.getenv(PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD);
     }
     if (skip != null && !"0".equals(skip) && !"false".equals(skip)) {
-      System.out.println("Skipping browsers download because `PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD` env variable is set");
+      logMessage("Skipping browsers download because `PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD` env variable is set");
       return;
     }
     if (env.get(SELENIUM_REMOTE_URL) != null || System.getenv(SELENIUM_REMOTE_URL) != null) {

driver/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.microsoft.playwright</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>1.43.0-SNAPSHOT</version>
+    <version>1.48.0</version>
   </parent>
 
   <artifactId>driver</artifactId>

driver/src/main/java/com/microsoft/playwright/impl/driver/Driver.java

@@ -18,7 +18,6 @@ package com.microsoft.playwright.impl.driver;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -30,7 +29,7 @@ import static com.microsoft.playwright.impl.driver.DriverLogging.logWithTimestam
  * loaded from the driver-bundle module if that module is in the classpath.
  */
 public abstract class Driver {
-  protected final Map<String, String> env = new LinkedHashMap<>();
+  protected final Map<String, String> env = new LinkedHashMap<>(System.getenv());
   public static final String PLAYWRIGHT_NODEJS_PATH = "PLAYWRIGHT_NODEJS_PATH";
 
   private static Driver instance;

examples/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>org.example</groupId>
   <artifactId>examples</artifactId>
-  <version>1.43.0-SNAPSHOT</version>
+  <version>1.48.0</version>
   <name>Playwright Client Examples</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

playwright/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.microsoft.playwright</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>1.43.0-SNAPSHOT</version>
+    <version>1.48.0</version>
   </parent>
 
   <artifactId>playwright</artifactId>
@@ -61,6 +61,10 @@
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opentest4j</groupId>
       <artifactId>opentest4j</artifactId>

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

@@ -41,6 +41,20 @@ public interface APIRequest {
      * </ul>
      */
     public String baseURL;
+    /**
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * <p> <strong>Details</strong>
+     *
+     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
+     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
+     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
+     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
+     *
+     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
+     * replacing {@code localhost} with {@code local.playwright}.
+     */
+    public List<ClientCertificate> clientCertificates;
     /**
      * An object containing additional HTTP headers to be sent with every request. Defaults to none.
      */
@@ -100,6 +114,23 @@ public interface APIRequest {
       this.baseURL = baseURL;
       return this;
     }
+    /**
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * <p> <strong>Details</strong>
+     *
+     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
+     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
+     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
+     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
+     *
+     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
+     * replacing {@code localhost} with {@code local.playwright}.
+     */
+    public NewContextOptions setClientCertificates(List<ClientCertificate> clientCertificates) {
+      this.clientCertificates = clientCertificates;
+      return this;
+    }
     /**
      * An object containing additional HTTP headers to be sent with every request. Defaults to none.
      */

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

@@ -43,6 +43,20 @@ import java.nio.file.Path;
  * object will have its own isolated cookie storage.
  */
 public interface APIRequestContext {
+  class DisposeOptions {
+    /**
+     * The reason to be reported to the operations interrupted by the context disposal.
+     */
+    public String reason;
+
+    /**
+     * The reason to be reported to the operations interrupted by the context disposal.
+     */
+    public DisposeOptions setReason(String reason) {
+      this.reason = reason;
+      return this;
+    }
+  }
   class StorageStateOptions {
     /**
      * The file path to save the storage state to. If {@code path} is a relative path, then it is resolved relative to current
@@ -88,13 +102,25 @@ public interface APIRequestContext {
    *
    * @since v1.16
    */
-  void dispose();
+  default void dispose() {
+    dispose(null);
+  }
+  /**
+   * All responses returned by {@link com.microsoft.playwright.APIRequestContext#get APIRequestContext.get()} and similar
+   * methods are stored in the memory, so that you can later call {@link com.microsoft.playwright.APIResponse#body
+   * APIResponse.body()}.This method discards all its resources, calling any method on disposed {@code APIRequestContext}
+   * will throw an exception.
+   *
+   * @since v1.16
+   */
+  void dispose(DisposeOptions options);
   /**
    * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
-   * context cookies from the response. The method will automatically follow redirects. JSON objects can be passed directly
-   * to the request.
+   * context cookies from the response. The method will automatically follow redirects.
    *
    * <p> <strong>Usage</strong>
+   *
+   * <p> JSON objects can be passed directly to the request:
    * <pre>{@code
    * Map<String, Object> data = new HashMap();
    * data.put("title", "Book Title");
@@ -102,8 +128,8 @@ public interface APIRequestContext {
    * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
    * }</pre>
    *
-   * <p> The common way to send file(s) in the body of a request is to encode it as form fields with {@code multipart/form-data}
-   * encoding. You can achieve that with Playwright API like this:
+   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
+   * multipart/form-data} encoding, by specifiying the {@code multipart} parameter:
    * <pre>{@code
    * // Pass file path to the form data constructor:
    * Path file = Paths.get("team.csv");
@@ -114,7 +140,7 @@ public interface APIRequestContext {
    * // Or you can pass the file content directly as FilePayload object:
    * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
    *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
+   * APIResponse response = request.fetch("https://example.com/api/uploadScript",
    *   RequestOptions.create().setMethod("post").setMultipart(
    *     FormData.create().set("fileField", filePayload)));
    * }</pre>
@@ -127,10 +153,11 @@ public interface APIRequestContext {
   }
   /**
    * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
-   * context cookies from the response. The method will automatically follow redirects. JSON objects can be passed directly
-   * to the request.
+   * context cookies from the response. The method will automatically follow redirects.
    *
    * <p> <strong>Usage</strong>
+   *
+   * <p> JSON objects can be passed directly to the request:
    * <pre>{@code
    * Map<String, Object> data = new HashMap();
    * data.put("title", "Book Title");
@@ -138,8 +165,8 @@ public interface APIRequestContext {
    * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
    * }</pre>
    *
-   * <p> The common way to send file(s) in the body of a request is to encode it as form fields with {@code multipart/form-data}
-   * encoding. You can achieve that with Playwright API like this:
+   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
+   * multipart/form-data} encoding, by specifiying the {@code multipart} parameter:
    * <pre>{@code
    * // Pass file path to the form data constructor:
    * Path file = Paths.get("team.csv");
@@ -150,7 +177,7 @@ public interface APIRequestContext {
    * // Or you can pass the file content directly as FilePayload object:
    * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
    *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
+   * APIResponse response = request.fetch("https://example.com/api/uploadScript",
    *   RequestOptions.create().setMethod("post").setMultipart(
    *     FormData.create().set("fileField", filePayload)));
    * }</pre>
@@ -162,10 +189,11 @@ public interface APIRequestContext {
   APIResponse fetch(String urlOrRequest, RequestOptions params);
   /**
    * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
-   * context cookies from the response. The method will automatically follow redirects. JSON objects can be passed directly
-   * to the request.
+   * context cookies from the response. The method will automatically follow redirects.
    *
    * <p> <strong>Usage</strong>
+   *
+   * <p> JSON objects can be passed directly to the request:
    * <pre>{@code
    * Map<String, Object> data = new HashMap();
    * data.put("title", "Book Title");
@@ -173,8 +201,8 @@ public interface APIRequestContext {
    * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
    * }</pre>
    *
-   * <p> The common way to send file(s) in the body of a request is to encode it as form fields with {@code multipart/form-data}
-   * encoding. You can achieve that with Playwright API like this:
+   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
+   * multipart/form-data} encoding, by specifiying the {@code multipart} parameter:
    * <pre>{@code
    * // Pass file path to the form data constructor:
    * Path file = Paths.get("team.csv");
@@ -185,7 +213,7 @@ public interface APIRequestContext {
    * // Or you can pass the file content directly as FilePayload object:
    * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
    *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
+   * APIResponse response = request.fetch("https://example.com/api/uploadScript",
    *   RequestOptions.create().setMethod("post").setMultipart(
    *     FormData.create().set("fileField", filePayload)));
    * }</pre>
@@ -198,10 +226,11 @@ public interface APIRequestContext {
   }
   /**
    * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
-   * context cookies from the response. The method will automatically follow redirects. JSON objects can be passed directly
-   * to the request.
+   * context cookies from the response. The method will automatically follow redirects.
    *
    * <p> <strong>Usage</strong>
+   *
+   * <p> JSON objects can be passed directly to the request:
    * <pre>{@code
    * Map<String, Object> data = new HashMap();
    * data.put("title", "Book Title");
@@ -209,8 +238,8 @@ public interface APIRequestContext {
    * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
    * }</pre>
    *
-   * <p> The common way to send file(s) in the body of a request is to encode it as form fields with {@code multipart/form-data}
-   * encoding. You can achieve that with Playwright API like this:
+   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
+   * multipart/form-data} encoding, by specifiying the {@code multipart} parameter:
    * <pre>{@code
    * // Pass file path to the form data constructor:
    * Path file = Paths.get("team.csv");
@@ -221,7 +250,7 @@ public interface APIRequestContext {
    * // Or you can pass the file content directly as FilePayload object:
    * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
    *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
+   * APIResponse response = request.fetch("https://example.com/api/uploadScript",
    *   RequestOptions.create().setMethod("post").setMultipart(
    *     FormData.create().set("fileField", filePayload)));
    * }</pre>
@@ -337,7 +366,8 @@ public interface APIRequestContext {
    * }</pre>
    *
    * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding. You can achieve that with Playwright API like this:
+   * multipart/form-data} encoding. Use {@code FormData} to construct request body and pass it to the request as {@code
+   * multipart} parameter:
    * <pre>{@code
    * // Pass file path to the form data constructor:
    * Path file = Paths.get("team.csv");
@@ -346,9 +376,9 @@ public interface APIRequestContext {
    *     FormData.create().set("fileField", file)));
    *
    * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
+   * FilePayload filePayload1 = new FilePayload("f1.js", "text/javascript",
    *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.post("https://example.com/api/uploadTeamList",
+   * APIResponse response = request.post("https://example.com/api/uploadScript",
    *   RequestOptions.create().setMultipart(
    *     FormData.create().set("fileField", filePayload)));
    * }</pre>
@@ -384,7 +414,8 @@ public interface APIRequestContext {
    * }</pre>
    *
    * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding. You can achieve that with Playwright API like this:
+   * multipart/form-data} encoding. Use {@code FormData} to construct request body and pass it to the request as {@code
+   * multipart} parameter:
    * <pre>{@code
    * // Pass file path to the form data constructor:
    * Path file = Paths.get("team.csv");
@@ -393,9 +424,9 @@ public interface APIRequestContext {
    *     FormData.create().set("fileField", file)));
    *
    * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
+   * FilePayload filePayload1 = new FilePayload("f1.js", "text/javascript",
    *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.post("https://example.com/api/uploadTeamList",
+   * APIResponse response = request.post("https://example.com/api/uploadScript",
    *   RequestOptions.create().setMultipart(
    *     FormData.create().set("fileField", filePayload)));
    * }</pre>

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

@@ -43,8 +43,8 @@ public interface APIResponse {
    */
   Map<String, String> headers();
   /**
-   * An array with all the request HTTP headers associated with this response. Header names are not lower-cased. Headers with
-   * multiple entries, such as {@code Set-Cookie}, appear in the array multiple times.
+   * An array with all the response HTTP headers associated with this response. Header names are not lower-cased. Headers
+   * with multiple entries, such as {@code Set-Cookie}, appear in the array multiple times.
    *
    * @since v1.16
    */

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

@@ -96,6 +96,20 @@ public interface Browser extends AutoCloseable {
      * Toggles bypassing page's Content-Security-Policy. Defaults to {@code false}.
      */
     public Boolean bypassCSP;
+    /**
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * <p> <strong>Details</strong>
+     *
+     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
+     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
+     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
+     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
+     *
+     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
+     * replacing {@code localhost} with {@code local.playwright}.
+     */
+    public List<ClientCertificate> clientCertificates;
     /**
      * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
      * "no-preference"}. See {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing
@@ -163,10 +177,6 @@ public interface Browser extends AutoCloseable {
     public List<String> permissions;
     /**
      * Network proxy settings to use with this context. Defaults to none.
-     *
-     * <p> <strong>NOTE:</strong> For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If all contexts
-     * override the proxy, global proxy will be never used and can be any string, for example {@code launch({ proxy: { server:
-     * 'http://per-context' } })}.
      */
     public Proxy proxy;
     /**
@@ -295,6 +305,23 @@ public interface Browser extends AutoCloseable {
       this.bypassCSP = bypassCSP;
       return this;
     }
+    /**
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * <p> <strong>Details</strong>
+     *
+     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
+     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
+     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
+     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
+     *
+     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
+     * replacing {@code localhost} with {@code local.playwright}.
+     */
+    public NewContextOptions setClientCertificates(List<ClientCertificate> clientCertificates) {
+      this.clientCertificates = clientCertificates;
+      return this;
+    }
     /**
      * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
      * "no-preference"}. See {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing
@@ -411,20 +438,12 @@ public interface Browser extends AutoCloseable {
     }
     /**
      * Network proxy settings to use with this context. Defaults to none.
-     *
-     * <p> <strong>NOTE:</strong> For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If all contexts
-     * override the proxy, global proxy will be never used and can be any string, for example {@code launch({ proxy: { server:
-     * 'http://per-context' } })}.
      */
     public NewContextOptions setProxy(String server) {
       return setProxy(new Proxy(server));
     }
     /**
      * Network proxy settings to use with this context. Defaults to none.
-     *
-     * <p> <strong>NOTE:</strong> For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If all contexts
-     * override the proxy, global proxy will be never used and can be any string, for example {@code launch({ proxy: { server:
-     * 'http://per-context' } })}.
      */
     public NewContextOptions setProxy(Proxy proxy) {
       this.proxy = proxy;
@@ -626,6 +645,20 @@ public interface Browser extends AutoCloseable {
      * Toggles bypassing page's Content-Security-Policy. Defaults to {@code false}.
      */
     public Boolean bypassCSP;
+    /**
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * <p> <strong>Details</strong>
+     *
+     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
+     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
+     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
+     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
+     *
+     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
+     * replacing {@code localhost} with {@code local.playwright}.
+     */
+    public List<ClientCertificate> clientCertificates;
     /**
      * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
      * "no-preference"}. See {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing
@@ -693,10 +726,6 @@ public interface Browser extends AutoCloseable {
     public List<String> permissions;
     /**
      * Network proxy settings to use with this context. Defaults to none.
-     *
-     * <p> <strong>NOTE:</strong> For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If all contexts
-     * override the proxy, global proxy will be never used and can be any string, for example {@code launch({ proxy: { server:
-     * 'http://per-context' } })}.
      */
     public Proxy proxy;
     /**
@@ -825,6 +854,23 @@ public interface Browser extends AutoCloseable {
       this.bypassCSP = bypassCSP;
       return this;
     }
+    /**
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * <p> <strong>Details</strong>
+     *
+     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
+     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
+     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
+     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
+     *
+     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
+     * replacing {@code localhost} with {@code local.playwright}.
+     */
+    public NewPageOptions setClientCertificates(List<ClientCertificate> clientCertificates) {
+      this.clientCertificates = clientCertificates;
+      return this;
+    }
     /**
      * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
      * "no-preference"}. See {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing
@@ -941,20 +987,12 @@ public interface Browser extends AutoCloseable {
     }
     /**
      * Network proxy settings to use with this context. Defaults to none.
-     *
-     * <p> <strong>NOTE:</strong> For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If all contexts
-     * override the proxy, global proxy will be never used and can be any string, for example {@code launch({ proxy: { server:
-     * 'http://per-context' } })}.
      */
     public NewPageOptions setProxy(String server) {
       return setProxy(new Proxy(server));
     }
     /**
      * Network proxy settings to use with this context. Defaults to none.
-     *
-     * <p> <strong>NOTE:</strong> For Chromium on Windows the browser needs to be launched with the global proxy for this option to work. If all contexts
-     * override the proxy, global proxy will be never used and can be any string, for example {@code launch({ proxy: { server:
-     * 'http://per-context' } })}.
      */
     public NewPageOptions setProxy(Proxy proxy) {
       this.proxy = proxy;

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

@@ -30,8 +30,9 @@ import java.util.regex.Pattern;
  * <p> If a page opens another page, e.g. with a {@code window.open} call, the popup will belong to the parent page's browser
  * context.
  *
- * <p> Playwright allows creating "incognito" browser contexts with {@link com.microsoft.playwright.Browser#newContext
- * Browser.newContext()} method. "Incognito" browser contexts don't write any browsing data to disk.
+ * <p> Playwright allows creating isolated non-persistent browser contexts with {@link
+ * com.microsoft.playwright.Browser#newContext Browser.newContext()} method. Non-persistent browser contexts don't write
+ * any browsing data to disk.
  * <pre>{@code
  * // Create a new incognito browser context
  * BrowserContext context = browser.newContext();
@@ -49,10 +50,9 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> Emitted when new background page is created in the context.
    * <pre>{@code
-   * Page backgroundPage = context.waitForBackgroundPage(() -> {
-   *   page.getByText("activate extension").click();
+   * context.onBackgroundPage(backgroundPage -> {
+   *   System.out.println(backgroundPage.url());
    * });
-   * System.out.println(backgroundPage.evaluate("location.href"));
    * }</pre>
    */
   void onBackgroundPage(Consumer<Page> handler);
@@ -128,7 +128,10 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> The earliest moment that page is available is when it has navigated to the initial url. For example, when opening a
    * popup with {@code window.open('http://example.com')}, this event will fire when the network request to
-   * "http://example.com" is done and its response has started loading in the popup.
+   * "http://example.com" is done and its response has started loading in the popup. If you would like to route/listen to
+   * this network request, use {@link com.microsoft.playwright.BrowserContext#route BrowserContext.route()} and {@link
+   * com.microsoft.playwright.BrowserContext#onRequest BrowserContext.onRequest()} respectively instead of similar methods on
+   * the {@code Page}.
    * <pre>{@code
    * Page newPage = context.waitForPage(() -> {
    *   page.getByText("open new page").click();
@@ -277,14 +280,12 @@ public interface BrowserContext extends AutoCloseable {
   }
   class ExposeBindingOptions {
     /**
-     * Whether to pass the argument as a handle, instead of passing by value. When passing a handle, only one argument is
-     * supported. When passing by value, multiple arguments are supported.
+     * @deprecated This option will be removed in the future.
      */
     public Boolean handle;
 
     /**
-     * Whether to pass the argument as a handle, instead of passing by value. When passing a handle, only one argument is
-     * supported. When passing by value, multiple arguments are supported.
+     * @deprecated This option will be removed in the future.
      */
     public ExposeBindingOptions setHandle(boolean handle) {
       this.handle = handle;
@@ -499,6 +500,12 @@ public interface BrowserContext extends AutoCloseable {
       return this;
     }
   }
+  /**
+   * Playwright has ability to mock clock and passage of time.
+   *
+   * @since v1.45
+   */
+  Clock clock();
   /**
    * Adds cookies into this browser context. All pages within this context will have these cookies installed. Cookies can be
    * obtained via {@link com.microsoft.playwright.BrowserContext#cookies BrowserContext.cookies()}.
@@ -508,9 +515,6 @@ public interface BrowserContext extends AutoCloseable {
    * browserContext.addCookies(Arrays.asList(cookieObject1, cookieObject2));
    * }</pre>
    *
-   * @param cookies Adds cookies to the browser context.
-   *
-   * <p> For the cookie to apply to all subdomains as well, prefix domain with a dot, like this: ".example.com".
    * @since v1.8
    */
   void addCookies(List<Cookie> cookies);
@@ -715,21 +719,6 @@ public interface BrowserContext extends AutoCloseable {
    * }
    * }</pre>
    *
-   * <p> An example of passing an element handle:
-   * <pre>{@code
-   * context.exposeBinding("clicked", (source, args) -> {
-   *   ElementHandle element = (ElementHandle) args[0];
-   *   System.out.println(element.textContent());
-   *   return null;
-   * }, new BrowserContext.ExposeBindingOptions().setHandle(true));
-   * page.setContent("" +
-   *   "<script>\n" +
-   *   "  document.addEventListener('click', event => window.clicked(event.target));\n" +
-   *   "</script>\n" +
-   *   "<div>Click me</div>\n" +
-   *   "<div>Or click me</div>\n");
-   * }</pre>
-   *
    * @param name Name of the function on the window object.
    * @param callback Callback function that will be called in the Playwright's context.
    * @since v1.8
@@ -777,21 +766,6 @@ public interface BrowserContext extends AutoCloseable {
    * }
    * }</pre>
    *
-   * <p> An example of passing an element handle:
-   * <pre>{@code
-   * context.exposeBinding("clicked", (source, args) -> {
-   *   ElementHandle element = (ElementHandle) args[0];
-   *   System.out.println(element.textContent());
-   *   return null;
-   * }, new BrowserContext.ExposeBindingOptions().setHandle(true));
-   * page.setContent("" +
-   *   "<script>\n" +
-   *   "  document.addEventListener('click', event => window.clicked(event.target));\n" +
-   *   "</script>\n" +
-   *   "<div>Click me</div>\n" +
-   *   "<div>Or click me</div>\n");
-   * }</pre>
-   *
    * @param name Name of the function on the window object.
    * @param callback Callback function that will be called in the Playwright's context.
    * @since v1.8
@@ -861,21 +835,22 @@ public interface BrowserContext extends AutoCloseable {
    *
    * @param permissions A permission or an array of permissions to grant. Permissions can be one of the following values:
    * <ul>
-   * <li> {@code "geolocation"}</li>
-   * <li> {@code "midi"}</li>
-   * <li> {@code "midi-sysex"} (system-exclusive midi)</li>
-   * <li> {@code "notifications"}</li>
-   * <li> {@code "camera"}</li>
-   * <li> {@code "microphone"}</li>
-   * <li> {@code "background-sync"}</li>
-   * <li> {@code "ambient-light-sensor"}</li>
    * <li> {@code "accelerometer"}</li>
-   * <li> {@code "gyroscope"}</li>
-   * <li> {@code "magnetometer"}</li>
    * <li> {@code "accessibility-events"}</li>
+   * <li> {@code "ambient-light-sensor"}</li>
+   * <li> {@code "background-sync"}</li>
+   * <li> {@code "camera"}</li>
    * <li> {@code "clipboard-read"}</li>
    * <li> {@code "clipboard-write"}</li>
+   * <li> {@code "geolocation"}</li>
+   * <li> {@code "gyroscope"}</li>
+   * <li> {@code "magnetometer"}</li>
+   * <li> {@code "microphone"}</li>
+   * <li> {@code "midi-sysex"} (system-exclusive midi)</li>
+   * <li> {@code "midi"}</li>
+   * <li> {@code "notifications"}</li>
    * <li> {@code "payment-handler"}</li>
+   * <li> {@code "storage-access"}</li>
    * </ul>
    * @since v1.8
    */
@@ -888,21 +863,22 @@ public interface BrowserContext extends AutoCloseable {
    *
    * @param permissions A permission or an array of permissions to grant. Permissions can be one of the following values:
    * <ul>
-   * <li> {@code "geolocation"}</li>
-   * <li> {@code "midi"}</li>
-   * <li> {@code "midi-sysex"} (system-exclusive midi)</li>
-   * <li> {@code "notifications"}</li>
-   * <li> {@code "camera"}</li>
-   * <li> {@code "microphone"}</li>
-   * <li> {@code "background-sync"}</li>
-   * <li> {@code "ambient-light-sensor"}</li>
    * <li> {@code "accelerometer"}</li>
-   * <li> {@code "gyroscope"}</li>
-   * <li> {@code "magnetometer"}</li>
    * <li> {@code "accessibility-events"}</li>
+   * <li> {@code "ambient-light-sensor"}</li>
+   * <li> {@code "background-sync"}</li>
+   * <li> {@code "camera"}</li>
    * <li> {@code "clipboard-read"}</li>
    * <li> {@code "clipboard-write"}</li>
+   * <li> {@code "geolocation"}</li>
+   * <li> {@code "gyroscope"}</li>
+   * <li> {@code "magnetometer"}</li>
+   * <li> {@code "microphone"}</li>
+   * <li> {@code "midi-sysex"} (system-exclusive midi)</li>
+   * <li> {@code "midi"}</li>
+   * <li> {@code "notifications"}</li>
    * <li> {@code "payment-handler"}</li>
+   * <li> {@code "storage-access"}</li>
    * </ul>
    * @since v1.8
    */
@@ -951,7 +927,7 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.BrowserContext#route BrowserContext.route()} will not intercept requests intercepted by
    * Service Worker. See <a href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling
-   * Service Workers when using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
+   * Service Workers when using request interception by setting {@code serviceWorkers} to {@code "block"}.
    *
    * <p> <strong>Usage</strong>
    *
@@ -1007,7 +983,7 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.BrowserContext#route BrowserContext.route()} will not intercept requests intercepted by
    * Service Worker. See <a href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling
-   * Service Workers when using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
+   * Service Workers when using request interception by setting {@code serviceWorkers} to {@code "block"}.
    *
    * <p> <strong>Usage</strong>
    *
@@ -1061,7 +1037,7 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.BrowserContext#route BrowserContext.route()} will not intercept requests intercepted by
    * Service Worker. See <a href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling
-   * Service Workers when using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
+   * Service Workers when using request interception by setting {@code serviceWorkers} to {@code "block"}.
    *
    * <p> <strong>Usage</strong>
    *
@@ -1117,7 +1093,7 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.BrowserContext#route BrowserContext.route()} will not intercept requests intercepted by
    * Service Worker. See <a href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling
-   * Service Workers when using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
+   * Service Workers when using request interception by setting {@code serviceWorkers} to {@code "block"}.
    *
    * <p> <strong>Usage</strong>
    *
@@ -1171,7 +1147,7 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.BrowserContext#route BrowserContext.route()} will not intercept requests intercepted by
    * Service Worker. See <a href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling
-   * Service Workers when using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
+   * Service Workers when using request interception by setting {@code serviceWorkers} to {@code "block"}.
    *
    * <p> <strong>Usage</strong>
    *
@@ -1227,7 +1203,7 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.BrowserContext#route BrowserContext.route()} will not intercept requests intercepted by
    * Service Worker. See <a href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling
-   * Service Workers when using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
+   * Service Workers when using request interception by setting {@code serviceWorkers} to {@code "block"}.
    *
    * <p> <strong>Usage</strong>
    *
@@ -1281,7 +1257,7 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> Playwright will not serve requests intercepted by Service Worker from the HAR file. See <a
    * href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling Service Workers when
-   * using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
+   * using request interception by setting {@code serviceWorkers} to {@code "block"}.
    *
    * @param har Path to a <a href="http://www.softwareishard.com/blog/har-12-spec">HAR</a> file with prerecorded network data. If {@code
    * path} is a relative path, then it is resolved relative to the current working directory.
@@ -1296,13 +1272,94 @@ public interface BrowserContext extends AutoCloseable {
    *
    * <p> Playwright will not serve requests intercepted by Service Worker from the HAR file. See <a
    * href="https://github.com/microsoft/playwright/issues/1090">this</a> issue. We recommend disabling Service Workers when
-   * using request interception by setting {@code Browser.newContext.serviceWorkers} to {@code "block"}.
+   * using request interception by setting {@code serviceWorkers} to {@code "block"}.
    *
    * @param har Path to a <a href="http://www.softwareishard.com/blog/har-12-spec">HAR</a> file with prerecorded network data. If {@code
    * path} is a relative path, then it is resolved relative to the current working directory.
    * @since v1.23
    */
   void routeFromHAR(Path har, RouteFromHAROptions options);
+  /**
+   * This method allows to modify websocket connections that are made by any page in the browser context.
+   *
+   * <p> Note that only {@code WebSocket}s created after this method was called will be routed. It is recommended to call this
+   * method before creating any pages.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * <p> Below is an example of a simple handler that blocks some websocket messages. See {@code WebSocketRoute} for more details
+   * and examples.
+   * <pre>{@code
+   * context.routeWebSocket("/ws", ws -> {
+   *   ws.routeSend(message -> {
+   *     if ("to-be-blocked".equals(message))
+   *       return;
+   *     ws.send(message);
+   *   });
+   *   ws.connect();
+   * });
+   * }</pre>
+   *
+   * @param url Only WebSockets with the url matching this pattern will be routed. A string pattern can be relative to the {@code
+   * baseURL} context option.
+   * @param handler Handler function to route the WebSocket.
+   * @since v1.48
+   */
+  void routeWebSocket(String url, Consumer<WebSocketRoute> handler);
+  /**
+   * This method allows to modify websocket connections that are made by any page in the browser context.
+   *
+   * <p> Note that only {@code WebSocket}s created after this method was called will be routed. It is recommended to call this
+   * method before creating any pages.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * <p> Below is an example of a simple handler that blocks some websocket messages. See {@code WebSocketRoute} for more details
+   * and examples.
+   * <pre>{@code
+   * context.routeWebSocket("/ws", ws -> {
+   *   ws.routeSend(message -> {
+   *     if ("to-be-blocked".equals(message))
+   *       return;
+   *     ws.send(message);
+   *   });
+   *   ws.connect();
+   * });
+   * }</pre>
+   *
+   * @param url Only WebSockets with the url matching this pattern will be routed. A string pattern can be relative to the {@code
+   * baseURL} context option.
+   * @param handler Handler function to route the WebSocket.
+   * @since v1.48
+   */
+  void routeWebSocket(Pattern url, Consumer<WebSocketRoute> handler);
+  /**
+   * This method allows to modify websocket connections that are made by any page in the browser context.
+   *
+   * <p> Note that only {@code WebSocket}s created after this method was called will be routed. It is recommended to call this
+   * method before creating any pages.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * <p> Below is an example of a simple handler that blocks some websocket messages. See {@code WebSocketRoute} for more details
+   * and examples.
+   * <pre>{@code
+   * context.routeWebSocket("/ws", ws -> {
+   *   ws.routeSend(message -> {
+   *     if ("to-be-blocked".equals(message))
+   *       return;
+   *     ws.send(message);
+   *   });
+   *   ws.connect();
+   * });
+   * }</pre>
+   *
+   * @param url Only WebSockets with the url matching this pattern will be routed. A string pattern can be relative to the {@code
+   * baseURL} context option.
+   * @param handler Handler function to route the WebSocket.
+   * @since v1.48
+   */
+  void routeWebSocket(Predicate<String> url, Consumer<WebSocketRoute> handler);
   /**
    * This setting will change the default maximum navigation time for the following methods and related shortcuts:
    * <ul>

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

@@ -455,6 +455,20 @@ public interface BrowserType {
      * Enable Chromium sandboxing. Defaults to {@code false}.
      */
     public Boolean chromiumSandbox;
+    /**
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * <p> <strong>Details</strong>
+     *
+     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
+     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
+     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
+     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
+     *
+     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
+     * replacing {@code localhost} with {@code local.playwright}.
+     */
+    public List<ClientCertificate> clientCertificates;
     /**
      * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
      * "no-preference"}. See {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing
@@ -742,6 +756,23 @@ public interface BrowserType {
       this.chromiumSandbox = chromiumSandbox;
       return this;
     }
+    /**
+     * TLS Client Authentication allows the server to request a client certificate and verify it.
+     *
+     * <p> <strong>Details</strong>
+     *
+     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
+     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
+     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
+     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
+     *
+     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
+     * replacing {@code localhost} with {@code local.playwright}.
+     */
+    public LaunchPersistentContextOptions setClientCertificates(List<ClientCertificate> clientCertificates) {
+      this.clientCertificates = clientCertificates;
+      return this;
+    }
     /**
      * Emulates {@code "prefers-colors-scheme"} media feature, supported values are {@code "light"}, {@code "dark"}, {@code
      * "no-preference"}. See {@link com.microsoft.playwright.Page#emulateMedia Page.emulateMedia()} for more details. Passing

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

@@ -0,0 +1,312 @@
+/*
+ * 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;
+
+import java.util.Date;
+
+/**
+ * Accurately simulating time-dependent behavior is essential for verifying the correctness of applications. Learn more
+ * about <a href="https://playwright.dev/java/docs/clock">clock emulation</a>.
+ *
+ * <p> Note that clock is installed for the entire {@code BrowserContext}, so the time in all the pages and iframes is
+ * controlled by the same clock.
+ */
+public interface Clock {
+  class InstallOptions {
+    /**
+     * Time to initialize with, current system time by default.
+     */
+    public Object time;
+
+    /**
+     * Time to initialize with, current system time by default.
+     */
+    public InstallOptions setTime(long time) {
+      this.time = time;
+      return this;
+    }
+    /**
+     * Time to initialize with, current system time by default.
+     */
+    public InstallOptions setTime(String time) {
+      this.time = time;
+      return this;
+    }
+    /**
+     * Time to initialize with, current system time by default.
+     */
+    public InstallOptions setTime(Date time) {
+      this.time = time;
+      return this;
+    }
+  }
+  /**
+   * Advance the clock by jumping forward in time. Only fires due timers at most once. This is equivalent to user closing the
+   * laptop lid for a while and reopening it later, after given time.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * page.clock().fastForward(1000);
+   * page.clock().fastForward("30:00");
+   * }</pre>
+   *
+   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
+   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
+   * @since v1.45
+   */
+  void fastForward(long ticks);
+  /**
+   * Advance the clock by jumping forward in time. Only fires due timers at most once. This is equivalent to user closing the
+   * laptop lid for a while and reopening it later, after given time.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * page.clock().fastForward(1000);
+   * page.clock().fastForward("30:00");
+   * }</pre>
+   *
+   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
+   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
+   * @since v1.45
+   */
+  void fastForward(String ticks);
+  /**
+   * Install fake implementations for the following time-related functions:
+   * <ul>
+   * <li> {@code Date}</li>
+   * <li> {@code setTimeout}</li>
+   * <li> {@code clearTimeout}</li>
+   * <li> {@code setInterval}</li>
+   * <li> {@code clearInterval}</li>
+   * <li> {@code requestAnimationFrame}</li>
+   * <li> {@code cancelAnimationFrame}</li>
+   * <li> {@code requestIdleCallback}</li>
+   * <li> {@code cancelIdleCallback}</li>
+   * <li> {@code performance}</li>
+   * </ul>
+   *
+   * <p> Fake timers are used to manually control the flow of time in tests. They allow you to advance time, fire timers, and
+   * control the behavior of time-dependent functions. See {@link com.microsoft.playwright.Clock#runFor Clock.runFor()} and
+   * {@link com.microsoft.playwright.Clock#fastForward Clock.fastForward()} for more information.
+   *
+   * @since v1.45
+   */
+  default void install() {
+    install(null);
+  }
+  /**
+   * Install fake implementations for the following time-related functions:
+   * <ul>
+   * <li> {@code Date}</li>
+   * <li> {@code setTimeout}</li>
+   * <li> {@code clearTimeout}</li>
+   * <li> {@code setInterval}</li>
+   * <li> {@code clearInterval}</li>
+   * <li> {@code requestAnimationFrame}</li>
+   * <li> {@code cancelAnimationFrame}</li>
+   * <li> {@code requestIdleCallback}</li>
+   * <li> {@code cancelIdleCallback}</li>
+   * <li> {@code performance}</li>
+   * </ul>
+   *
+   * <p> Fake timers are used to manually control the flow of time in tests. They allow you to advance time, fire timers, and
+   * control the behavior of time-dependent functions. See {@link com.microsoft.playwright.Clock#runFor Clock.runFor()} and
+   * {@link com.microsoft.playwright.Clock#fastForward Clock.fastForward()} for more information.
+   *
+   * @since v1.45
+   */
+  void install(InstallOptions options);
+  /**
+   * Advance the clock, firing all the time-related callbacks.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * page.clock().runFor(1000);
+   * page.clock().runFor("30:00");
+   * }</pre>
+   *
+   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
+   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
+   * @since v1.45
+   */
+  void runFor(long ticks);
+  /**
+   * Advance the clock, firing all the time-related callbacks.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * page.clock().runFor(1000);
+   * page.clock().runFor("30:00");
+   * }</pre>
+   *
+   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
+   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
+   * @since v1.45
+   */
+  void runFor(String ticks);
+  /**
+   * Advance the clock by jumping forward in time and pause the time. Once this method is called, no timers are fired unless
+   * {@link com.microsoft.playwright.Clock#runFor Clock.runFor()}, {@link com.microsoft.playwright.Clock#fastForward
+   * Clock.fastForward()}, {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} or {@link
+   * com.microsoft.playwright.Clock#resume Clock.resume()} is called.
+   *
+   * <p> Only fires due timers at most once. This is equivalent to user closing the laptop lid for a while and reopening it at
+   * the specified time and pausing.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd");
+   * page.clock().pauseAt(format.parse("2020-02-02"));
+   * page.clock().pauseAt("2020-02-02");
+   * }</pre>
+   *
+   * @param time Time to pause at.
+   * @since v1.45
+   */
+  void pauseAt(long time);
+  /**
+   * Advance the clock by jumping forward in time and pause the time. Once this method is called, no timers are fired unless
+   * {@link com.microsoft.playwright.Clock#runFor Clock.runFor()}, {@link com.microsoft.playwright.Clock#fastForward
+   * Clock.fastForward()}, {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} or {@link
+   * com.microsoft.playwright.Clock#resume Clock.resume()} is called.
+   *
+   * <p> Only fires due timers at most once. This is equivalent to user closing the laptop lid for a while and reopening it at
+   * the specified time and pausing.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd");
+   * page.clock().pauseAt(format.parse("2020-02-02"));
+   * page.clock().pauseAt("2020-02-02");
+   * }</pre>
+   *
+   * @param time Time to pause at.
+   * @since v1.45
+   */
+  void pauseAt(String time);
+  /**
+   * Advance the clock by jumping forward in time and pause the time. Once this method is called, no timers are fired unless
+   * {@link com.microsoft.playwright.Clock#runFor Clock.runFor()}, {@link com.microsoft.playwright.Clock#fastForward
+   * Clock.fastForward()}, {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} or {@link
+   * com.microsoft.playwright.Clock#resume Clock.resume()} is called.
+   *
+   * <p> Only fires due timers at most once. This is equivalent to user closing the laptop lid for a while and reopening it at
+   * the specified time and pausing.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd");
+   * page.clock().pauseAt(format.parse("2020-02-02"));
+   * page.clock().pauseAt("2020-02-02");
+   * }</pre>
+   *
+   * @param time Time to pause at.
+   * @since v1.45
+   */
+  void pauseAt(Date time);
+  /**
+   * Resumes timers. Once this method is called, time resumes flowing, timers are fired as usual.
+   *
+   * @since v1.45
+   */
+  void resume();
+  /**
+   * Makes {@code Date.now} and {@code new Date()} return fixed fake time at all times, keeps all the timers running.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * page.clock().setFixedTime(new Date());
+   * page.clock().setFixedTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
+   * page.clock().setFixedTime("2020-02-02");
+   * }</pre>
+   *
+   * @param time Time to be set in milliseconds.
+   * @since v1.45
+   */
+  void setFixedTime(long time);
+  /**
+   * Makes {@code Date.now} and {@code new Date()} return fixed fake time at all times, keeps all the timers running.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * page.clock().setFixedTime(new Date());
+   * page.clock().setFixedTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
+   * page.clock().setFixedTime("2020-02-02");
+   * }</pre>
+   *
+   * @param time Time to be set in milliseconds.
+   * @since v1.45
+   */
+  void setFixedTime(String time);
+  /**
+   * Makes {@code Date.now} and {@code new Date()} return fixed fake time at all times, keeps all the timers running.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * page.clock().setFixedTime(new Date());
+   * page.clock().setFixedTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
+   * page.clock().setFixedTime("2020-02-02");
+   * }</pre>
+   *
+   * @param time Time to be set in milliseconds.
+   * @since v1.45
+   */
+  void setFixedTime(Date time);
+  /**
+   * Sets current system time but does not trigger any timers.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * page.clock().setSystemTime(new Date());
+   * page.clock().setSystemTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
+   * page.clock().setSystemTime("2020-02-02");
+   * }</pre>
+   *
+   * @param time Time to be set in milliseconds.
+   * @since v1.45
+   */
+  void setSystemTime(long time);
+  /**
+   * Sets current system time but does not trigger any timers.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * page.clock().setSystemTime(new Date());
+   * page.clock().setSystemTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
+   * page.clock().setSystemTime("2020-02-02");
+   * }</pre>
+   *
+   * @param time Time to be set in milliseconds.
+   * @since v1.45
+   */
+  void setSystemTime(String time);
+  /**
+   * Sets current system time but does not trigger any timers.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * page.clock().setSystemTime(new Date());
+   * page.clock().setSystemTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
+   * page.clock().setSystemTime("2020-02-02");
+   * }</pre>
+   *
+   * @param time Time to be set in milliseconds.
+   * @since v1.45
+   */
+  void setSystemTime(Date time);
+}
+

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

@@ -20,7 +20,7 @@ import java.util.*;
 
 /**
  * {@code ConsoleMessage} objects are dispatched by page via the {@link com.microsoft.playwright.Page#onConsoleMessage
- * Page.onConsoleMessage()} event. For each console messages logged in the page there will be corresponding event in the
+ * Page.onConsoleMessage()} event. For each console message logged in the page there will be corresponding event in the
  * Playwright context.
  * <pre>{@code
  * // Listen for all console messages and print them to the standard output.

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

@@ -65,9 +65,7 @@ public interface ElementHandle extends JSHandle {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -98,9 +96,7 @@ public interface ElementHandle extends JSHandle {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public CheckOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -161,13 +157,12 @@ public interface ElementHandle extends JSHandle {
     public Boolean force;
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public List<KeyboardModifier> modifiers;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option will default to {@code true} in the future.
      */
     public Boolean noWaitAfter;
     /**
@@ -220,16 +215,15 @@ public interface ElementHandle extends JSHandle {
     }
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public ClickOptions setModifiers(List<KeyboardModifier> modifiers) {
       this.modifiers = modifiers;
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option will default to {@code true} in the future.
      */
     public ClickOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -286,13 +280,12 @@ public interface ElementHandle extends JSHandle {
     public Boolean force;
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public List<KeyboardModifier> modifiers;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -338,16 +331,15 @@ public interface ElementHandle extends JSHandle {
     }
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public DblclickOptions setModifiers(List<KeyboardModifier> modifiers) {
       this.modifiers = modifiers;
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public DblclickOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -395,9 +387,7 @@ public interface ElementHandle extends JSHandle {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -417,9 +407,7 @@ public interface ElementHandle extends JSHandle {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public FillOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -444,13 +432,12 @@ public interface ElementHandle extends JSHandle {
     public Boolean force;
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public List<KeyboardModifier> modifiers;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -482,16 +469,15 @@ public interface ElementHandle extends JSHandle {
     }
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public HoverOptions setModifiers(List<KeyboardModifier> modifiers) {
       this.modifiers = modifiers;
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public HoverOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -558,9 +544,7 @@ public interface ElementHandle extends JSHandle {
      */
     public Double delay;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option will default to {@code true} in the future.
      */
     public Boolean noWaitAfter;
     /**
@@ -579,9 +563,7 @@ public interface ElementHandle extends JSHandle {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option will default to {@code true} in the future.
      */
     public PressOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -795,9 +777,7 @@ public interface ElementHandle extends JSHandle {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -817,9 +797,7 @@ public interface ElementHandle extends JSHandle {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public SelectOptionOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -876,9 +854,7 @@ public interface ElementHandle extends JSHandle {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -909,9 +885,7 @@ public interface ElementHandle extends JSHandle {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public SetCheckedOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -954,9 +928,7 @@ public interface ElementHandle extends JSHandle {
   }
   class SetInputFilesOptions {
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -968,9 +940,7 @@ public interface ElementHandle extends JSHandle {
     public Double timeout;
 
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public SetInputFilesOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -995,13 +965,12 @@ public interface ElementHandle extends JSHandle {
     public Boolean force;
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public List<KeyboardModifier> modifiers;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1033,16 +1002,15 @@ public interface ElementHandle extends JSHandle {
     }
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public TapOptions setModifiers(List<KeyboardModifier> modifiers) {
       this.modifiers = modifiers;
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public TapOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1089,9 +1057,7 @@ public interface ElementHandle extends JSHandle {
      */
     public Double delay;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1110,9 +1076,7 @@ public interface ElementHandle extends JSHandle {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public TypeOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1136,9 +1100,7 @@ public interface ElementHandle extends JSHandle {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1169,9 +1131,7 @@ public interface ElementHandle extends JSHandle {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public UncheckOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1324,7 +1284,6 @@ public interface ElementHandle extends JSHandle {
    * force} option is set.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now checked. If not, this method throws.</li>
    * </ol>
    *
@@ -1347,7 +1306,6 @@ public interface ElementHandle extends JSHandle {
    * force} option is set.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now checked. If not, this method throws.</li>
    * </ol>
    *
@@ -1413,8 +1371,6 @@ public interface ElementHandle extends JSHandle {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to double click in the center of the element, or the
    * specified {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set. Note that if the
-   * first click of the {@code dblclick()} triggers a navigation event, this method will throw.</li>
    * </ol>
    *
    * <p> If the element is detached from the DOM at any moment during the action, this method throws.
@@ -1437,8 +1393,6 @@ public interface ElementHandle extends JSHandle {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to double click in the center of the element, or the
    * specified {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set. Note that if the
-   * first click of the {@code dblclick()} triggers a navigation event, this method will throw.</li>
    * </ol>
    *
    * <p> If the element is detached from the DOM at any moment during the action, this method throws.
@@ -1695,7 +1649,6 @@ public interface ElementHandle extends JSHandle {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to hover over the center of the element, or the specified
    * {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * </ol>
    *
    * <p> If the element is detached from the DOM at any moment during the action, this method throws.
@@ -1716,7 +1669,6 @@ public interface ElementHandle extends JSHandle {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to hover over the center of the element, or the specified
    * {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * </ol>
    *
    * <p> If the element is detached from the DOM at any moment during the action, this method throws.
@@ -1820,7 +1772,7 @@ public interface ElementHandle extends JSHandle {
    * ArrowUp}, etc.
    *
    * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}.
+   * ShiftLeft}, {@code ControlOrMeta}.
    *
    * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
    *
@@ -1851,7 +1803,7 @@ public interface ElementHandle extends JSHandle {
    * ArrowUp}, etc.
    *
    * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}.
+   * ShiftLeft}, {@code ControlOrMeta}.
    *
    * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
    *
@@ -1918,6 +1870,8 @@ public interface ElementHandle extends JSHandle {
    * <p> Throws when {@code elementHandle} does not point to an element <a
    * href="https://developer.mozilla.org/en-US/docs/Web/API/Node/isConnected">connected</a> to a Document or a ShadowRoot.
    *
+   * <p> See <a href="https://playwright.dev/java/docs/input#scrolling">scrolling</a> for alternative ways to scroll.
+   *
    * @since v1.8
    */
   default void scrollIntoViewIfNeeded() {
@@ -1932,6 +1886,8 @@ public interface ElementHandle extends JSHandle {
    * <p> Throws when {@code elementHandle} does not point to an element <a
    * href="https://developer.mozilla.org/en-US/docs/Web/API/Node/isConnected">connected</a> to a Document or a ShadowRoot.
    *
+   * <p> See <a href="https://playwright.dev/java/docs/input#scrolling">scrolling</a> for alternative ways to scroll.
+   *
    * @since v1.8
    */
   void scrollIntoViewIfNeeded(ScrollIntoViewIfNeededOptions options);
@@ -2328,7 +2284,6 @@ public interface ElementHandle extends JSHandle {
    * unless {@code force} option is set. If the element is detached during the checks, the whole action is retried.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now checked or unchecked. If not, this method throws.</li>
    * </ol>
    *
@@ -2350,7 +2305,6 @@ public interface ElementHandle extends JSHandle {
    * unless {@code force} option is set. If the element is detached during the checks, the whole action is retried.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now checked or unchecked. If not, this method throws.</li>
    * </ol>
    *
@@ -2363,7 +2317,8 @@ public interface ElementHandle extends JSHandle {
   void setChecked(boolean checked, SetCheckedOptions options);
   /**
    * Sets the value of the file input to these file paths or files. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files. For inputs with
+   * a {@code [webkitdirectory]} attribute, only a single directory path is supported.
    *
    * <p> This method expects {@code ElementHandle} to point to an <a
    * href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input">input element</a>. However, if the element is
@@ -2378,7 +2333,8 @@ public interface ElementHandle extends JSHandle {
   }
   /**
    * Sets the value of the file input to these file paths or files. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files. For inputs with
+   * a {@code [webkitdirectory]} attribute, only a single directory path is supported.
    *
    * <p> This method expects {@code ElementHandle} to point to an <a
    * href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input">input element</a>. However, if the element is
@@ -2391,7 +2347,8 @@ public interface ElementHandle extends JSHandle {
   void setInputFiles(Path files, SetInputFilesOptions options);
   /**
    * Sets the value of the file input to these file paths or files. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files. For inputs with
+   * a {@code [webkitdirectory]} attribute, only a single directory path is supported.
    *
    * <p> This method expects {@code ElementHandle} to point to an <a
    * href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input">input element</a>. However, if the element is
@@ -2406,7 +2363,8 @@ public interface ElementHandle extends JSHandle {
   }
   /**
    * Sets the value of the file input to these file paths or files. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files. For inputs with
+   * a {@code [webkitdirectory]} attribute, only a single directory path is supported.
    *
    * <p> This method expects {@code ElementHandle} to point to an <a
    * href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input">input element</a>. However, if the element is
@@ -2419,7 +2377,8 @@ public interface ElementHandle extends JSHandle {
   void setInputFiles(Path[] files, SetInputFilesOptions options);
   /**
    * Sets the value of the file input to these file paths or files. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files. For inputs with
+   * a {@code [webkitdirectory]} attribute, only a single directory path is supported.
    *
    * <p> This method expects {@code ElementHandle} to point to an <a
    * href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input">input element</a>. However, if the element is
@@ -2434,7 +2393,8 @@ public interface ElementHandle extends JSHandle {
   }
   /**
    * Sets the value of the file input to these file paths or files. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files. For inputs with
+   * a {@code [webkitdirectory]} attribute, only a single directory path is supported.
    *
    * <p> This method expects {@code ElementHandle} to point to an <a
    * href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input">input element</a>. However, if the element is
@@ -2447,7 +2407,8 @@ public interface ElementHandle extends JSHandle {
   void setInputFiles(FilePayload files, SetInputFilesOptions options);
   /**
    * Sets the value of the file input to these file paths or files. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files. For inputs with
+   * a {@code [webkitdirectory]} attribute, only a single directory path is supported.
    *
    * <p> This method expects {@code ElementHandle} to point to an <a
    * href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input">input element</a>. However, if the element is
@@ -2462,7 +2423,8 @@ public interface ElementHandle extends JSHandle {
   }
   /**
    * Sets the value of the file input to these file paths or files. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files. For inputs with
+   * a {@code [webkitdirectory]} attribute, only a single directory path is supported.
    *
    * <p> This method expects {@code ElementHandle} to point to an <a
    * href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input">input element</a>. However, if the element is
@@ -2481,7 +2443,6 @@ public interface ElementHandle extends JSHandle {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#touchscreen Page.touchscreen()} to tap the center of the element, or the
    * specified {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * </ol>
    *
    * <p> If the element is detached from the DOM at any moment during the action, this method throws.
@@ -2504,7 +2465,6 @@ public interface ElementHandle extends JSHandle {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#touchscreen Page.touchscreen()} to tap the center of the element, or the
    * specified {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * </ol>
    *
    * <p> If the element is detached from the DOM at any moment during the action, this method throws.
@@ -2552,7 +2512,6 @@ public interface ElementHandle extends JSHandle {
    * force} option is set.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now unchecked. If not, this method throws.</li>
    * </ol>
    *
@@ -2575,7 +2534,6 @@ public interface ElementHandle extends JSHandle {
    * force} option is set.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now unchecked. If not, this method throws.</li>
    * </ol>
    *

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

@@ -30,9 +30,7 @@ import java.nio.file.Path;
 public interface FileChooser {
   class SetFilesOptions {
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -44,9 +42,7 @@ public interface FileChooser {
     public Double timeout;
 
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public SetFilesOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;

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

@@ -72,7 +72,7 @@ public interface Frame {
      */
     public Path path;
     /**
-     * Script type. Use 'module' in order to load a Javascript ES6 module. See <a
+     * Script type. Use 'module' in order to load a JavaScript ES6 module. See <a
      * href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script">script</a> for more details.
      */
     public String type;
@@ -97,7 +97,7 @@ public interface Frame {
       return this;
     }
     /**
-     * Script type. Use 'module' in order to load a Javascript ES6 module. See <a
+     * Script type. Use 'module' in order to load a JavaScript ES6 module. See <a
      * href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script">script</a> for more details.
      */
     public AddScriptTagOptions setType(String type) {
@@ -157,9 +157,7 @@ public interface Frame {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -195,9 +193,7 @@ public interface Frame {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public CheckOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -266,13 +262,12 @@ public interface Frame {
     public Boolean force;
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public List<KeyboardModifier> modifiers;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option will default to {@code true} in the future.
      */
     public Boolean noWaitAfter;
     /**
@@ -295,7 +290,8 @@ public interface Frame {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public Boolean trial;
 
@@ -330,16 +326,15 @@ public interface Frame {
     }
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public ClickOptions setModifiers(List<KeyboardModifier> modifiers) {
       this.modifiers = modifiers;
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option will default to {@code true} in the future.
      */
     public ClickOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -381,7 +376,8 @@ public interface Frame {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public ClickOptions setTrial(boolean trial) {
       this.trial = trial;
@@ -404,13 +400,12 @@ public interface Frame {
     public Boolean force;
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public List<KeyboardModifier> modifiers;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -433,7 +428,8 @@ public interface Frame {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public Boolean trial;
 
@@ -461,16 +457,15 @@ public interface Frame {
     }
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public DblclickOptions setModifiers(List<KeyboardModifier> modifiers) {
       this.modifiers = modifiers;
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public DblclickOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -512,7 +507,8 @@ public interface Frame {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public DblclickOptions setTrial(boolean trial) {
       this.trial = trial;
@@ -559,9 +555,7 @@ public interface Frame {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -602,9 +596,7 @@ public interface Frame {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public DragAndDropOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -691,9 +683,7 @@ public interface Frame {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -718,9 +708,7 @@ public interface Frame {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public FillOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1115,13 +1103,12 @@ public interface Frame {
     public Boolean force;
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public List<KeyboardModifier> modifiers;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1144,7 +1131,8 @@ public interface Frame {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public Boolean trial;
 
@@ -1158,16 +1146,15 @@ public interface Frame {
     }
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public HoverOptions setModifiers(List<KeyboardModifier> modifiers) {
       this.modifiers = modifiers;
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public HoverOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1209,7 +1196,8 @@ public interface Frame {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public HoverOptions setTrial(boolean trial) {
       this.trial = trial;
@@ -1607,9 +1595,7 @@ public interface Frame {
      */
     public Double delay;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option will default to {@code true} in the future.
      */
     public Boolean noWaitAfter;
     /**
@@ -1633,9 +1619,7 @@ public interface Frame {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option will default to {@code true} in the future.
      */
     public PressOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1683,9 +1667,7 @@ public interface Frame {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1710,9 +1692,7 @@ public interface Frame {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public SelectOptionOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1744,9 +1724,7 @@ public interface Frame {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1782,9 +1760,7 @@ public interface Frame {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public SetCheckedOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1884,9 +1860,7 @@ public interface Frame {
   }
   class SetInputFilesOptions {
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1903,9 +1877,7 @@ public interface Frame {
     public Double timeout;
 
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public SetInputFilesOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1938,13 +1910,12 @@ public interface Frame {
     public Boolean force;
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public List<KeyboardModifier> modifiers;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1967,7 +1938,8 @@ public interface Frame {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public Boolean trial;
 
@@ -1981,16 +1953,15 @@ public interface Frame {
     }
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public TapOptions setModifiers(List<KeyboardModifier> modifiers) {
       this.modifiers = modifiers;
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public TapOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -2032,7 +2003,8 @@ public interface Frame {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public TapOptions setTrial(boolean trial) {
       this.trial = trial;
@@ -2078,9 +2050,7 @@ public interface Frame {
      */
     public Double delay;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -2104,9 +2074,7 @@ public interface Frame {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public TypeOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -2138,9 +2106,7 @@ public interface Frame {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -2176,9 +2142,7 @@ public interface Frame {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public UncheckOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -2523,7 +2487,6 @@ public interface Frame {
    * unless {@code force} option is set. If the element is detached during the checks, the whole action is retried.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now checked. If not, this method throws.</li>
    * </ol>
    *
@@ -2546,7 +2509,6 @@ public interface Frame {
    * unless {@code force} option is set. If the element is detached during the checks, the whole action is retried.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now checked. If not, this method throws.</li>
    * </ol>
    *
@@ -2617,9 +2579,8 @@ public interface Frame {
    * unless {@code force} option is set. If the element is detached during the checks, the whole action is retried.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to double click in the center of the element, or the
-   * specified {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set. Note that if the
-   * first click of the {@code dblclick()} triggers a navigation event, this method will throw.</li>
+   * specified {@code position}. if the first click of the {@code dblclick()} triggers a navigation event, this method will
+   * throw.</li>
    * </ol>
    *
    * <p> When all steps combined have not finished during the specified {@code timeout}, this method throws a {@code
@@ -2641,9 +2602,8 @@ public interface Frame {
    * unless {@code force} option is set. If the element is detached during the checks, the whole action is retried.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to double click in the center of the element, or the
-   * specified {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set. Note that if the
-   * first click of the {@code dblclick()} triggers a navigation event, this method will throw.</li>
+   * specified {@code position}. if the first click of the {@code dblclick()} triggers a navigation event, this method will
+   * throw.</li>
    * </ol>
    *
    * <p> When all steps combined have not finished during the specified {@code timeout}, this method throws a {@code
@@ -3823,7 +3783,6 @@ public interface Frame {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to hover over the center of the element, or the specified
    * {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * </ol>
    *
    * <p> When all steps combined have not finished during the specified {@code timeout}, this method throws a {@code
@@ -3844,7 +3803,6 @@ public interface Frame {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to hover over the center of the element, or the specified
    * {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * </ol>
    *
    * <p> When all steps combined have not finished during the specified {@code timeout}, this method throws a {@code
@@ -4082,7 +4040,8 @@ public interface Frame {
    * ArrowUp}, etc.
    *
    * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}.
+   * ShiftLeft}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
+   * Meta} on macOS.
    *
    * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
    *
@@ -4111,7 +4070,8 @@ public interface Frame {
    * ArrowUp}, etc.
    *
    * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}.
+   * ShiftLeft}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
+   * Meta} on macOS.
    *
    * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
    *
@@ -4558,7 +4518,6 @@ public interface Frame {
    * unless {@code force} option is set. If the element is detached during the checks, the whole action is retried.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now checked or unchecked. If not, this method throws.</li>
    * </ol>
    *
@@ -4582,7 +4541,6 @@ public interface Frame {
    * unless {@code force} option is set. If the element is detached during the checks, the whole action is retried.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now checked or unchecked. If not, this method throws.</li>
    * </ol>
    *
@@ -4743,7 +4701,6 @@ public interface Frame {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#touchscreen Page.touchscreen()} to tap the center of the element, or the
    * specified {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * </ol>
    *
    * <p> When all steps combined have not finished during the specified {@code timeout}, this method throws a {@code
@@ -4766,7 +4723,6 @@ public interface Frame {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#touchscreen Page.touchscreen()} to tap the center of the element, or the
    * specified {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * </ol>
    *
    * <p> When all steps combined have not finished during the specified {@code timeout}, this method throws a {@code
@@ -4832,7 +4788,6 @@ public interface Frame {
    * unless {@code force} option is set. If the element is detached during the checks, the whole action is retried.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now unchecked. If not, this method throws.</li>
    * </ol>
    *
@@ -4855,7 +4810,6 @@ public interface Frame {
    * unless {@code force} option is set. If the element is detached during the checks, the whole action is retried.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now unchecked. If not, this method throws.</li>
    * </ol>
    *
@@ -4989,6 +4943,9 @@ public interface Frame {
    * <p> This returns when the frame reaches a required load state, {@code load} by default. The navigation must have been
    * committed when this method is called. If current document has already reached the required state, resolves immediately.
    *
+   * <p> <strong>NOTE:</strong> Most of the time, this method is not needed because Playwright <a
+   * href="https://playwright.dev/java/docs/actionability">auto-waits before every action</a>.
+   *
    * <p> <strong>Usage</strong>
    * <pre>{@code
    * frame.click("button"); // Click triggers navigation.
@@ -5014,6 +4971,9 @@ public interface Frame {
    * <p> This returns when the frame reaches a required load state, {@code load} by default. The navigation must have been
    * committed when this method is called. If current document has already reached the required state, resolves immediately.
    *
+   * <p> <strong>NOTE:</strong> Most of the time, this method is not needed because Playwright <a
+   * href="https://playwright.dev/java/docs/actionability">auto-waits before every action</a>.
+   *
    * <p> <strong>Usage</strong>
    * <pre>{@code
    * frame.click("button"); // Click triggers navigation.
@@ -5031,6 +4991,9 @@ public interface Frame {
    * <p> This returns when the frame reaches a required load state, {@code load} by default. The navigation must have been
    * committed when this method is called. If current document has already reached the required state, resolves immediately.
    *
+   * <p> <strong>NOTE:</strong> Most of the time, this method is not needed because Playwright <a
+   * href="https://playwright.dev/java/docs/actionability">auto-waits before every action</a>.
+   *
    * <p> <strong>Usage</strong>
    * <pre>{@code
    * frame.click("button"); // Click triggers navigation.

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

@@ -22,10 +22,10 @@ import java.util.regex.Pattern;
 /**
  * FrameLocator represents a view to the {@code iframe} on the page. It captures the logic sufficient to retrieve the
  * {@code iframe} and locate elements in that iframe. FrameLocator can be created with either {@link
- * com.microsoft.playwright.Page#frameLocator Page.frameLocator()} or {@link com.microsoft.playwright.Locator#frameLocator
- * Locator.frameLocator()} method.
+ * com.microsoft.playwright.Locator#contentFrame Locator.contentFrame()}, {@link com.microsoft.playwright.Page#frameLocator
+ * Page.frameLocator()} or {@link com.microsoft.playwright.Locator#frameLocator Locator.frameLocator()} method.
  * <pre>{@code
- * Locator locator = page.frameLocator("#my-frame").getByText("Submit");
+ * Locator locator = page.locator("#my-frame").contentFrame().getByText("Submit");
  * locator.click();
  * }</pre>
  *
@@ -35,10 +35,10 @@ import java.util.regex.Pattern;
  * a given selector.
  * <pre>{@code
  * // Throws if there are several frames in DOM:
- * page.frame_locator(".result-frame").getByRole(AriaRole.BUTTON).click();
+ * page.locator(".result-frame").contentFrame().getByRole(AriaRole.BUTTON).click();
  *
  * // Works because we explicitly tell locator to pick the first frame:
- * page.frame_locator(".result-frame").first().getByRole(AriaRole.BUTTON).click();
+ * page.locator(".result-frame").first().contentFrame().getByRole(AriaRole.BUTTON).click();
  * }</pre>
  *
  * <p> <strong>Converting Locator to FrameLocator</strong>
@@ -383,7 +383,8 @@ public interface FrameLocator {
     }
   }
   /**
-   * Returns locator to the first matching frame.
+   * @deprecated Use {@link com.microsoft.playwright.Locator#first Locator.first()} followed by {@link
+   * com.microsoft.playwright.Locator#contentFrame Locator.contentFrame()} instead.
    *
    * @since v1.17
    */
@@ -953,7 +954,8 @@ public interface FrameLocator {
    */
   Locator getByTitle(Pattern text, GetByTitleOptions options);
   /**
-   * Returns locator to the last matching frame.
+   * @deprecated Use {@link com.microsoft.playwright.Locator#last Locator.last()} followed by {@link
+   * com.microsoft.playwright.Locator#contentFrame Locator.contentFrame()} instead.
    *
    * @since v1.17
    */
@@ -1003,7 +1005,8 @@ public interface FrameLocator {
    */
   Locator locator(Locator selectorOrLocator, LocatorOptions options);
   /**
-   * Returns locator to the n-th matching frame. It's zero based, {@code nth(0)} selects the first frame.
+   * @deprecated Use {@link com.microsoft.playwright.Locator#nth Locator.nth()} followed by {@link
+   * com.microsoft.playwright.Locator#contentFrame Locator.contentFrame()} instead.
    *
    * @since v1.17
    */
@@ -1018,7 +1021,7 @@ public interface FrameLocator {
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
-   * FrameLocator frameLocator = page.frameLocator("iframe[name=\"embedded\"]");
+   * FrameLocator frameLocator = page.locator("iframe[name=\"embedded\"]").contentFrame();
    * // ...
    * Locator locator = frameLocator.owner();
    * assertThat(locator).isVisible();

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

@@ -97,7 +97,8 @@ public interface Keyboard {
    * ArrowUp}, etc.
    *
    * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}.
+   * ShiftLeft}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
+   * Meta} on macOS.
    *
    * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
    *
@@ -147,7 +148,8 @@ public interface Keyboard {
    * ArrowUp}, etc.
    *
    * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}.
+   * ShiftLeft}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
+   * Meta} on macOS.
    *
    * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
    *
@@ -193,7 +195,8 @@ public interface Keyboard {
    * ArrowUp}, etc.
    *
    * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}.
+   * ShiftLeft}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
+   * Meta} on macOS.
    *
    * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
    *

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

@@ -76,9 +76,7 @@ public interface Locator {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -109,9 +107,7 @@ public interface Locator {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public CheckOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -159,9 +155,7 @@ public interface Locator {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -181,9 +175,7 @@ public interface Locator {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public ClearOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -220,13 +212,12 @@ public interface Locator {
     public Boolean force;
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public List<KeyboardModifier> modifiers;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option will default to {@code true} in the future.
      */
     public Boolean noWaitAfter;
     /**
@@ -244,7 +235,8 @@ public interface Locator {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public Boolean trial;
 
@@ -279,16 +271,15 @@ public interface Locator {
     }
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public ClickOptions setModifiers(List<KeyboardModifier> modifiers) {
       this.modifiers = modifiers;
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option will default to {@code true} in the future.
      */
     public ClickOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -322,7 +313,8 @@ public interface Locator {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public ClickOptions setTrial(boolean trial) {
       this.trial = trial;
@@ -345,13 +337,12 @@ public interface Locator {
     public Boolean force;
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public List<KeyboardModifier> modifiers;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -369,7 +360,8 @@ public interface Locator {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public Boolean trial;
 
@@ -397,16 +389,15 @@ public interface Locator {
     }
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public DblclickOptions setModifiers(List<KeyboardModifier> modifiers) {
       this.modifiers = modifiers;
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public DblclickOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -440,7 +431,8 @@ public interface Locator {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public DblclickOptions setTrial(boolean trial) {
       this.trial = trial;
@@ -474,9 +466,7 @@ public interface Locator {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -512,9 +502,7 @@ public interface Locator {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public DragToOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -637,9 +625,7 @@ public interface Locator {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -659,9 +645,7 @@ public interface Locator {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public FillOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1056,13 +1040,12 @@ public interface Locator {
     public Boolean force;
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public List<KeyboardModifier> modifiers;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1080,7 +1063,8 @@ public interface Locator {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public Boolean trial;
 
@@ -1094,16 +1078,15 @@ public interface Locator {
     }
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public HoverOptions setModifiers(List<KeyboardModifier> modifiers) {
       this.modifiers = modifiers;
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public HoverOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1137,7 +1120,8 @@ public interface Locator {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public HoverOptions setTrial(boolean trial) {
       this.trial = trial;
@@ -1418,9 +1402,7 @@ public interface Locator {
      */
     public Double delay;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option will default to {@code true} in the future.
      */
     public Boolean noWaitAfter;
     /**
@@ -1439,9 +1421,7 @@ public interface Locator {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option will default to {@code true} in the future.
      */
     public PressOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1464,9 +1444,7 @@ public interface Locator {
      */
     public Double delay;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1485,9 +1463,7 @@ public interface Locator {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public PressSequentiallyOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1701,9 +1677,7 @@ public interface Locator {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1723,9 +1697,7 @@ public interface Locator {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public SelectOptionOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1782,9 +1754,7 @@ public interface Locator {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1815,9 +1785,7 @@ public interface Locator {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public SetCheckedOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1860,9 +1828,7 @@ public interface Locator {
   }
   class SetInputFilesOptions {
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1874,9 +1840,7 @@ public interface Locator {
     public Double timeout;
 
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public SetInputFilesOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1901,13 +1865,12 @@ public interface Locator {
     public Boolean force;
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public List<KeyboardModifier> modifiers;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -1925,7 +1888,8 @@ public interface Locator {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public Boolean trial;
 
@@ -1939,16 +1903,15 @@ public interface Locator {
     }
     /**
      * Modifier keys to press. Ensures that only these modifiers are pressed during the operation, and then restores current
-     * modifiers back. If not specified, currently pressed modifiers are used.
+     * modifiers back. If not specified, currently pressed modifiers are used. "ControlOrMeta" resolves to "Control" on Windows
+     * and Linux and to "Meta" on macOS.
      */
     public TapOptions setModifiers(List<KeyboardModifier> modifiers) {
       this.modifiers = modifiers;
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public TapOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -1982,7 +1945,8 @@ public interface Locator {
     /**
      * When set, this method only performs the <a href="https://playwright.dev/java/docs/actionability">actionability</a>
      * checks and skips the action. Defaults to {@code false}. Useful to wait until the element is ready for the action without
-     * performing it.
+     * performing it. Note that keyboard {@code modifiers} will be pressed regardless of {@code trial} to allow testing
+     * elements which are only visible when those keys are pressed.
      */
     public TapOptions setTrial(boolean trial) {
       this.trial = trial;
@@ -2015,9 +1979,7 @@ public interface Locator {
      */
     public Double delay;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -2036,9 +1998,7 @@ public interface Locator {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public TypeOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -2062,9 +2022,7 @@ public interface Locator {
      */
     public Boolean force;
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public Boolean noWaitAfter;
     /**
@@ -2095,9 +2053,7 @@ public interface Locator {
       return this;
     }
     /**
-     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
-     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
-     * inaccessible pages. Defaults to {@code false}.
+     * @deprecated This option has no effect.
      */
     public UncheckOptions setNoWaitAfter(boolean noWaitAfter) {
       this.noWaitAfter = noWaitAfter;
@@ -2189,10 +2145,9 @@ public interface Locator {
    * When the locator points to a list of elements, this returns an array of locators, pointing to their respective elements.
    *
    * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.Locator#all Locator.all()} does not wait for elements to match the locator, and instead
-   * immediately returns whatever is present in the page.  When the list of elements changes dynamically, {@link
-   * com.microsoft.playwright.Locator#all Locator.all()} will produce unpredictable and flaky results.  When the list of
-   * elements is stable, but loaded dynamically, wait for the full list to finish loading before calling {@link
-   * com.microsoft.playwright.Locator#all Locator.all()}.
+   * immediately returns whatever is present in the page.When the list of elements changes dynamically, {@link com.microsoft.playwright.Locator#all Locator.all()} will produce
+   * unpredictable and flaky results.When the list of elements is stable, but loaded dynamically, wait for the full list to finish loading before calling
+   * {@link com.microsoft.playwright.Locator#all Locator.all()}.
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
@@ -2326,7 +2281,6 @@ public interface Locator {
    * force} option is set.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now checked. If not, this method throws.</li>
    * </ol>
    *
@@ -2358,7 +2312,6 @@ public interface Locator {
    * force} option is set.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now checked. If not, this method throws.</li>
    * </ol>
    *
@@ -2524,8 +2477,6 @@ public interface Locator {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to double click in the center of the element, or the
    * specified {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set. Note that if the
-   * first click of the {@code dblclick()} triggers a navigation event, this method will throw.</li>
    * </ol>
    *
    * <p> If the element is detached from the DOM at any moment during the action, this method throws.
@@ -2552,8 +2503,6 @@ public interface Locator {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to double click in the center of the element, or the
    * specified {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set. Note that if the
-   * first click of the {@code dblclick()} triggers a navigation event, this method will throw.</li>
    * </ol>
    *
    * <p> If the element is detached from the DOM at any moment during the action, this method throws.
@@ -3749,7 +3698,6 @@ public interface Locator {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to hover over the center of the element, or the specified
    * {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * </ol>
    *
    * <p> If the element is detached from the DOM at any moment during the action, this method throws.
@@ -3779,7 +3727,6 @@ public interface Locator {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to hover over the center of the element, or the specified
    * {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * </ol>
    *
    * <p> If the element is detached from the DOM at any moment during the action, this method throws.
@@ -4137,7 +4084,10 @@ public interface Locator {
    */
   Locator nth(int index);
   /**
-   * Creates a locator that matches either of the two locators.
+   * Creates a locator matching all elements that match one or both of the two locators.
+   *
+   * <p> Note that when both locators match something, the resulting locator will have multiple matches and violate <a
+   * href="https://playwright.dev/java/docs/locators#strictness">locator strictness</a> guidelines.
    *
    * <p> <strong>Usage</strong>
    *
@@ -4186,7 +4136,8 @@ public interface Locator {
    * ArrowUp}, etc.
    *
    * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}.
+   * ShiftLeft}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
+   * Meta} on macOS.
    *
    * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
    *
@@ -4226,7 +4177,8 @@ public interface Locator {
    * ArrowUp}, etc.
    *
    * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}.
+   * ShiftLeft}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
+   * Meta} on macOS.
    *
    * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
    *
@@ -4362,6 +4314,8 @@ public interface Locator {
    * href="https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API">IntersectionObserver</a>'s {@code
    * ratio}.
    *
+   * <p> See <a href="https://playwright.dev/java/docs/input#scrolling">scrolling</a> for alternative ways to scroll.
+   *
    * @since v1.14
    */
   default void scrollIntoViewIfNeeded() {
@@ -4373,6 +4327,8 @@ public interface Locator {
    * href="https://developer.mozilla.org/en-US/docs/Web/API/Intersection_Observer_API">IntersectionObserver</a>'s {@code
    * ratio}.
    *
+   * <p> See <a href="https://playwright.dev/java/docs/input#scrolling">scrolling</a> for alternative ways to scroll.
+   *
    * @since v1.14
    */
   void scrollIntoViewIfNeeded(ScrollIntoViewIfNeededOptions options);
@@ -4826,7 +4782,6 @@ public interface Locator {
    * unless {@code force} option is set. If the element is detached during the checks, the whole action is retried.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now checked or unchecked. If not, this method throws.</li>
    * </ol>
    *
@@ -4857,7 +4812,6 @@ public interface Locator {
    * unless {@code force} option is set. If the element is detached during the checks, the whole action is retried.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now checked or unchecked. If not, this method throws.</li>
    * </ol>
    *
@@ -4869,7 +4823,8 @@ public interface Locator {
    */
   void setChecked(boolean checked, SetCheckedOptions options);
   /**
-   * Upload file or multiple files into {@code <input type=file>}.
+   * Upload file or multiple files into {@code <input type=file>}. For inputs with a {@code [webkitdirectory]} attribute,
+   * only a single directory path is supported.
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
@@ -4879,6 +4834,9 @@ public interface Locator {
    * // Select multiple files
    * page.getByLabel("Upload files").setInputFiles(new Path[] {Paths.get("file1.txt"), Paths.get("file2.txt")});
    *
+   * // Select a directory
+   * page.getByLabel("Upload directory").setInputFiles(Paths.get("mydir"));
+   *
    * // Remove all the selected files
    * page.getByLabel("Upload file").setInputFiles(new Path[0]);
    *
@@ -4904,7 +4862,8 @@ public interface Locator {
     setInputFiles(files, null);
   }
   /**
-   * Upload file or multiple files into {@code <input type=file>}.
+   * Upload file or multiple files into {@code <input type=file>}. For inputs with a {@code [webkitdirectory]} attribute,
+   * only a single directory path is supported.
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
@@ -4914,6 +4873,9 @@ public interface Locator {
    * // Select multiple files
    * page.getByLabel("Upload files").setInputFiles(new Path[] {Paths.get("file1.txt"), Paths.get("file2.txt")});
    *
+   * // Select a directory
+   * page.getByLabel("Upload directory").setInputFiles(Paths.get("mydir"));
+   *
    * // Remove all the selected files
    * page.getByLabel("Upload file").setInputFiles(new Path[0]);
    *
@@ -4937,7 +4899,8 @@ public interface Locator {
    */
   void setInputFiles(Path files, SetInputFilesOptions options);
   /**
-   * Upload file or multiple files into {@code <input type=file>}.
+   * Upload file or multiple files into {@code <input type=file>}. For inputs with a {@code [webkitdirectory]} attribute,
+   * only a single directory path is supported.
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
@@ -4947,6 +4910,9 @@ public interface Locator {
    * // Select multiple files
    * page.getByLabel("Upload files").setInputFiles(new Path[] {Paths.get("file1.txt"), Paths.get("file2.txt")});
    *
+   * // Select a directory
+   * page.getByLabel("Upload directory").setInputFiles(Paths.get("mydir"));
+   *
    * // Remove all the selected files
    * page.getByLabel("Upload file").setInputFiles(new Path[0]);
    *
@@ -4972,7 +4938,8 @@ public interface Locator {
     setInputFiles(files, null);
   }
   /**
-   * Upload file or multiple files into {@code <input type=file>}.
+   * Upload file or multiple files into {@code <input type=file>}. For inputs with a {@code [webkitdirectory]} attribute,
+   * only a single directory path is supported.
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
@@ -4982,6 +4949,9 @@ public interface Locator {
    * // Select multiple files
    * page.getByLabel("Upload files").setInputFiles(new Path[] {Paths.get("file1.txt"), Paths.get("file2.txt")});
    *
+   * // Select a directory
+   * page.getByLabel("Upload directory").setInputFiles(Paths.get("mydir"));
+   *
    * // Remove all the selected files
    * page.getByLabel("Upload file").setInputFiles(new Path[0]);
    *
@@ -5005,7 +4975,8 @@ public interface Locator {
    */
   void setInputFiles(Path[] files, SetInputFilesOptions options);
   /**
-   * Upload file or multiple files into {@code <input type=file>}.
+   * Upload file or multiple files into {@code <input type=file>}. For inputs with a {@code [webkitdirectory]} attribute,
+   * only a single directory path is supported.
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
@@ -5015,6 +4986,9 @@ public interface Locator {
    * // Select multiple files
    * page.getByLabel("Upload files").setInputFiles(new Path[] {Paths.get("file1.txt"), Paths.get("file2.txt")});
    *
+   * // Select a directory
+   * page.getByLabel("Upload directory").setInputFiles(Paths.get("mydir"));
+   *
    * // Remove all the selected files
    * page.getByLabel("Upload file").setInputFiles(new Path[0]);
    *
@@ -5040,7 +5014,8 @@ public interface Locator {
     setInputFiles(files, null);
   }
   /**
-   * Upload file or multiple files into {@code <input type=file>}.
+   * Upload file or multiple files into {@code <input type=file>}. For inputs with a {@code [webkitdirectory]} attribute,
+   * only a single directory path is supported.
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
@@ -5050,6 +5025,9 @@ public interface Locator {
    * // Select multiple files
    * page.getByLabel("Upload files").setInputFiles(new Path[] {Paths.get("file1.txt"), Paths.get("file2.txt")});
    *
+   * // Select a directory
+   * page.getByLabel("Upload directory").setInputFiles(Paths.get("mydir"));
+   *
    * // Remove all the selected files
    * page.getByLabel("Upload file").setInputFiles(new Path[0]);
    *
@@ -5073,7 +5051,8 @@ public interface Locator {
    */
   void setInputFiles(FilePayload files, SetInputFilesOptions options);
   /**
-   * Upload file or multiple files into {@code <input type=file>}.
+   * Upload file or multiple files into {@code <input type=file>}. For inputs with a {@code [webkitdirectory]} attribute,
+   * only a single directory path is supported.
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
@@ -5083,6 +5062,9 @@ public interface Locator {
    * // Select multiple files
    * page.getByLabel("Upload files").setInputFiles(new Path[] {Paths.get("file1.txt"), Paths.get("file2.txt")});
    *
+   * // Select a directory
+   * page.getByLabel("Upload directory").setInputFiles(Paths.get("mydir"));
+   *
    * // Remove all the selected files
    * page.getByLabel("Upload file").setInputFiles(new Path[0]);
    *
@@ -5108,7 +5090,8 @@ public interface Locator {
     setInputFiles(files, null);
   }
   /**
-   * Upload file or multiple files into {@code <input type=file>}.
+   * Upload file or multiple files into {@code <input type=file>}. For inputs with a {@code [webkitdirectory]} attribute,
+   * only a single directory path is supported.
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
@@ -5118,6 +5101,9 @@ public interface Locator {
    * // Select multiple files
    * page.getByLabel("Upload files").setInputFiles(new Path[] {Paths.get("file1.txt"), Paths.get("file2.txt")});
    *
+   * // Select a directory
+   * page.getByLabel("Upload directory").setInputFiles(Paths.get("mydir"));
+   *
    * // Remove all the selected files
    * page.getByLabel("Upload file").setInputFiles(new Path[0]);
    *
@@ -5152,7 +5138,6 @@ public interface Locator {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#touchscreen Page.touchscreen()} to tap the center of the element, or the
    * specified {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * </ol>
    *
    * <p> If the element is detached from the DOM at any moment during the action, this method throws.
@@ -5179,7 +5164,6 @@ public interface Locator {
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#touchscreen Page.touchscreen()} to tap the center of the element, or the
    * specified {@code position}.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * </ol>
    *
    * <p> If the element is detached from the DOM at any moment during the action, this method throws.
@@ -5252,7 +5236,6 @@ public interface Locator {
    * force} option is set.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now unchecked. If not, this method throws.</li>
    * </ol>
    *
@@ -5284,7 +5267,6 @@ public interface Locator {
    * force} option is set.</li>
    * <li> Scroll the element into view if needed.</li>
    * <li> Use {@link com.microsoft.playwright.Page#mouse Page.mouse()} to click in the center of the element.</li>
-   * <li> Wait for initiated navigations to either succeed or fail, unless {@code noWaitAfter} option is set.</li>
    * <li> Ensure that the element is now unchecked. If not, this method throws.</li>
    * </ol>
    *

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

@@ -163,6 +163,8 @@ public interface Mouse {
    * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
    * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
    *
+   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
+   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
    * @since v1.8
    */
   default void click(double x, double y) {
@@ -172,6 +174,8 @@ public interface Mouse {
    * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
    * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
    *
+   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
+   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
    * @since v1.8
    */
   void click(double x, double y, ClickOptions options);
@@ -180,6 +184,8 @@ public interface Mouse {
    * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}, {@link com.microsoft.playwright.Mouse#down
    * Mouse.down()} and {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
    *
+   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
+   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
    * @since v1.8
    */
   default void dblclick(double x, double y) {
@@ -190,6 +196,8 @@ public interface Mouse {
    * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}, {@link com.microsoft.playwright.Mouse#down
    * Mouse.down()} and {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
    *
+   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
+   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
    * @since v1.8
    */
   void dblclick(double x, double y, DblclickOptions options);
@@ -210,6 +218,8 @@ public interface Mouse {
   /**
    * Dispatches a {@code mousemove} event.
    *
+   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
+   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
    * @since v1.8
    */
   default void move(double x, double y) {
@@ -218,6 +228,8 @@ public interface Mouse {
   /**
    * Dispatches a {@code mousemove} event.
    *
+   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
+   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
    * @since v1.8
    */
   void move(double x, double y, MoveOptions options);
@@ -236,7 +248,8 @@ public interface Mouse {
    */
   void up(UpOptions options);
   /**
-   * Dispatches a {@code wheel} event.
+   * Dispatches a {@code wheel} event. This method is usually used to manually scroll the page. See <a
+   * href="https://playwright.dev/java/docs/input#scrolling">scrolling</a> for alternative ways to scroll.
    *
    * <p> <strong>NOTE:</strong> Wheel events may cause scrolling if they are not handled, and this method does not wait for the scrolling to finish
    * before returning.

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

@@ -99,7 +99,7 @@ public interface Request {
    */
   List<HttpHeader> headersArray();
   /**
-   * Returns the value of the header matching the name. The name is case insensitive.
+   * Returns the value of the header matching the name. The name is case-insensitive.
    *
    * @param name Name of the header.
    * @since v1.15

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

@@ -71,7 +71,7 @@ public interface Response {
    */
   List<HttpHeader> headersArray();
   /**
-   * Returns the value of the header matching the name. The name is case insensitive. If multiple headers have the same name
+   * Returns the value of the header matching the name. The name is case-insensitive. If multiple headers have the same name
    * (except {@code set-cookie}), they are returned as a list separated by {@code , }. For {@code set-cookie}, the {@code \n}
    * separator is used. If no headers are found, {@code null} is returned.
    *
@@ -80,7 +80,7 @@ public interface Response {
    */
   String headerValue(String name);
   /**
-   * Returns all values of the headers matching the name, for example {@code set-cookie}. The name is case insensitive.
+   * Returns all values of the headers matching the name, for example {@code set-cookie}. The name is case-insensitive.
    *
    * @param name Name of the header.
    * @since v1.15

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

@@ -147,6 +147,12 @@ public interface Route {
      * exceeded. Defaults to {@code 20}. Pass {@code 0} to not follow redirects.
      */
     public Integer maxRedirects;
+    /**
+     * Maximum number of times network errors should be retried. Currently only {@code ECONNRESET} error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to {@code 0} - no
+     * retries.
+     */
+    public Integer maxRetries;
     /**
      * If set changes the request method (e.g. GET or POST).
      */
@@ -179,6 +185,15 @@ public interface Route {
       this.maxRedirects = maxRedirects;
       return this;
     }
+    /**
+     * Maximum number of times network errors should be retried. Currently only {@code ECONNRESET} error is retried. Does not
+     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to {@code 0} - no
+     * retries.
+     */
+    public FetchOptions setMaxRetries(int maxRetries) {
+      this.maxRetries = maxRetries;
+      return this;
+    }
     /**
      * If set changes the request method (e.g. GET or POST).
      */
@@ -333,7 +348,7 @@ public interface Route {
    */
   void abort(String errorCode);
   /**
-   * Continues route's request with optional overrides.
+   * Sends route's request to the network with optional overrides.
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
@@ -353,13 +368,17 @@ public interface Route {
    * through redirects, use the combination of {@link com.microsoft.playwright.Route#fetch Route.fetch()} and {@link
    * com.microsoft.playwright.Route#fulfill Route.fulfill()} instead.
    *
+   * <p> {@link com.microsoft.playwright.Route#resume Route.resume()} will immediately send the request to the network, other
+   * matching handlers won't be invoked. Use {@link com.microsoft.playwright.Route#fallback Route.fallback()} If you want
+   * next matching handler in the chain to be invoked.
+   *
    * @since v1.8
    */
   default void resume() {
     resume(null);
   }
   /**
-   * Continues route's request with optional overrides.
+   * Sends route's request to the network with optional overrides.
    *
    * <p> <strong>Usage</strong>
    * <pre>{@code
@@ -379,16 +398,23 @@ public interface Route {
    * through redirects, use the combination of {@link com.microsoft.playwright.Route#fetch Route.fetch()} and {@link
    * com.microsoft.playwright.Route#fulfill Route.fulfill()} instead.
    *
+   * <p> {@link com.microsoft.playwright.Route#resume Route.resume()} will immediately send the request to the network, other
+   * matching handlers won't be invoked. Use {@link com.microsoft.playwright.Route#fallback Route.fallback()} If you want
+   * next matching handler in the chain to be invoked.
+   *
    * @since v1.8
    */
   void resume(ResumeOptions options);
   /**
-   * When several routes match the given pattern, they run in the order opposite to their registration. That way the last
+   * Continues route's request with optional overrides. The method is similar to {@link com.microsoft.playwright.Route#resume
+   * Route.resume()} with the difference that other matching handlers will be invoked before sending the request.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * <p> When several routes match the given pattern, they run in the order opposite to their registration. That way the last
    * registered route can always override all the previous ones. In the example below, request will be handled by the
    * bottom-most handler first, then it'll fall back to the previous one and in the end will be aborted by the first
    * registered route.
-   *
-   * <p> <strong>Usage</strong>
    * <pre>{@code
    * page.route("**\/*", route -> {
    *   // Runs last.
@@ -442,18 +468,24 @@ public interface Route {
    * });
    * }</pre>
    *
+   * <p> Use {@link com.microsoft.playwright.Route#resume Route.resume()} to immediately send the request to the network, other
+   * matching handlers won't be invoked in that case.
+   *
    * @since v1.23
    */
   default void fallback() {
     fallback(null);
   }
   /**
-   * When several routes match the given pattern, they run in the order opposite to their registration. That way the last
+   * Continues route's request with optional overrides. The method is similar to {@link com.microsoft.playwright.Route#resume
+   * Route.resume()} with the difference that other matching handlers will be invoked before sending the request.
+   *
+   * <p> <strong>Usage</strong>
+   *
+   * <p> When several routes match the given pattern, they run in the order opposite to their registration. That way the last
    * registered route can always override all the previous ones. In the example below, request will be handled by the
    * bottom-most handler first, then it'll fall back to the previous one and in the end will be aborted by the first
    * registered route.
-   *
-   * <p> <strong>Usage</strong>
    * <pre>{@code
    * page.route("**\/*", route -> {
    *   // Runs last.
@@ -507,6 +539,9 @@ public interface Route {
    * });
    * }</pre>
    *
+   * <p> Use {@link com.microsoft.playwright.Route#resume Route.resume()} to immediately send the request to the network, other
+   * matching handlers won't be invoked in that case.
+   *
    * @since v1.23
    */
   void fallback(FallbackOptions options);

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

@@ -28,6 +28,8 @@ public interface Touchscreen {
    * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.Page#tap Page.tap()} the method will throw if {@code hasTouch} option of the browser
    * context is false.
    *
+   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
+   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
    * @since v1.8
    */
   void tap(double x, double y);

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

@@ -39,8 +39,8 @@ public interface Tracing {
   class StartOptions {
     /**
      * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} folder specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify the
-     * final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stop
+     * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
+     * the final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stop
      * Tracing.stop()} instead.
      */
     public String name;
@@ -69,8 +69,8 @@ public interface Tracing {
 
     /**
      * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} folder specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify the
-     * final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stop
+     * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
+     * the final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stop
      * Tracing.stop()} instead.
      */
     public StartOptions setName(String name) {
@@ -115,8 +115,8 @@ public interface Tracing {
   class StartChunkOptions {
     /**
      * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} folder specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify the
-     * final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stopChunk
+     * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
+     * the final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stopChunk
      * Tracing.stopChunk()} instead.
      */
     public String name;
@@ -127,8 +127,8 @@ public interface Tracing {
 
     /**
      * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} folder specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify the
-     * final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stopChunk
+     * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
+     * the final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stopChunk
      * Tracing.stopChunk()} instead.
      */
     public StartChunkOptions setName(String name) {

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

@@ -0,0 +1,223 @@
+/*
+ * 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;
+
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
+/**
+ * Whenever a <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket">{@code WebSocket}</a> route is set up
+ * with {@link com.microsoft.playwright.Page#routeWebSocket Page.routeWebSocket()} or {@link
+ * com.microsoft.playwright.BrowserContext#routeWebSocket BrowserContext.routeWebSocket()}, the {@code WebSocketRoute}
+ * object allows to handle the WebSocket, like an actual server would do.
+ *
+ * <p> <strong>Mocking</strong>
+ *
+ * <p> By default, the routed WebSocket will not connect to the server. This way, you can mock entire communcation over the
+ * WebSocket. Here is an example that responds to a {@code "request"} with a {@code "response"}.
+ * <pre>{@code
+ * page.routeWebSocket("wss://example.com/ws", ws -> {
+ *   ws.onMessage(message -> {
+ *     if ("request".equals(message))
+ *       ws.send("response");
+ *   });
+ * });
+ * }</pre>
+ *
+ * <p> Since we do not call {@link com.microsoft.playwright.WebSocketRoute#connectToServer WebSocketRoute.connectToServer()}
+ * inside the WebSocket route handler, Playwright assumes that WebSocket will be mocked, and opens the WebSocket inside the
+ * page automatically.
+ *
+ * <p> Here is another example that handles JSON messages:
+ * <pre>{@code
+ * page.routeWebSocket("wss://example.com/ws", ws -> {
+ *   ws.onMessage(message -> {
+ *     JsonObject json = new JsonParser().parse(message).getAsJsonObject();
+ *     if ("question".equals(json.get("request").getAsString())) {
+ *       Map<String, String> result = new HashMap();
+ *       result.put("response", "answer");
+ *       ws.send(gson.toJson(result));
+ *     }
+ *   });
+ * });
+ * }</pre>
+ *
+ * <p> <strong>Intercepting</strong>
+ *
+ * <p> Alternatively, you may want to connect to the actual server, but intercept messages in-between and modify or block them.
+ * Calling {@link com.microsoft.playwright.WebSocketRoute#connectToServer WebSocketRoute.connectToServer()} returns a
+ * server-side {@code WebSocketRoute} instance that you can send messages to, or handle incoming messages.
+ *
+ * <p> Below is an example that modifies some messages sent by the page to the server. Messages sent from the server to the
+ * page are left intact, relying on the default forwarding.
+ * <pre>{@code
+ * page.routeWebSocket("/ws", ws -> {
+ *   WebSocketRoute server = ws.connectToServer();
+ *   ws.onMessage(message -> {
+ *     if ("request".equals(message))
+ *       server.send("request2");
+ *     else
+ *       server.send(message);
+ *   });
+ * });
+ * }</pre>
+ *
+ * <p> After connecting to the server, all **messages are forwarded** between the page and the server by default.
+ *
+ * <p> However, if you call {@link com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} on the
+ * original route, messages from the page to the server **will not be forwarded** anymore, but should instead be handled by
+ * the {@code handler}.
+ *
+ * <p> Similarly, calling {@link com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} on the
+ * server-side WebSocket will **stop forwarding messages** from the server to the page, and {@code handler} should take
+ * care of them.
+ *
+ * <p> The following example blocks some messages in both directions. Since it calls {@link
+ * com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} in both directions, there is no automatic
+ * forwarding at all.
+ * <pre>{@code
+ * page.routeWebSocket("/ws", ws -> {
+ *   WebSocketRoute server = ws.connectToServer();
+ *   ws.onMessage(message -> {
+ *     if (!"blocked-from-the-page".equals(message))
+ *       server.send(message);
+ *   });
+ *   server.onMessage(message -> {
+ *     if (!"blocked-from-the-server".equals(message))
+ *       ws.send(message);
+ *   });
+ * });
+ * }</pre>
+ */
+public interface WebSocketRoute {
+  class CloseOptions {
+    /**
+     * Optional <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code">close code</a>.
+     */
+    public Integer code;
+    /**
+     * Optional <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason">close reason</a>.
+     */
+    public String reason;
+
+    /**
+     * Optional <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code">close code</a>.
+     */
+    public CloseOptions setCode(int code) {
+      this.code = code;
+      return this;
+    }
+    /**
+     * Optional <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason">close reason</a>.
+     */
+    public CloseOptions setReason(String reason) {
+      this.reason = reason;
+      return this;
+    }
+  }
+  /**
+   * Closes one side of the WebSocket connection.
+   *
+   * @since v1.48
+   */
+  default void close() {
+    close(null);
+  }
+  /**
+   * Closes one side of the WebSocket connection.
+   *
+   * @since v1.48
+   */
+  void close(CloseOptions options);
+  /**
+   * By default, routed WebSocket does not connect to the server, so you can mock entire WebSocket communication. This method
+   * connects to the actual WebSocket server, and returns the server-side {@code WebSocketRoute} instance, giving the ability
+   * to send and receive messages from the server.
+   *
+   * <p> Once connected to the server:
+   * <ul>
+   * <li> Messages received from the server will be **automatically forwarded** to the WebSocket in the page, unless {@link
+   * com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} is called on the server-side {@code
+   * WebSocketRoute}.</li>
+   * <li> Messages sent by the <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/send">{@code
+   * WebSocket.send()}</a> call in the page will be **automatically forwarded** to the server, unless {@link
+   * com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} is called on the original {@code
+   * WebSocketRoute}.</li>
+   * </ul>
+   *
+   * <p> See examples at the top for more details.
+   *
+   * @since v1.48
+   */
+  WebSocketRoute connectToServer();
+  /**
+   * Allows to handle <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close">{@code WebSocket.close}</a>.
+   *
+   * <p> By default, closing one side of the connection, either in the page or on the server, will close the other side. However,
+   * when {@link com.microsoft.playwright.WebSocketRoute#onClose WebSocketRoute.onClose()} handler is set up, the default
+   * forwarding of closure is disabled, and handler should take care of it.
+   *
+   * @param handler Function that will handle WebSocket closure. Received an optional <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code">close code</a> and an optional <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason">close reason</a>.
+   * @since v1.48
+   */
+  void onClose(BiConsumer<Integer, String> handler);
+  /**
+   * This method allows to handle messages that are sent by the WebSocket, either from the page or from the server.
+   *
+   * <p> When called on the original WebSocket route, this method handles messages sent from the page. You can handle this
+   * messages by responding to them with {@link com.microsoft.playwright.WebSocketRoute#send WebSocketRoute.send()},
+   * forwarding them to the server-side connection returned by {@link com.microsoft.playwright.WebSocketRoute#connectToServer
+   * WebSocketRoute.connectToServer()} or do something else.
+   *
+   * <p> Once this method is called, messages are not automatically forwarded to the server or to the page - you should do that
+   * manually by calling {@link com.microsoft.playwright.WebSocketRoute#send WebSocketRoute.send()}. See examples at the top
+   * for more details.
+   *
+   * <p> Calling this method again will override the handler with a new one.
+   *
+   * @param handler Function that will handle messages.
+   * @since v1.48
+   */
+  void onMessage(Consumer<WebSocketFrame> handler);
+  /**
+   * Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called on
+   * the result of {@link com.microsoft.playwright.WebSocketRoute#connectToServer WebSocketRoute.connectToServer()}, sends
+   * the message to the server. See examples at the top for more details.
+   *
+   * @param message Message to send.
+   * @since v1.48
+   */
+  void send(String message);
+  /**
+   * Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called on
+   * the result of {@link com.microsoft.playwright.WebSocketRoute#connectToServer WebSocketRoute.connectToServer()}, sends
+   * the message to the server. See examples at the top for more details.
+   *
+   * @param message Message to send.
+   * @since v1.48
+   */
+  void send(byte[] message);
+  /**
+   * URL of the WebSocket created in the page.
+   *
+   * @since v1.48
+   */
+  String url();
+}
+

playwright/src/main/java/com/microsoft/playwright/assertions/LocatorAssertions.java

@@ -17,6 +17,7 @@
 package com.microsoft.playwright.assertions;
 
 import java.util.regex.Pattern;
+import com.microsoft.playwright.options.AriaRole;
 
 /**
  * The {@code LocatorAssertions} class provides assertion methods that can be used to make assertions about the {@code
@@ -253,6 +254,60 @@ public interface LocatorAssertions {
       return this;
     }
   }
+  class HasAccessibleDescriptionOptions {
+    /**
+     * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
+     * expression flag if specified.
+     */
+    public Boolean ignoreCase;
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     */
+    public Double timeout;
+
+    /**
+     * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
+     * expression flag if specified.
+     */
+    public HasAccessibleDescriptionOptions setIgnoreCase(boolean ignoreCase) {
+      this.ignoreCase = ignoreCase;
+      return this;
+    }
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     */
+    public HasAccessibleDescriptionOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
+  class HasAccessibleNameOptions {
+    /**
+     * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
+     * expression flag if specified.
+     */
+    public Boolean ignoreCase;
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     */
+    public Double timeout;
+
+    /**
+     * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
+     * expression flag if specified.
+     */
+    public HasAccessibleNameOptions setIgnoreCase(boolean ignoreCase) {
+      this.ignoreCase = ignoreCase;
+      return this;
+    }
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     */
+    public HasAccessibleNameOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
   class HasAttributeOptions {
     /**
      * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
@@ -350,6 +405,20 @@ public interface LocatorAssertions {
       return this;
     }
   }
+  class HasRoleOptions {
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     */
+    public Double timeout;
+
+    /**
+     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     */
+    public HasRoleOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
   class HasTextOptions {
     /**
      * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
@@ -683,10 +752,10 @@ public interface LocatorAssertions {
    * assertThat(page.getByText("Welcome")).isVisible();
    *
    * // At least one item in the list is visible.
-   * asserThat(page.getByTestId("todo-item").first()).isVisible();
+   * assertThat(page.getByTestId("todo-item").first()).isVisible();
    *
    * // At least one of the two elements is visible, possibly both.
-   * asserThat(
+   * assertThat(
    *   page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign in"))
    *     .or(page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign up")))
    *     .first()
@@ -711,10 +780,10 @@ public interface LocatorAssertions {
    * assertThat(page.getByText("Welcome")).isVisible();
    *
    * // At least one item in the list is visible.
-   * asserThat(page.getByTestId("todo-item").first()).isVisible();
+   * assertThat(page.getByTestId("todo-item").first()).isVisible();
    *
    * // At least one of the two elements is visible, possibly both.
-   * asserThat(
+   * assertThat(
    *   page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign in"))
    *     .or(page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign up")))
    *     .first()
@@ -1076,6 +1145,126 @@ public interface LocatorAssertions {
    * @since v1.20
    */
   void containsText(Pattern[] expected, ContainsTextOptions options);
+  /**
+   * Ensures the {@code Locator} points to an element with a given <a
+   * href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * Locator locator = page.getByTestId("save-button");
+   * assertThat(locator).hasAccessibleDescription("Save results to disk");
+   * }</pre>
+   *
+   * @param description Expected accessible description.
+   * @since v1.44
+   */
+  default void hasAccessibleDescription(String description) {
+    hasAccessibleDescription(description, null);
+  }
+  /**
+   * Ensures the {@code Locator} points to an element with a given <a
+   * href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * Locator locator = page.getByTestId("save-button");
+   * assertThat(locator).hasAccessibleDescription("Save results to disk");
+   * }</pre>
+   *
+   * @param description Expected accessible description.
+   * @since v1.44
+   */
+  void hasAccessibleDescription(String description, HasAccessibleDescriptionOptions options);
+  /**
+   * Ensures the {@code Locator} points to an element with a given <a
+   * href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * Locator locator = page.getByTestId("save-button");
+   * assertThat(locator).hasAccessibleDescription("Save results to disk");
+   * }</pre>
+   *
+   * @param description Expected accessible description.
+   * @since v1.44
+   */
+  default void hasAccessibleDescription(Pattern description) {
+    hasAccessibleDescription(description, null);
+  }
+  /**
+   * Ensures the {@code Locator} points to an element with a given <a
+   * href="https://w3c.github.io/accname/#dfn-accessible-description">accessible description</a>.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * Locator locator = page.getByTestId("save-button");
+   * assertThat(locator).hasAccessibleDescription("Save results to disk");
+   * }</pre>
+   *
+   * @param description Expected accessible description.
+   * @since v1.44
+   */
+  void hasAccessibleDescription(Pattern description, HasAccessibleDescriptionOptions options);
+  /**
+   * Ensures the {@code Locator} points to an element with a given <a
+   * href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * Locator locator = page.getByTestId("save-button");
+   * assertThat(locator).hasAccessibleName("Save to disk");
+   * }</pre>
+   *
+   * @param name Expected accessible name.
+   * @since v1.44
+   */
+  default void hasAccessibleName(String name) {
+    hasAccessibleName(name, null);
+  }
+  /**
+   * Ensures the {@code Locator} points to an element with a given <a
+   * href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * Locator locator = page.getByTestId("save-button");
+   * assertThat(locator).hasAccessibleName("Save to disk");
+   * }</pre>
+   *
+   * @param name Expected accessible name.
+   * @since v1.44
+   */
+  void hasAccessibleName(String name, HasAccessibleNameOptions options);
+  /**
+   * Ensures the {@code Locator} points to an element with a given <a
+   * href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * Locator locator = page.getByTestId("save-button");
+   * assertThat(locator).hasAccessibleName("Save to disk");
+   * }</pre>
+   *
+   * @param name Expected accessible name.
+   * @since v1.44
+   */
+  default void hasAccessibleName(Pattern name) {
+    hasAccessibleName(name, null);
+  }
+  /**
+   * Ensures the {@code Locator} points to an element with a given <a
+   * href="https://w3c.github.io/accname/#dfn-accessible-name">accessible name</a>.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * Locator locator = page.getByTestId("save-button");
+   * assertThat(locator).hasAccessibleName("Save to disk");
+   * }</pre>
+   *
+   * @param name Expected accessible name.
+   * @since v1.44
+   */
+  void hasAccessibleName(Pattern name, HasAccessibleNameOptions options);
   /**
    * Ensures the {@code Locator} points to an element with given attribute.
    *
@@ -1456,6 +1645,42 @@ public interface LocatorAssertions {
    * @since v1.20
    */
   void hasJSProperty(String name, Object value, HasJSPropertyOptions options);
+  /**
+   * Ensures the {@code Locator} points to an element with a given <a href="https://www.w3.org/TR/wai-aria-1.2/#roles">ARIA
+   * role</a>.
+   *
+   * <p> Note that role is matched as a string, disregarding the ARIA role hierarchy. For example, asserting  a superclass role
+   * {@code "checkbox"} on an element with a subclass role {@code "switch"} will fail.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * Locator locator = page.getByTestId("save-button");
+   * assertThat(locator).hasRole(AriaRole.BUTTON);
+   * }</pre>
+   *
+   * @param role Required aria role.
+   * @since v1.44
+   */
+  default void hasRole(AriaRole role) {
+    hasRole(role, null);
+  }
+  /**
+   * Ensures the {@code Locator} points to an element with a given <a href="https://www.w3.org/TR/wai-aria-1.2/#roles">ARIA
+   * role</a>.
+   *
+   * <p> Note that role is matched as a string, disregarding the ARIA role hierarchy. For example, asserting  a superclass role
+   * {@code "checkbox"} on an element with a subclass role {@code "switch"} will fail.
+   *
+   * <p> <strong>Usage</strong>
+   * <pre>{@code
+   * Locator locator = page.getByTestId("save-button");
+   * assertThat(locator).hasRole(AriaRole.BUTTON);
+   * }</pre>
+   *
+   * @param role Required aria role.
+   * @since v1.44
+   */
+  void hasRole(AriaRole role, HasRoleOptions options);
   /**
    * Ensures the {@code Locator} points to an element with the given text. All nested elements will be considered when
    * computing the text content of the element. You can use regular expressions for the value as well.

playwright/src/main/java/com/microsoft/playwright/assertions/PageAssertions.java

@@ -52,11 +52,24 @@ public interface PageAssertions {
     }
   }
   class HasURLOptions {
+    /**
+     * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
+     * expression flag if specified.
+     */
+    public Boolean ignoreCase;
     /**
      * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
      */
     public Double timeout;
 
+    /**
+     * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
+     * expression flag if specified.
+     */
+    public HasURLOptions setIgnoreCase(boolean ignoreCase) {
+      this.ignoreCase = ignoreCase;
+      return this;
+    }
     /**
      * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
      */

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

@@ -29,6 +29,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Base64;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 import static com.microsoft.playwright.impl.Serialization.*;
@@ -36,6 +37,7 @@ import static com.microsoft.playwright.impl.Utils.toFilePayload;
 
 class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
   private final TracingImpl tracing;
+  private String disposeReason;
 
   APIRequestContextImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
@@ -48,8 +50,17 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
   }
 
   @Override
-  public void dispose() {
-    withLogging("APIRequestContext.dispose", () -> sendMessage("dispose"));
+  public void dispose(DisposeOptions options) {
+    withLogging("APIRequestContext.dispose", () -> disposeImpl(options));
+  }
+
+  private void disposeImpl(DisposeOptions options) {
+    if (options == null) {
+      options = new DisposeOptions();
+    }
+    disposeReason = options.reason;
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    sendMessage("dispose", params);
   }
 
   @Override
@@ -76,6 +87,9 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
   }
 
   private APIResponse fetchImpl(String url, RequestOptionsImpl options) {
+    if (disposeReason != null) {
+      throw new PlaywrightException(disposeReason);
+    }
     if (options == null) {
       options = new RequestOptionsImpl();
     }
@@ -86,7 +100,7 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
       for (Map.Entry<String, ?> e : options.params.entrySet()) {
         queryParams.put(e.getKey(), "" + e.getValue());
       }
-      params.add("params", toNameValueArray(queryParams));
+      params.add("params", toNameValueArray(queryParams.entrySet()));
     }
     if (options.method != null) {
       params.addProperty("method", options.method);
@@ -106,7 +120,7 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
         }
       }
       if (bytes == null) {
-        params.addProperty("jsonData", gson().toJson(options.data));
+        params.addProperty("jsonData", jsonDataSerializer.toJson(options.data));
       } else {
         String base64 = Base64.getEncoder().encodeToString(bytes);
         params.addProperty("postData", base64);
@@ -133,6 +147,12 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
       }
       params.addProperty("maxRedirects", options.maxRedirects);
     }
+    if (options.maxRetries != null) {
+      if (options.maxRetries < 0) {
+        throw new PlaywrightException("'maxRetries' must be greater than or equal to '0'");
+      }
+      params.addProperty("maxRetries", options.maxRetries);
+    }
     JsonObject json = sendMessage("fetch", params).getAsJsonObject();
     return new APIResponseImpl(this, json.getAsJsonObject("response"));
   }
@@ -149,9 +169,9 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
     return false;
   }
 
-  private static JsonArray serializeMultipartData(Map<String, Object> data) {
+  private static JsonArray serializeMultipartData(List<? extends Map.Entry<String, Object>> data) {
     JsonArray result = new JsonArray();
-    for (Map.Entry<String, Object> e : data.entrySet()) {
+    for (Map.Entry<String, ?> e : data) {
       FilePayload filePayload = null;
       if (e.getValue() instanceof FilePayload) {
         filePayload = (FilePayload) e.getValue();

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

@@ -17,15 +17,21 @@
 package com.microsoft.playwright.impl;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.APIRequest;
 import com.microsoft.playwright.PlaywrightException;
+import com.microsoft.playwright.options.ClientCertificate;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.util.Base64;
+import java.util.List;
 
 import static com.microsoft.playwright.impl.Serialization.gson;
+import static com.microsoft.playwright.impl.Utils.addToProtocol;
+import static java.nio.file.Files.readAllBytes;
 
 class APIRequestImpl implements APIRequest {
   private final PlaywrightImpl playwright;
@@ -42,6 +48,8 @@ class APIRequestImpl implements APIRequest {
   private APIRequestContextImpl newContextImpl(NewContextOptions options) {
     if (options == null) {
       options = new NewContextOptions();
+    } else {
+      options = Utils.clone(options);
     }
     if (options.storageStatePath != null) {
       try {
@@ -57,11 +65,13 @@ class APIRequestImpl implements APIRequest {
       storageState = new Gson().fromJson(options.storageState, JsonObject.class);
       options.storageState = null;
     }
+    List<ClientCertificate> clientCertificateList = options.clientCertificates;
+    options.clientCertificates = null;
     JsonObject params = gson().toJsonTree(options).getAsJsonObject();
     if (storageState != null) {
       params.add("storageState", storageState);
     }
-
+    addToProtocol(params, clientCertificateList);
     JsonObject result = playwright.sendMessage("newRequest", params).getAsJsonObject();
     APIRequestContextImpl context = playwright.connection.getExistingObject(result.getAsJsonObject("request").get("guid").getAsString());
     return context;

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

@@ -20,6 +20,7 @@ import com.microsoft.playwright.PlaywrightException;
 import org.opentest4j.AssertionFailedError;
 import org.opentest4j.ValueWrapper;
 
+import java.lang.reflect.Field;
 import java.util.Collection;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -91,4 +92,17 @@ class AssertionsBase {
     }
     return expected;
   }
+
+  static Boolean shouldIgnoreCase(Object options) {
+    if (options == null) {
+      return null;
+    }
+    try {
+      Field fromField = options.getClass().getDeclaredField("ignoreCase");
+      Object value = fromField.get(options);
+      return (Boolean) value;
+    } catch (NoSuchFieldException | IllegalAccessException e) {
+      return null;
+    }
+  }
 }

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

@@ -36,8 +36,7 @@ import java.util.regex.Pattern;
 
 import static com.microsoft.playwright.impl.Serialization.addHarUrlFilter;
 import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
-import static com.microsoft.playwright.impl.Utils.toJsRegexFlags;
+import static com.microsoft.playwright.impl.Utils.*;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.Files.readAllBytes;
 import static java.util.Arrays.asList;
@@ -46,10 +45,12 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
   private final BrowserImpl browser;
   private final TracingImpl tracing;
   private final APIRequestContextImpl request;
+  private final ClockImpl clock;
   final List<PageImpl> pages = new ArrayList<>();
   final List<PageImpl> backgroundPages = new ArrayList<>();
 
   final Router routes = new Router();
+  final WebSocketRouter webSocketRoutes = new WebSocketRouter();
   private boolean closeWasCalled;
   private final WaitableEvent<EventType, ?> closePromise;
   final Map<String, BindingCallback> bindings = new HashMap<>();
@@ -104,6 +105,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
     }
     tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
     request = connection.getExistingObject(initializer.getAsJsonObject("requestContext").get("guid").getAsString());
+    clock = new ClockImpl(this);
     closePromise = new WaitableEvent<>(listeners, EventType.CLOSE);
   }
 
@@ -231,6 +233,11 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
     listeners.remove(EventType.RESPONSE, handler);
   }
 
+  @Override
+  public ClockImpl clock() {
+    return clock;
+  }
+
   private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Predicate<T> predicate, Double timeout) {
     List<Waitable<T>> waitables = new ArrayList<>();
     waitables.add(new WaitableEvent<>(listeners, eventType, predicate));
@@ -284,6 +291,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
         options = new CloseOptions();
       }
       closeReason = options.reason;
+      request.dispose(convertType(options, APIRequestContext.DisposeOptions.class));
       for (Map.Entry<String, HarRecorder> entry : harRecorders.entrySet()) {
         JsonObject params = new JsonObject();
         params.addProperty("harId", entry.getKey());
@@ -507,6 +515,28 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
     });
   }
 
+  @Override
+  public void routeWebSocket(String url, Consumer<WebSocketRoute> handler) {
+    routeWebSocketImpl(new UrlMatcher(baseUrl, url), handler);
+  }
+
+  @Override
+  public void routeWebSocket(Pattern pattern, Consumer<WebSocketRoute> handler) {
+    routeWebSocketImpl(new UrlMatcher(pattern), handler);
+  }
+
+  @Override
+  public void routeWebSocket(Predicate<String> predicate, Consumer<WebSocketRoute> handler) {
+    routeWebSocketImpl(new UrlMatcher(predicate), handler);
+  }
+
+  private void routeWebSocketImpl(UrlMatcher matcher, Consumer<WebSocketRoute> handler) {
+    withLogging("BrowserContext.routeWebSocket", () -> {
+      webSocketRoutes.add(matcher, handler);
+      updateWebSocketInterceptionPatterns();
+    });
+  }
+
   void recordIntoHar(PageImpl page, Path har, RouteFromHAROptions options) {
     JsonObject params = new JsonObject();
     if (page != null) {
@@ -674,6 +704,10 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
     sendMessage("setNetworkInterceptionPatterns", routes.interceptionPatterns());
   }
 
+  private void updateWebSocketInterceptionPatterns() {
+    sendMessage("setWebSocketInterceptionPatterns", webSocketRoutes.interceptionPatterns());
+  }
+
   void handleRoute(RouteImpl route) {
     Router.HandleResult handled = routes.handle(route);
     if (handled != Router.HandleResult.NoMatchingHandler) {
@@ -684,6 +718,12 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
     }
   }
 
+  void handleWebSocketRoute(WebSocketRouteImpl route) {
+    if (!webSocketRoutes.handle(route)) {
+      route.connectToServer();
+    }
+  }
+
   WaitableResult<JsonElement> pause() {
     return sendMessageAsync("pause", new JsonObject());
   }
@@ -723,6 +763,9 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
       RouteImpl route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
       route.browserContext = this;
       handleRoute(route);
+    } else if ("webSocketRoute".equals(event)) {
+      WebSocketRouteImpl route = connection.getExistingObject(params.getAsJsonObject("webSocketRoute").get("guid").getAsString());
+      handleWebSocketRoute(route);
     } else if ("page".equals(event)) {
       PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
       pages.add(page);

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

@@ -208,6 +208,7 @@ class BrowserImpl extends ChannelOwner implements Browser {
         params.addProperty("noDefaultViewport", true);
       }
     }
+    addToProtocol(params, options.clientCertificates);
     params.remove("acceptDownloads");
     if (options.acceptDownloads != null) {
       params.addProperty("acceptDownloads", options.acceptDownloads ? "accept" : "deny");

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

@@ -30,6 +30,7 @@ import java.util.function.Consumer;
 
 import static com.microsoft.playwright.impl.Serialization.addHarUrlFilter;
 import static com.microsoft.playwright.impl.Serialization.gson;
+import static com.microsoft.playwright.impl.Utils.addToProtocol;
 import static com.microsoft.playwright.impl.Utils.convertType;
 
 class BrowserTypeImpl extends ChannelOwner implements BrowserType {
@@ -221,6 +222,7 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
         params.addProperty("noDefaultViewport", true);
       }
     }
+    addToProtocol(params, options.clientCertificates);
     params.remove("acceptDownloads");
     if (options.acceptDownloads != null) {
       params.addProperty("acceptDownloads", options.acceptDownloads ? "accept" : "deny");

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

@@ -35,7 +35,10 @@ public class CDPSessionImpl extends ChannelOwner implements CDPSession {
     super.handleEvent(event, parameters);
     if ("event".equals(event)) {
       String method = parameters.get("method").getAsString();
-      JsonObject params = parameters.get("params").getAsJsonObject();
+      JsonObject params = null;
+      if (parameters.has("params")) {
+        params = parameters.get("params").getAsJsonObject();
+      }
       listeners.notify(method, params);
     }
   }

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

@@ -35,6 +35,7 @@ class ChannelOwner extends LoggingSupport {
   final String guid;
   final JsonObject initializer;
   private boolean wasCollected;
+  private boolean isInternalType;
 
   protected ChannelOwner(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     this(parent.connection, parent, type, guid, initializer);
@@ -58,6 +59,10 @@ class ChannelOwner extends LoggingSupport {
     }
   }
 
+  void markAsInternalType() {
+    isInternalType = true;
+  }
+
   void disposeChannelOwner(boolean wasGarbageCollected) {
     // Clean up from parent and connection.
     if (parent != null) {
@@ -84,6 +89,9 @@ class ChannelOwner extends LoggingSupport {
 
   @Override
   <T> T withLogging(String apiName, Supplier<T> code) {
+    if (isInternalType) {
+      apiName = null;
+    }
     String previousApiName = connection.setApiName(apiName);
     try {
       return super.withLogging(apiName, code);
@@ -92,6 +100,10 @@ class ChannelOwner extends LoggingSupport {
     }
   }
 
+  WaitableResult<JsonElement> sendMessageAsync(String method) {
+    return sendMessageAsync(method, new JsonObject());
+  }
+
   WaitableResult<JsonElement> sendMessageAsync(String method, JsonObject params) {
     checkNotCollected();
     return connection.sendMessageAsync(guid, method, params);

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

@@ -0,0 +1,129 @@
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonObject;
+import com.microsoft.playwright.Clock;
+
+import java.util.Date;
+
+class ClockImpl implements Clock {
+  private final ChannelOwner browserContext;
+
+  ClockImpl(BrowserContextImpl browserContext) {
+    this.browserContext = browserContext;
+  }
+
+  @Override
+  public void fastForward(long ticks) {
+    JsonObject params = new JsonObject();
+    params.addProperty("ticksNumber", ticks);
+    browserContext.sendMessage("clockFastForward", params);
+  }
+
+  @Override
+  public void fastForward(String ticks) {
+    JsonObject params = new JsonObject();
+    params.addProperty("ticksString", ticks);
+    browserContext.sendMessage("clockFastForward", params);
+  }
+
+  @Override
+  public void install(InstallOptions options) {
+    JsonObject params = new JsonObject();
+    if (options != null) {
+      parseTime(options.time, params);
+    }
+    browserContext.sendMessage("clockInstall", params);
+  }
+
+  @Override
+  public void runFor(long ticks) {
+    JsonObject params = new JsonObject();
+    params.addProperty("ticksNumber", ticks);
+    browserContext.sendMessage("clockRunFor", params);
+  }
+
+  @Override
+  public void runFor(String ticks) {
+    JsonObject params = new JsonObject();
+    params.addProperty("ticksString", ticks);
+    browserContext.sendMessage("clockRunFor", params);
+  }
+
+  @Override
+  public void pauseAt(long time) {
+    JsonObject params = new JsonObject();
+    params.addProperty("timeNumber", time);
+    browserContext.sendMessage("clockPauseAt", params);
+  }
+
+  @Override
+  public void pauseAt(String time) {
+    JsonObject params = new JsonObject();
+    params.addProperty("timeString", time);
+    browserContext.sendMessage("clockPauseAt", params);
+  }
+
+  @Override
+  public void pauseAt(Date time) {
+    JsonObject params = new JsonObject();
+    params.addProperty("timeNumber", time.getTime());
+    browserContext.sendMessage("clockPauseAt", params);
+  }
+
+  @Override
+  public void resume() {
+    browserContext.sendMessage("clockResume");
+  }
+
+  @Override
+  public void setFixedTime(long time) {
+    JsonObject params = new JsonObject();
+    params.addProperty("timeNumber", time);
+    browserContext.sendMessage("clockSetFixedTime", params);
+  }
+
+  @Override
+  public void setFixedTime(String time) {
+    JsonObject params = new JsonObject();
+    params.addProperty("timeString", time);
+    browserContext.sendMessage("clockSetFixedTime", params);
+  }
+
+  @Override
+  public void setFixedTime(Date time) {
+    JsonObject params = new JsonObject();
+    params.addProperty("timeNumber", time.getTime());
+    browserContext.sendMessage("clockSetFixedTime", params);
+  }
+
+  @Override
+  public void setSystemTime(long time) {
+    JsonObject params = new JsonObject();
+    params.addProperty("timeNumber", time);
+    browserContext.sendMessage("clockSetSystemTime", params);
+  }
+
+  @Override
+  public void setSystemTime(String time) {
+    JsonObject params = new JsonObject();
+    params.addProperty("timeString", time);
+    browserContext.sendMessage("clockSetSystemTime", params);
+  }
+
+  @Override
+  public void setSystemTime(Date time) {
+    JsonObject params = new JsonObject();
+    params.addProperty("timeNumber", time.getTime());
+    browserContext.sendMessage("clockSetSystemTime", params);
+  }
+
+  private static void parseTime(Object time, JsonObject params) {
+    if (time instanceof Long) {
+      params.addProperty("timeNumber", (Long) time);
+    } else if (time instanceof Date) {
+      params.addProperty("timeNumber", ((Date) time).getTime());
+    } else if (time instanceof String) {
+      params.addProperty("timeString", (String) time);
+    }
+  }
+}

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

@@ -384,6 +384,9 @@ public class Connection {
       case "WebSocket":
         result = new WebSocketImpl(parent, type, guid, initializer);
         break;
+      case "WebSocketRoute":
+        result = new WebSocketRouteImpl(parent, type, guid, initializer);
+        break;
       case "Worker":
         result = new WorkerImpl(parent, type, guid, initializer);
         break;

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

@@ -21,11 +21,13 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ElementHandle;
 import com.microsoft.playwright.Frame;
+import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.options.BoundingBox;
 import com.microsoft.playwright.options.ElementState;
 import com.microsoft.playwright.options.FilePayload;
 import com.microsoft.playwright.options.SelectOption;
 
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Base64;

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

@@ -20,39 +20,93 @@ import com.microsoft.playwright.options.FilePayload;
 import com.microsoft.playwright.options.FormData;
 
 import java.nio.file.Path;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class FormDataImpl implements FormData {
-  Map<String, Object> fields = new LinkedHashMap<>();
+  static class Field implements Map.Entry<String, Object> {
+    final String name;
+    final Object value;
+
+    private Field(String name, Object value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    @Override
+    public String getKey() {
+      return name;
+    }
+
+    @Override
+    public Object getValue() {
+      return value;
+    }
+
+    @Override
+    public Object setValue(Object value) {
+      throw new UnsupportedOperationException();
+    }
+  }
+  List<Field> fields = new ArrayList();
+
+  @Override
+  public FormData append(String name, String value) {
+    return appendImpl(name, value);
+  }
+
+  @Override
+  public FormData append(String name, boolean value) {
+    return appendImpl(name, value);
+  }
+
+  @Override
+  public FormData append(String name, int value) {
+    return appendImpl(name, value);
+  }
+
+  @Override
+  public FormData append(String name, Path value) {
+    return appendImpl(name, value);
+  }
+
+  @Override
+  public FormData append(String name, FilePayload value) {
+    return appendImpl(name, value);
+  }
 
   @Override
   public FormData set(String name, String value) {
-    fields.put(name, value);
-    return this;
+    return setImpl(name, value);
   }
 
   @Override
   public FormData set(String name, boolean value) {
-    fields.put(name, value);
-    return this;
+    return setImpl(name, value);
   }
 
   @Override
   public FormData set(String name, int value) {
-    fields.put(name, value);
-    return this;
+    return setImpl(name, value);
   }
 
   @Override
   public FormData set(String name, Path value) {
-    fields.put(name, value);
-    return this;
+    return setImpl(name, value);
   }
 
   @Override
   public FormData set(String name, FilePayload value) {
-    fields.put(name, value);
+    return setImpl(name, value);
+  }
+
+  private FormData setImpl(String name, Object value) {
+    fields = fields.stream().filter(f -> !name.equals(f.name)).collect(Collectors.toList());
+    return appendImpl(name, value);
+  }
+
+  private FormData appendImpl(String name, Object value) {
+    fields.add(new Field(name, value));
     return this;
   }
 }

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

@@ -33,6 +33,7 @@ class JsonPipe extends ChannelOwner implements Transport {
   private ListenerCollection<EventType> listeners = new ListenerCollection<>();
   private enum EventType { CLOSE }
   private boolean isClosed;
+  private String closeReason = "Browser has been closed";
 
   JsonPipe(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
@@ -97,13 +98,19 @@ class JsonPipe extends ChannelOwner implements Transport {
       incoming.add(params.get("message").getAsJsonObject());
     } else if ("closed".equals(event)) {
       isClosed = true;
+      if (params.has("reason")) {
+        String reason = params.get("reason").getAsString();
+        if (reason.trim().length() > 0) {
+          closeReason = reason;
+        }
+      }
       listeners.notify(EventType.CLOSE, this);
     }
   }
 
   private void checkIfClosed() {
     if (isClosed) {
-      throw new PlaywrightException("Browser has been closed");
+      throw new PlaywrightException(closeReason);
     }
   }
 }

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

@@ -17,6 +17,7 @@
 package com.microsoft.playwright.impl;
 
 import com.google.gson.JsonObject;
+import com.microsoft.playwright.PlaywrightException;
 
 import java.util.*;
 import java.util.function.Consumer;
@@ -46,6 +47,9 @@ class ListenerCollection <EventType> {
   }
 
   void add(EventType type, Consumer<?> listener) {
+    if (listener == null) {
+      throw new PlaywrightException("Can't add a null listener");
+    }
     List<Consumer<?>> list = listeners.get(type);
     if (list == null) {
       list = new ArrayList<>();

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

@@ -27,6 +27,7 @@ import static com.microsoft.playwright.impl.Serialization.gson;
 class LocalUtils extends ChannelOwner {
   LocalUtils(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
+    markAsInternalType();
   }
 
   JsonArray deviceDescriptors() {

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

@@ -18,6 +18,7 @@ package com.microsoft.playwright.impl;
 
 import com.microsoft.playwright.Locator;
 import com.microsoft.playwright.assertions.LocatorAssertions;
+import com.microsoft.playwright.options.AriaRole;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -82,6 +83,36 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
     expectImpl("to.contain.text.array", list, patterns, "Locator expected to contain text", convertType(options, FrameExpectOptions.class));
   }
 
+  @Override
+  public void hasAccessibleDescription(String description, HasAccessibleDescriptionOptions options) {
+    ExpectedTextValue expected = new ExpectedTextValue();
+    expected.string = description;
+    expected.ignoreCase = shouldIgnoreCase(options);
+    expectImpl("to.have.accessible.description", expected, description, "Locator expected to have accessible description", convertType(options, FrameExpectOptions.class));
+  }
+
+  @Override
+  public void hasAccessibleDescription(Pattern pattern, HasAccessibleDescriptionOptions options) {
+    ExpectedTextValue expected = expectedRegex(pattern);
+    expected.ignoreCase = shouldIgnoreCase(options);
+    expectImpl("to.have.accessible.description", expected, pattern, "Locator expected to have accessible description", convertType(options, FrameExpectOptions.class));
+  }
+
+  @Override
+  public void hasAccessibleName(String name, HasAccessibleNameOptions options) {
+    ExpectedTextValue expected = new ExpectedTextValue();
+    expected.string = name;
+    expected.ignoreCase = shouldIgnoreCase(options);
+    expectImpl("to.have.accessible.name", expected, name, "Locator expected to have accessible name", convertType(options, FrameExpectOptions.class));
+  }
+
+  @Override
+  public void hasAccessibleName(Pattern pattern, HasAccessibleNameOptions options) {
+    ExpectedTextValue expected = expectedRegex(pattern);
+    expected.ignoreCase = shouldIgnoreCase(options);
+    expectImpl("to.have.accessible.name", expected, pattern, "Locator expected to have accessible name", convertType(options, FrameExpectOptions.class));
+  }
+
   @Override
   public void hasAttribute(String name, String text, HasAttributeOptions options) {
     ExpectedTextValue expected = new ExpectedTextValue();
@@ -206,6 +237,13 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
     expectImpl("to.have.property", list, value, "Locator expected to have JavaScript property '" + name + "'", commonOptions);
   }
 
+  @Override
+  public void hasRole(AriaRole role, HasRoleOptions options) {
+    ExpectedTextValue expected = new ExpectedTextValue();
+    expected.string = role.toString().toLowerCase();
+    expectImpl("to.have.role", expected, expected.string, "Locator expected to have role", convertType(options, FrameExpectOptions.class));
+  }
+
   @Override
   public void hasText(String text, HasTextOptions options) {
     ExpectedTextValue expected = new ExpectedTextValue();
@@ -366,17 +404,4 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
     String message = "Locator expected to be " + (attached ? "attached" : "detached");
     expectTrue(attached ? "to.be.attached" : "to.be.detached", message, frameOptions);
   }
-
-  private static Boolean shouldIgnoreCase(Object options) {
-    if (options == null) {
-      return null;
-    }
-    try {
-      Field fromField = options.getClass().getDeclaredField("ignoreCase");
-      Object value = fromField.get(options);
-      return (Boolean) value;
-    } catch (NoSuchFieldException | IllegalAccessException e) {
-      return null;
-    }
-  }
 }

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

@@ -624,6 +624,20 @@ class LocatorImpl implements Locator {
     return "Locator@" + selector;
   }
 
+  @Override
+  public boolean equals(Object obj) {
+    if (!(obj instanceof LocatorImpl)) {
+      return false;
+    }
+    LocatorImpl locator = (LocatorImpl) obj;
+    return  frame.equals(locator.frame) && selector.equals(locator.selector);
+  }
+
+  @Override
+  public int hashCode() {
+    return frame.hashCode() ^ selector.hashCode();
+  }
+
   FrameExpectResult expect(String expression, FrameExpectOptions options) {
     return frame.withLogging("Locator.expect", () -> expectImpl(expression, options));
   }

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

@@ -21,6 +21,7 @@ import com.microsoft.playwright.assertions.PageAssertions;
 
 import java.util.regex.Pattern;
 
+import static com.microsoft.playwright.impl.LocatorAssertionsImpl.shouldIgnoreCase;
 import static com.microsoft.playwright.impl.UrlMatcher.resolveUrl;
 import static com.microsoft.playwright.impl.Utils.convertType;
 
@@ -57,6 +58,7 @@ public class PageAssertionsImpl extends AssertionsBase implements PageAssertions
       url = resolveUrl(actualPage.context().baseUrl, url);
     }
     expected.string = url;
+    expected.ignoreCase = shouldIgnoreCase(options);
     expectImpl("to.have.url", expected, url, "Page URL expected to be", convertType(options, FrameExpectOptions.class));
   }
 

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

@@ -48,8 +48,36 @@ public class PageImpl extends ChannelOwner implements Page {
   final Waitable<?> waitableClosedOrCrashed;
   private ViewportSize viewport;
   private final Router routes = new Router();
+  private final WebSocketRouter webSocketRoutes = new WebSocketRouter();
   private final Set<FrameImpl> frames = new LinkedHashSet<>();
-  private final Map<Integer, Runnable> locatorHandlers = new HashMap<>();
+  private final Map<Integer, LocatorHandler> locatorHandlers = new HashMap<>();
+
+  private static class LocatorHandler {
+    private final Locator locator;
+    private final Consumer<Locator> handler;
+    private Integer times;
+
+    LocatorHandler(Locator locator, Consumer<Locator> handler, Integer times) {
+      this.locator = locator;
+      this.handler = handler;
+      this.times = times;
+    }
+
+    boolean call() {
+      if (shouldRemove()) {
+        return true;
+      }
+      if (times != null) {
+        --times;
+      }
+      handler.accept(locator);
+      return shouldRemove();
+    }
+
+    private boolean shouldRemove() {
+      return times != null && times == 0;
+    }
+  }
 
   private static final Map<EventType, String> eventSubscriptions() {
     Map<EventType, String> result = new HashMap<>();
@@ -185,6 +213,11 @@ public class PageImpl extends ChannelOwner implements Page {
       if (handled == Router.HandleResult.NoMatchingHandler || handled == Router.HandleResult.Fallback) {
         browserContext.handleRoute(route);
       }
+    } else if ("webSocketRoute".equals(event)) {
+      WebSocketRouteImpl route = connection.getExistingObject(params.getAsJsonObject("webSocketRoute").get("guid").getAsString());
+      if (!webSocketRoutes.handle(route)) {
+        browserContext.handleWebSocketRoute(route);
+      }
     } else if ("video".equals(event)) {
       String artifactGuid = params.getAsJsonObject("artifact").get("guid").getAsString();
       ArtifactImpl artifact = connection.getExistingObject(artifactGuid);
@@ -404,6 +437,11 @@ public class PageImpl extends ChannelOwner implements Page {
     listeners.remove(EventType.WORKER, handler);
   }
 
+  @Override
+  public ClockImpl clock() {
+    return browserContext.clock();
+  }
+
   @Override
   public Page waitForClose(WaitForCloseOptions options, Runnable code) {
     return withWaitLogging("Page.waitForClose", logger -> waitForCloseImpl(options, code));
@@ -530,29 +568,58 @@ public class PageImpl extends ChannelOwner implements Page {
   }
 
   @Override
-  public void addLocatorHandler(Locator locator, Runnable handler) {
+  public void addLocatorHandler(Locator locator, Consumer<Locator> handler, AddLocatorHandlerOptions options) {
     LocatorImpl locatorImpl = (LocatorImpl) locator;
     if (locatorImpl.frame != mainFrame) {
       throw new PlaywrightException("Locator must belong to the main frame of this page");
     }
+    if (options == null) {
+      options = new AddLocatorHandlerOptions();
+    }
+    if (options.times != null && options.times == 0) {
+      return;
+    }
+    AddLocatorHandlerOptions finalOptions = options;
     withLogging("Page.addLocatorHandler", () -> {
       JsonObject params = new JsonObject();
       params.addProperty("selector", locatorImpl.selector);
+      if (finalOptions.noWaitAfter != null && finalOptions.noWaitAfter) {
+        params.addProperty("noWaitAfter", true);
+      }
+      params.addProperty("selector", locatorImpl.selector);
       JsonObject json = (JsonObject) sendMessage("registerLocatorHandler", params);
       int uid = json.get("uid").getAsInt();
-      locatorHandlers.put(uid, handler);
+      locatorHandlers.put(uid, new LocatorHandler(locator, handler, finalOptions.times));
     });
   }
 
-  private void onLocatorHandlerTriggered(int uid) {
-    try {
-      Runnable handler = locatorHandlers.get(uid);
-      if (handler != null) {
-        handler.run();
+  @Override
+  public void removeLocatorHandler(Locator locator) {
+    for (Map.Entry<Integer, LocatorHandler> entry: locatorHandlers.entrySet()) {
+      if (entry.getValue().locator.equals(locator)) {
+        locatorHandlers.remove(locator);
+        JsonObject params = new JsonObject();
+        params.addProperty("uid", entry.getKey());
+        try {
+          sendMessage("unregisterLocatorHandler", params);
+        } catch (PlaywrightException e) {
+        }
       }
+    }
+  }
+
+  private void onLocatorHandlerTriggered(int uid) {
+    boolean remove = false;
+    try {
+      LocatorHandler handler = locatorHandlers.get(uid);
+      remove = handler != null && handler.call();
     } finally {
+      if (remove) {
+        locatorHandlers.remove(uid);
+      }
       JsonObject params = new JsonObject();
       params.addProperty("uid", uid);
+      params.addProperty("remove", remove);
       sendMessageAsync("resolveLocatorHandlerNoReply", params);
     }
   }
@@ -866,6 +933,11 @@ public class PageImpl extends ChannelOwner implements Page {
     return null;
   }
 
+  @Override
+  public void requestGC() {
+    withLogging("Page.requestGC", () -> sendMessage("requestGC"));
+  }
+
   @Override
   public ResponseImpl navigate(String url, NavigateOptions options) {
     return withLogging("Page.navigate", () -> mainFrame.navigateImpl(url, convertType(options, Frame.NavigateOptions.class)));
@@ -1068,6 +1140,28 @@ public class PageImpl extends ChannelOwner implements Page {
     });
   }
 
+    @Override
+  public void routeWebSocket(String url, Consumer<WebSocketRoute> handler) {
+    routeWebSocketImpl(new UrlMatcher(browserContext.baseUrl, url), handler);
+  }
+
+  @Override
+  public void routeWebSocket(Pattern pattern, Consumer<WebSocketRoute> handler) {
+    routeWebSocketImpl(new UrlMatcher(pattern), handler);
+  }
+
+  @Override
+  public void routeWebSocket(Predicate<String> predicate, Consumer<WebSocketRoute> handler) {
+    routeWebSocketImpl(new UrlMatcher(predicate), handler);
+  }
+
+  private void routeWebSocketImpl(UrlMatcher matcher, Consumer<WebSocketRoute> handler) {
+    withLogging("Page.routeWebSocket", () -> {
+      webSocketRoutes.add(matcher, handler);
+      updateWebSocketInterceptionPatterns();
+    });
+  }
+
   @Override
   public byte[] screenshot(ScreenshotOptions options) {
     return withLogging("Page.screenshot", () -> screenshotImpl(options));
@@ -1295,6 +1389,10 @@ public class PageImpl extends ChannelOwner implements Page {
     sendMessage("setNetworkInterceptionPatterns", routes.interceptionPatterns());
   }
 
+  private void updateWebSocketInterceptionPatterns() {
+    sendMessage("setWebSocketInterceptionPatterns", webSocketRoutes.interceptionPatterns());
+  }
+
   @Override
   public String url() {
     return mainFrame.url();

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

@@ -33,6 +33,12 @@ class SerializedValue{
   String d;
   String u;
   String bi;
+  public static class E {
+    String m;
+    String n;
+    String s;
+  }
+  E e;
   public static class R {
     String p;
     String f;

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

@@ -33,6 +33,7 @@ public class RequestOptionsImpl implements RequestOptions {
   Boolean ignoreHTTPSErrors;
   Double timeout;
   Integer maxRedirects;
+  Integer maxRetries;
 
   @Override
   public RequestOptions setHeader(String name, String value) {
@@ -125,4 +126,10 @@ public class RequestOptionsImpl implements RequestOptions {
     this.maxRedirects = maxRedirects;
     return this;
   }
+
+  @Override
+  public RequestOptions setMaxRetries(int maxRetries) {
+    this.maxRetries = maxRetries;
+    return this;
+  }
 }

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

@@ -38,6 +38,7 @@ public class RouteImpl extends ChannelOwner implements Route {
 
   public RouteImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
+    markAsInternalType();
     request = connection.getExistingObject(initializer.getAsJsonObject("request").get("guid").getAsString());
   }
 
@@ -47,7 +48,6 @@ public class RouteImpl extends ChannelOwner implements Route {
     withLogging("Route.abort", () -> {
       JsonObject params = new JsonObject();
       params.addProperty("errorCode", errorCode);
-      params.addProperty("requestUrl", request.initializer.get("url").getAsString());
       sendMessageAsync("abort", params);
     });
   }
@@ -135,7 +135,6 @@ public class RouteImpl extends ChannelOwner implements Route {
         params.addProperty("postData", base64);
       }
     }
-    params.addProperty("requestUrl", request.initializer.get("url").getAsString());
     params.addProperty("isFallback", isFallback);
     sendMessageAsync("continue", params);
   }
@@ -231,7 +230,6 @@ public class RouteImpl extends ChannelOwner implements Route {
     if (fetchResponseUid != null) {
       params.addProperty("fetchResponseUid", fetchResponseUid);
     }
-    params.addProperty("requestUrl", request.initializer.get("url").getAsString());
     sendMessageAsync("fulfill", params);
   }
 

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

@@ -23,6 +23,7 @@ import com.microsoft.playwright.Route;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -99,27 +100,7 @@ class Router {
   }
 
   JsonObject interceptionPatterns() {
-    JsonArray jsonPatterns = new JsonArray();
-    for (RouteInfo route : routes) {
-      JsonObject jsonPattern = new JsonObject();
-      Object urlFilter = route.matcher.rawSource;
-      if (urlFilter instanceof String) {
-        jsonPattern.addProperty("glob", (String) urlFilter);
-      } else if (urlFilter instanceof Pattern) {
-        Pattern pattern = (Pattern) urlFilter;
-        jsonPattern.addProperty("regexSource", pattern.pattern());
-        jsonPattern.addProperty("regexFlags", toJsRegexFlags(pattern));
-      } else {
-        // Match all requests.
-        jsonPattern.addProperty("glob", "**/*");
-        jsonPatterns = new JsonArray();
-        jsonPatterns.add(jsonPattern);
-        break;
-      }
-      jsonPatterns.add(jsonPattern);
-    }
-    JsonObject result = new JsonObject();
-    result.add("patterns", jsonPatterns);
-    return result;
+    List<UrlMatcher> matchers = routes.stream().map(r -> r.matcher).collect(Collectors.toList());
+    return Utils.interceptionPatterns(matchers);
   }
 }

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

@@ -24,9 +24,7 @@ import com.microsoft.playwright.ElementHandle;
 import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.options.*;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
+import java.io.*;
 import java.lang.reflect.Type;
 import java.math.BigInteger;
 import java.net.MalformedURLException;
@@ -35,11 +33,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
+import java.time.*;
 import java.util.*;
 import java.util.regex.Pattern;
 
@@ -55,6 +49,7 @@ class Serialization {
     .registerTypeAdapter(ColorScheme.class, new ToLowerCaseAndDashSerializer<ColorScheme>())
     .registerTypeAdapter(Media.class, new ToLowerCaseSerializer<Media>())
     .registerTypeAdapter(ForcedColors.class, new ToLowerCaseSerializer<ForcedColors>())
+    .registerTypeAdapter(HttpCredentialsSend.class, new ToLowerCaseSerializer<HttpCredentialsSend>())
     .registerTypeAdapter(ReducedMotion.class, new ToLowerCaseAndDashSerializer<ReducedMotion>())
     .registerTypeAdapter(ScreenshotAnimations.class, new ToLowerCaseSerializer<ScreenshotAnimations>())
     .registerTypeAdapter(ScreenshotType.class, new ToLowerCaseSerializer<ScreenshotType>())
@@ -76,6 +71,12 @@ class Serialization {
     return gson;
   }
 
+  static final Gson jsonDataSerializer = new GsonBuilder().disableHtmlEscaping()
+    .registerTypeAdapter(Date.class, new DateSerializer())
+    .registerTypeAdapter(LocalDateTime.class, new LocalDateTimeSerializer())
+    .registerTypeAdapter(OffsetDateTime.class, new OffsetDateTimeSerializer())
+    .serializeNulls().create();
+
   static SerializedError serializeError(Throwable e) {
     SerializedError result = new SerializedError();
     result.error = new SerializedError.Error();
@@ -169,6 +170,14 @@ class Serialization {
         result.r = new SerializedValue.R();
         result.r.p = ((Pattern)value).pattern();
         result.r.f = toJsRegexFlags(((Pattern)value));
+      } else if (value instanceof Exception) {
+        Exception exception = (Exception) value;
+        result.e = new SerializedValue.E();
+        result.e.m = exception.getMessage();
+        result.e.n = exception.getClass().getSimpleName();
+        StringWriter sw = new StringWriter();
+        exception.printStackTrace(new PrintWriter(sw));
+        result.e.s = sw.toString();
       } else {
         HashableValue mapKey = new HashableValue(value);
         Integer id = valueToId.get(mapKey);
@@ -246,6 +255,9 @@ class Serialization {
       return (T)(Date.from(Instant.parse(value.d)));
     if (value.r != null)
       return (T)(Pattern.compile(value.r.p, fromJsRegexFlags(value.r.f)));
+    if (value.e != null) {
+      return (T)new Exception(value.e.s);
+    }
     if (value.v != null) {
       switch (value.v) {
         case "undefined":
@@ -303,6 +315,9 @@ class Serialization {
       if (modifiers.contains(KeyboardModifier.CONTROL)) {
         result.add("Control");
       }
+      if (modifiers.contains(KeyboardModifier.CONTROLORMETA)) {
+        result.add("ControlOrMeta");
+      }
       if (modifiers.contains(KeyboardModifier.META)) {
         result.add("Meta");
       }
@@ -351,7 +366,7 @@ class Serialization {
         throw new PlaywrightException("Value cannot be null");
       }
     }
-    return toNameValueArray(map);
+    return toNameValueArray(map.entrySet());
   }
 
   static void addHarUrlFilter(JsonObject options, Object urlFilter) {
@@ -364,9 +379,9 @@ class Serialization {
       }
   }
 
-  static JsonArray toNameValueArray(Map<String, ?> map) {
+  static JsonArray toNameValueArray(Iterable<? extends Map.Entry<String, ?>> collection) {
     JsonArray array = new JsonArray();
-    for (Map.Entry<String, ?> e : map.entrySet()) {
+    for (Map.Entry<String, ?> e : collection) {
       JsonObject item = new JsonObject();
       item.addProperty("name", e.getKey());
       if (e.getValue() instanceof FilePayload) {
@@ -514,6 +529,13 @@ class Serialization {
     }
   }
 
+  private static class OffsetDateTimeSerializer implements JsonSerializer<OffsetDateTime> {
+    @Override
+    public JsonElement serialize(OffsetDateTime src, Type typeOfSrc, JsonSerializationContext context) {
+      return new JsonPrimitive(dateFormat.format(Date.from(src.toInstant())));
+    }
+  }
+
   private static class LocalDateTimeSerializer implements JsonSerializer<LocalDateTime> {
     @Override
     public JsonElement serialize(LocalDateTime src, Type typeOfSrc, JsonSerializationContext context) {

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

@@ -33,6 +33,7 @@ class TracingImpl extends ChannelOwner implements Tracing {
 
   TracingImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
+    markAsInternalType();
   }
 
   private void stopChunkImpl(Path path) {

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

@@ -16,6 +16,8 @@
 
 package com.microsoft.playwright.impl;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 import com.microsoft.playwright.PlaywrightException;
 
 import java.net.MalformedURLException;
@@ -25,6 +27,7 @@ import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
 import static com.microsoft.playwright.impl.Utils.globToRegex;
+import static com.microsoft.playwright.impl.Utils.toJsRegexFlags;
 
 class UrlMatcher {
   final Object rawSource;

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

@@ -17,8 +17,10 @@
 package com.microsoft.playwright.impl;
 
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.PlaywrightException;
+import com.microsoft.playwright.options.ClientCertificate;
 import com.microsoft.playwright.options.FilePayload;
 import com.microsoft.playwright.options.HttpHeader;
 
@@ -33,8 +35,10 @@ import java.nio.file.Path;
 import java.nio.file.attribute.FileTime;
 import java.util.*;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static com.microsoft.playwright.impl.Serialization.toJsonArray;
+import static java.nio.file.Files.readAllBytes;
 
 public class Utils {
   static <F, T> T convertType(F f, Class<T> t) {
@@ -173,42 +177,107 @@ public class Utils {
     return mimeType;
   }
 
-  static void addFilePathUploadParams(Path[] files, JsonObject params, BrowserContextImpl context) {
-    if (files.length == 0) {
+  static void addFilePathUploadParams(Path[] items, JsonObject params, BrowserContextImpl context) {
+    List<Path> localPaths = new ArrayList<>();
+    Path localDirectory = resolvePathsAndDirectoryForInputFiles(items, localPaths);
+    if (items.length == 0) {
       // FIXME: shouldBeAbleToResetSelectedFilesWithEmptyFileList tesst hangs in Chromium if we pass empty paths list.
       params.add("payloads", new JsonArray());
     } else if (context.connection.isRemote) {
-      List<WritableStream> streams = new ArrayList<>();
-      JsonArray jsonStreams = new JsonArray();
-      for (Path path : files) {
-        long lastModifiedMs;
-        try {
-          lastModifiedMs = Files.getLastModifiedTime(path).toMillis();
-        } catch (IOException e) {
-          throw new PlaywrightException("Cannot read file timestamp: " + path, e);
-        }
-        WritableStream temp = context.createTempFile(path.getFileName().toString(), lastModifiedMs);
-        streams.add(temp);
-        try (OutputStream out = temp.stream()) {
-          Files.copy(path, out);
-        } catch (IOException e) {
-          throw new PlaywrightException("Failed to copy file to remote server.", e);
-        }
-        jsonStreams.add(temp.toProtocolRef());
+      if (localDirectory != null) {
+        localPaths = collectFiles(localDirectory);
+      }
+      JsonObject json = createTempFiles(context, localDirectory, localPaths);
+      JsonArray writableStreams = json.getAsJsonArray("writableStreams");
+      JsonArray jsonStreams = copyLocalToTempFiles(context, localPaths, writableStreams);
+      if (json.has("rootDir")) {
+        params.add("directoryStream", json.get("rootDir"));
+      } else {
+        params.add("streams", jsonStreams);
       }
-      params.add("streams", jsonStreams);
     } else {
-      Path[] absolute = Arrays.stream(files).map(f -> {
-        try {
-          return f.toRealPath();
-        } catch (IOException e) {
-          throw new PlaywrightException("Cannot get absolute file path", e);
-        }
-      }).toArray(Path[]::new);
-      params.add("localPaths", toJsonArray(absolute));
+      if (!localPaths.isEmpty()) {
+        params.add("localPaths", toJsonArray(localPaths.toArray(new Path[0])));
+      }
+      if (localDirectory != null) {
+        params.addProperty("localDirectory", localDirectory.toString());
+      }
     }
   }
 
+  private static Path resolvePathsAndDirectoryForInputFiles(Path[] items, List<Path> outLocalPaths) {
+    Path localDirectory = null;
+    try {
+      for (Path item : items) {
+        if (Files.isDirectory(item)) {
+          if (localDirectory != null) {
+            throw new PlaywrightException("Multiple directories are not supported");
+          }
+          localDirectory = item.toRealPath();
+        } else {
+          outLocalPaths.add(item.toRealPath());
+        }
+      }
+    } catch (IOException e) {
+      throw new PlaywrightException("Cannot get absolute file path",  e);
+    }
+    if (!outLocalPaths.isEmpty() && localDirectory != null) {
+      throw new PlaywrightException("File paths must be all files or a single directory");
+    }
+    return localDirectory;
+  }
+
+  private static List<Path> collectFiles(Path localDirectory) {
+    try {
+      return Files.walk(localDirectory).filter(e -> Files.isRegularFile(e)).collect(Collectors.toList());
+    } catch (IOException e) {
+      throw new PlaywrightException("Failed to traverse directory", e);
+    }
+  }
+
+  private static JsonArray copyLocalToTempFiles(BrowserContextImpl context, List<Path> localPaths, JsonArray writableStreams) {
+    JsonArray jsonStreams = new JsonArray();
+    for (int i = 0; i < localPaths.size(); i++) {
+      JsonObject jsonStream = writableStreams.get(i).getAsJsonObject();
+      WritableStream temp = context.connection.getExistingObject(jsonStream.get("guid").getAsString());
+      try (OutputStream out = temp.stream()) {
+        Files.copy(localPaths.get(i), out);
+      } catch (IOException e) {
+        throw new PlaywrightException("Failed to copy file to remote server.", e);
+      }
+      jsonStreams.add(temp.toProtocolRef());
+    }
+    return jsonStreams;
+  }
+
+  private static JsonObject createTempFiles(BrowserContextImpl context, Path localDirectory, List<Path> localPaths) {
+    JsonObject tempFilesParams = new JsonObject();
+    if (localDirectory != null) {
+      tempFilesParams.addProperty("rootDirName", localDirectory.getFileName().toString());
+    }
+    JsonArray items = new JsonArray();
+    for (Path path : localPaths) {
+      long lastModifiedMs;
+      try {
+        lastModifiedMs = Files.getLastModifiedTime(path).toMillis();
+      } catch (IOException e) {
+        throw new PlaywrightException("Cannot read file timestamp: " + path, e);
+      }
+      Path name;
+      if (localDirectory == null) {
+        name = path.getFileName();
+      } else {
+        name = localDirectory.relativize(path);
+      }
+      JsonObject item = new JsonObject();
+      item.addProperty("name", name.toString());
+      item.addProperty("lastModifiedMs", lastModifiedMs);
+      items.add(item);
+    }
+    tempFilesParams.add("items", items);
+    return context.sendMessage("createTempFiles", tempFilesParams).getAsJsonObject();
+  }
+
   static void checkFilePayloadSize(FilePayload[] files) {
     long totalSize = 0;
     for (FilePayload file: files) {
@@ -345,4 +414,72 @@ public class Utils {
   static String addSourceUrlToScript(String source, Path path) {
     return source + "\n//# sourceURL=" + path.toString().replace("\n", "");
   }
+
+  static void addToProtocol(JsonObject params, List<ClientCertificate> clientCertificateList) {
+    if (clientCertificateList == null) {
+      return;
+    }
+    JsonArray clientCertificates = new JsonArray();
+    for (ClientCertificate cert: clientCertificateList) {
+      JsonObject jsonCert = new JsonObject();
+      jsonCert.addProperty("origin", cert.origin);
+      try {
+        String certBase64 = base64Buffer(cert.cert, cert.certPath);
+        if (certBase64 != null) {
+          jsonCert.addProperty("cert",  certBase64);
+        }
+        String keyBase64 = base64Buffer(cert.key, cert.keyPath);
+        if (keyBase64 != null) {
+          jsonCert.addProperty("key", keyBase64);
+        }
+        String pfxBase64 = base64Buffer(cert.pfx, cert.pfxPath);
+        if (pfxBase64 != null) {
+          params.addProperty("pfx", pfxBase64);
+        }
+      } catch (IOException e) {
+        throw new PlaywrightException("Failed to read from file", e);
+      }
+      if (cert.passphrase != null) {
+        jsonCert.addProperty("passphrase", cert.passphrase);
+      }
+      clientCertificates.add(jsonCert);
+    }
+    params.remove("clientCertificates");
+    params.add("clientCertificates", clientCertificates);
+  }
+
+  private static String base64Buffer(byte[] bytes, Path path) throws IOException {
+    if (path != null) {
+      bytes = readAllBytes(path);
+    }
+    if (bytes == null) {
+      return null;
+    }
+    return Base64.getEncoder().encodeToString(bytes);
+  }
+
+  static JsonObject interceptionPatterns(List<UrlMatcher> matchers) {
+    JsonArray jsonPatterns = new JsonArray();
+    for (UrlMatcher matcher: matchers) {
+      JsonObject jsonPattern = new JsonObject();
+      Object urlFilter = matcher.rawSource;
+      if (urlFilter instanceof String) {
+        jsonPattern.addProperty("glob", (String) urlFilter);
+      } else if (urlFilter instanceof Pattern) {
+        Pattern pattern = (Pattern) urlFilter;
+        jsonPattern.addProperty("regexSource", pattern.pattern());
+        jsonPattern.addProperty("regexFlags", toJsRegexFlags(pattern));
+      } else {
+        // Match all requests.
+        jsonPattern.addProperty("glob", "**/*");
+        jsonPatterns = new JsonArray();
+        jsonPatterns.add(jsonPattern);
+        break;
+      }
+      jsonPatterns.add(jsonPattern);
+    }
+    JsonObject result = new JsonObject();
+    result.add("patterns", jsonPatterns);
+    return result;
+  }
 }

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

@@ -0,0 +1,29 @@
+package com.microsoft.playwright.impl;
+
+import com.microsoft.playwright.WebSocketFrame;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+class WebSocketFrameImpl implements WebSocketFrame {
+  private byte[] bytes;
+  private String text;
+
+  WebSocketFrameImpl(String payload, boolean isBase64) {
+    if (isBase64) {
+      bytes = Base64.getDecoder().decode(payload);
+    } else {
+      text = payload;
+    }
+  }
+
+  @Override
+  public byte[] binary() {
+    return bytes;
+  }
+
+  @Override
+  public String text() {
+    return text;
+  }
+}

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

@@ -21,9 +21,7 @@ import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.WebSocket;
 import com.microsoft.playwright.WebSocketFrame;
 
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
@@ -151,28 +149,6 @@ class WebSocketImpl extends ChannelOwner implements WebSocket {
     return runUntil(code, new WaitableRace<>(waitables));
   }
 
-  private static class WebSocketFrameImpl implements WebSocketFrame {
-    private final byte[] bytes;
-
-    WebSocketFrameImpl(String payload, boolean isBase64) {
-      if (isBase64) {
-        bytes = Base64.getDecoder().decode(payload);
-      } else {
-        bytes = payload.getBytes();
-      }
-    }
-
-    @Override
-    public byte[] binary() {
-      return bytes;
-    }
-
-    @Override
-    public String text() {
-      return new String(bytes, StandardCharsets.UTF_8);
-    }
-  }
-
   @Override
   void handleEvent(String event, JsonObject parameters) {
     switch (event) {

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

@@ -0,0 +1,186 @@
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonObject;
+import com.microsoft.playwright.PlaywrightException;
+import com.microsoft.playwright.WebSocketFrame;
+import com.microsoft.playwright.WebSocketRoute;
+
+import java.util.Base64;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
+import static com.microsoft.playwright.impl.Serialization.gson;
+
+class WebSocketRouteImpl extends ChannelOwner implements WebSocketRoute {
+
+  private Consumer<WebSocketFrame> onPageMessage;
+  private BiConsumer<Integer, String> onPageClose;
+  private Consumer<WebSocketFrame> onServerMessage;
+  private BiConsumer<Integer, String> onServerClose;
+  private boolean connected;
+  private WebSocketRoute server = new WebSocketRoute() {
+    @Override
+    public void close(CloseOptions options) {
+      if (options == null) {
+        options = new CloseOptions();
+      }
+      JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+      params.addProperty("wasClean", true);
+      sendMessageAsync("closeServer", params);
+    }
+
+    @Override
+    public WebSocketRoute connectToServer() {
+      throw new PlaywrightException("connectToServer must be called on the page-side WebSocketRoute");
+    }
+
+    @Override
+    public void onClose(BiConsumer<Integer, String> handler) {
+      onServerClose = handler;
+    }
+
+    @Override
+    public void onMessage(Consumer<WebSocketFrame> handler) {
+      onServerMessage = handler;
+    }
+
+    @Override
+    public void send(String message) {
+      JsonObject params = new JsonObject();
+      params.addProperty("message", message);
+      params.addProperty("isBase64", false);
+      sendMessageAsync("sendToServer", params);
+    }
+
+    @Override
+    public void send(byte[] message) {
+      JsonObject params = new JsonObject();
+      String base64 = Base64.getEncoder().encodeToString(message);
+      params.addProperty("message", base64);
+      params.addProperty("isBase64", true);
+      sendMessageAsync("sendToServer", params);
+    }
+
+    @Override
+    public String url() {
+      return initializer.get("url").getAsString();
+    }
+  };
+
+  WebSocketRouteImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
+    super(parent, type, guid, initializer);
+  }
+
+    @Override
+  public void close(CloseOptions options) {
+      if (options == null) {
+        options = new CloseOptions();
+      }
+      JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+      params.addProperty("wasClean", true);
+      sendMessageAsync("closePage", params);
+  }
+
+  @Override
+  public WebSocketRoute connectToServer() {
+    if (connected) {
+      throw new PlaywrightException("Already connected to the server");
+    }
+    connected = true;
+    sendMessageAsync("connect");
+    return server;
+  }
+
+  @Override
+  public void onClose(BiConsumer<Integer, String> handler) {
+    onPageClose = handler;
+  }
+
+  @Override
+  public void onMessage(Consumer<WebSocketFrame> handler) {
+    onPageMessage = handler;
+  }
+
+  @Override
+  public void send(String message) {
+    JsonObject params = new JsonObject();
+    params.addProperty("message", message);
+    params.addProperty("isBase64", false);
+    sendMessageAsync("sendToPage", params);
+  }
+
+  @Override
+  public void send(byte[] message) {
+    JsonObject params = new JsonObject();
+    String base64 = Base64.getEncoder().encodeToString(message);
+    params.addProperty("message", base64);
+    params.addProperty("isBase64", true);
+    sendMessageAsync("sendToPage", params);
+  }
+
+  @Override
+  public String url() {
+    return initializer.get("url").getAsString();
+  }
+
+  void afterHandle() {
+    if (this.connected) {
+      return;
+    }
+    // Ensure that websocket is "open" and can send messages without an actual server connection.
+    sendMessageAsync("ensureOpened");
+  }
+
+  @Override
+  protected void handleEvent(String event, JsonObject params) {
+    if ("messageFromPage".equals(event)) {
+      String message = params.get("message").getAsString();
+      boolean isBase64 = params.get("isBase64").getAsBoolean();
+      if (onPageMessage != null) {
+        onPageMessage.accept(new WebSocketFrameImpl(message, isBase64));
+      } else if (connected) {
+        JsonObject messageParams = new JsonObject();
+        messageParams.addProperty("message", message);
+        messageParams.addProperty("isBase64", isBase64);
+        sendMessageAsync("sendToServer", messageParams);
+      }
+    } else if ("messageFromServer".equals(event)) {
+      String message = params.get("message").getAsString();
+      boolean isBase64 = params.get("isBase64").getAsBoolean();
+      if (onServerMessage != null) {
+        onServerMessage.accept(new WebSocketFrameImpl(message, isBase64));
+      } else {
+        JsonObject messageParams = new JsonObject();
+        messageParams.addProperty("message", message);
+        messageParams.addProperty("isBase64", isBase64);
+        sendMessageAsync("sendToPage", messageParams);
+      }
+    } else if ("closePage".equals(event)) {
+      int code = params.get("code").getAsInt();
+      String reason = params.get("reason").getAsString();
+      boolean wasClean = params.get("wasClean").getAsBoolean();
+      if (onPageClose != null) {
+        onPageClose.accept(code, reason);
+      } else {
+        JsonObject closeParams = new JsonObject();
+        closeParams.addProperty("code", code);
+        closeParams.addProperty("reason", reason);
+        closeParams.addProperty("wasClean", wasClean);
+        sendMessageAsync("closeServer", closeParams);
+      }
+    } else if ("closeServer".equals(event)) {
+      int code = params.get("code").getAsInt();
+      String reason = params.get("reason").getAsString();
+      boolean wasClean = params.get("wasClean").getAsBoolean();
+      if (onServerClose != null) {
+        onServerClose.accept(code, reason);
+      } else {
+        JsonObject closeParams = new JsonObject();
+        closeParams.addProperty("code", code);
+        closeParams.addProperty("reason", reason);
+        closeParams.addProperty("wasClean", wasClean);
+        sendMessageAsync("closePage", closeParams);
+      }
+    }
+  }
+}

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

@@ -0,0 +1,47 @@
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonObject;
+import com.microsoft.playwright.WebSocketRoute;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+public class WebSocketRouter {
+    private List<RouteInfo> routes = new ArrayList<>();
+
+  private static class RouteInfo {
+    final UrlMatcher matcher;
+    private final Consumer<WebSocketRoute> handler;
+
+    RouteInfo(UrlMatcher matcher, Consumer<WebSocketRoute> handler) {
+      this.matcher = matcher;
+      this.handler = handler;
+    }
+
+    void handle(WebSocketRouteImpl route) {
+      handler.accept(route);
+      route.afterHandle();
+    }
+  }
+
+  void add(UrlMatcher matcher, Consumer<WebSocketRoute> handler) {
+    routes.add(0, new RouteInfo(matcher, handler));
+  }
+
+  boolean handle(WebSocketRouteImpl route) {
+    for (RouteInfo routeInfo: routes) {
+      if (routeInfo.matcher.test(route.url())) {
+        routeInfo.handle(route);
+        return true;
+      }
+    }
+    return false;
+  }
+
+  JsonObject interceptionPatterns() {
+    List<UrlMatcher> matchers = routes.stream().map(r -> r.matcher).collect(Collectors.toList());
+    return Utils.interceptionPatterns(matchers);
+  }
+}

playwright/src/main/java/com/microsoft/playwright/impl/junit/BrowserContextExtension.java

@@ -16,28 +16,22 @@
 
 package com.microsoft.playwright.impl.junit;
 
-import com.microsoft.playwright.Browser;
-import com.microsoft.playwright.BrowserContext;
-import com.microsoft.playwright.Playwright;
-import com.microsoft.playwright.PlaywrightException;
+import com.microsoft.playwright.*;
 import com.microsoft.playwright.impl.Utils;
 import com.microsoft.playwright.junit.Options;
 import org.junit.jupiter.api.extension.*;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 import static com.microsoft.playwright.impl.junit.ExtensionUtils.*;
+import static com.microsoft.playwright.impl.junit.PageExtension.cleanUpPage;
 
-public class BrowserContextExtension implements ParameterResolver, AfterEachCallback {
+public class BrowserContextExtension implements ParameterResolver, TestWatcher {
   private static final ThreadLocal<BrowserContext> threadLocalBrowserContext = new ThreadLocal<>();
 
-  @Override
-  public void afterEach(ExtensionContext extensionContext) {
-    BrowserContext browserContext = threadLocalBrowserContext.get();
-    threadLocalBrowserContext.remove();
-    if (browserContext != null) {
-      browserContext.close();
-    }
-  }
-
   @Override
   public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
     return !isClassHook(extensionContext) && isParameterSupported(parameterContext, extensionContext, BrowserContext.class);
@@ -51,6 +45,7 @@ public class BrowserContextExtension implements ParameterResolver, AfterEachCall
   /**
    * Returns the BrowserContext that belongs to the current test.  Will be created if it doesn't already exist.
    * <strong>NOTE:</strong> this method is subject to change.
+   *
    * @param extensionContext the context in which the current test or container is being executed.
    * @return The BrowserContext that belongs to the current test.
    */
@@ -66,10 +61,97 @@ public class BrowserContextExtension implements ParameterResolver, AfterEachCall
     Browser browser = BrowserExtension.getOrCreateBrowser(extensionContext);
     Browser.NewContextOptions contextOptions = getContextOptions(playwright, options);
     browserContext = browser.newContext(contextOptions);
+    if (shouldRecordTrace(options)) {
+      Tracing.StartOptions startOptions = new Tracing.StartOptions().setSnapshots(true).setScreenshots(true).setTitle(extensionContext.getDisplayName());
+      if (System.getenv("PLAYWRIGHT_JAVA_SRC") != null) {
+        startOptions.setSources(true);
+      }
+      browserContext.tracing().start(startOptions);
+    }
     threadLocalBrowserContext.set(browserContext);
     return browserContext;
   }
 
+  @Override
+  public void testSuccessful(ExtensionContext extensionContext) {
+    saveTraceWhenOn(extensionContext);
+    closeBrowserContext();
+  }
+
+  @Override
+  public void testAborted(ExtensionContext extensionContext, Throwable cause) {
+    saveTraceWhenOn(extensionContext);
+    closeBrowserContext();
+  }
+
+  @Override
+  public void testFailed(ExtensionContext extensionContext, Throwable cause) {
+    Options options = OptionsExtension.getOptions(extensionContext);
+    if (shouldRecordTrace(options)) {
+      saveTrace(extensionContext);
+    }
+    closeBrowserContext();
+  }
+
+  private static void saveTraceWhenOn(ExtensionContext extensionContext) {
+    Options options = OptionsExtension.getOptions(extensionContext);
+    if (options.trace.equals(Options.Trace.ON)) {
+      saveTrace(extensionContext);
+    }
+  }
+
+  private static void saveTrace(ExtensionContext extensionContext) {
+    BrowserContext browserContext = threadLocalBrowserContext.get();
+    if (browserContext == null) {
+      return;
+    }
+    Path outputPath = getOutputPath(extensionContext);
+    createOutputPath(outputPath);
+    Tracing.StopOptions stopOptions = new Tracing.StopOptions().setPath(outputPath.resolve("trace.zip"));
+    browserContext.tracing().stop(stopOptions);
+  }
+
+  private static void createOutputPath(Path outputPath) {
+    if (!Files.exists(outputPath)) {
+      try {
+        Files.createDirectories(outputPath);
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+
+  private static Path getOutputPath(ExtensionContext extensionContext) {
+    BrowserType browserType = BrowserExtension.getBrowser().browserType();
+    Path defaultOutputPath = getDefaultOutputPath(extensionContext);
+    String outputDirName = extensionContext.getRequiredTestClass().getName() + "." +
+      extensionContext.getRequiredTestMethod().getName() + "-" +
+      browserType.name();
+    return defaultOutputPath.resolve(outputDirName);
+  }
+
+  private static Path getDefaultOutputPath(ExtensionContext extensionContext) {
+    Options options = OptionsExtension.getOptions(extensionContext);
+    Path outputPath = options.outputDir;
+    if (outputPath == null) {
+      outputPath = Paths.get(System.getProperty("user.dir")).resolve("test-results");
+    }
+    return outputPath;
+  }
+
+  private void closeBrowserContext() {
+    cleanUpPage();
+    BrowserContext browserContext = threadLocalBrowserContext.get();
+    threadLocalBrowserContext.remove();
+    if (browserContext != null) {
+      browserContext.close();
+    }
+  }
+
+  private static boolean shouldRecordTrace(Options options) {
+    return options.trace.equals(Options.Trace.ON) || options.trace.equals(Options.Trace.RETAIN_ON_FAILURE);
+  }
+
   private static Browser.NewContextOptions getContextOptions(Playwright playwright, Options options) {
     Browser.NewContextOptions contextOptions = Utils.clone(options.contextOptions);
     if (contextOptions == null) {
@@ -94,7 +176,7 @@ public class BrowserContextExtension implements ParameterResolver, AfterEachCall
       contextOptions.hasTouch = deviceDescriptor.hasTouch;
     }
 
-    if(options.ignoreHTTPSErrors != null) {
+    if (options.ignoreHTTPSErrors != null) {
       contextOptions.setIgnoreHTTPSErrors(options.ignoreHTTPSErrors);
     }
 

playwright/src/main/java/com/microsoft/playwright/impl/junit/BrowserExtension.java

@@ -62,7 +62,7 @@ public class BrowserExtension implements ParameterResolver, AfterAllCallback {
 
     Options options = OptionsExtension.getOptions(extensionContext);
     Playwright playwright = PlaywrightExtension.getOrCreatePlaywright(extensionContext);
-    BrowserType.LaunchOptions launchOptions = getLaunchOptions(options);
+
 
     BrowserType browserType = playwright.chromium();
     if (options.browserName != null) {
@@ -73,12 +73,31 @@ public class BrowserExtension implements ParameterResolver, AfterAllCallback {
           browserType = getBrowserTypeForName(playwright, deviceDescriptor.defaultBrowserType);
       }
     }
-    browser = browserType.launch(launchOptions);
+
+    if(options.wsEndpoint != null && !options.wsEndpoint.isEmpty()) {
+      BrowserType.ConnectOptions connectOptions = getConnectOptions(options);
+      browser = browserType.connect(options.wsEndpoint, connectOptions);
+    } else {
+      BrowserType.LaunchOptions launchOptions = getLaunchOptions(options);
+      browser = browserType.launch(launchOptions);
+    }
 
     threadLocalBrowser.set(browser);
     return browser;
   }
 
+  static Browser getBrowser() {
+    return threadLocalBrowser.get();
+  }
+
+  private static BrowserType.ConnectOptions getConnectOptions(Options options) {
+    BrowserType.ConnectOptions connectOptions = options.connectOptions;
+    if(connectOptions == null) {
+      connectOptions = new BrowserType.ConnectOptions();
+    }
+    return connectOptions;
+  }
+
   private static BrowserType getBrowserTypeForName(Playwright playwright, String name) {
     switch (name) {
       case "webkit":

playwright/src/main/java/com/microsoft/playwright/impl/junit/PageExtension.java

@@ -22,17 +22,8 @@ import org.junit.jupiter.api.extension.*;
 
 import static com.microsoft.playwright.impl.junit.ExtensionUtils.*;
 
-public class PageExtension implements ParameterResolver, AfterEachCallback {
-  private static final ThreadLocal<Page> threadLocalPage = new ThreadLocal<>();
-
-  @Override
-  public void afterEach(ExtensionContext extensionContext) {
-    Page page = threadLocalPage.get();
-    threadLocalPage.remove();
-    if (page != null) {
-      page.close();
-    }
-  }
+public class PageExtension implements ParameterResolver {
+   private static final ThreadLocal<Page> threadLocalPage = new ThreadLocal<>();
 
   @Override
   public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) throws ParameterResolutionException {
@@ -47,6 +38,7 @@ public class PageExtension implements ParameterResolver, AfterEachCallback {
   /**
    * Returns the Page that belongs to the current test.  Will be created if it doesn't already exist.
    * <strong>NOTE:</strong> this method is subject to change.
+   *
    * @param extensionContext the context in which the current test or container is being executed.
    * @return The Page that belongs to the current test.
    */
@@ -61,4 +53,8 @@ public class PageExtension implements ParameterResolver, AfterEachCallback {
     threadLocalPage.set(page);
     return page;
   }
+
+  static void cleanUpPage() {
+    threadLocalPage.remove();
+  }
 }

playwright/src/main/java/com/microsoft/playwright/junit/Options.java

@@ -16,10 +16,9 @@
 
 package com.microsoft.playwright.junit;
 
-import com.microsoft.playwright.APIRequest;
-import com.microsoft.playwright.Browser;
-import com.microsoft.playwright.BrowserType;
-import com.microsoft.playwright.Playwright;
+import com.microsoft.playwright.*;
+
+import java.nio.file.Path;
 
 /**
  * <strong>NOTE:</strong> this API is experimental and is subject to changes.
@@ -43,6 +42,40 @@ public class Options {
   public Browser.NewContextOptions contextOptions;
   public APIRequest.NewContextOptions apiRequestOptions;
   public Playwright.CreateOptions playwrightCreateOptions;
+  // WebSocket endpoint to be used when connecting to a remote browser.
+  // If this is set, BrowserType.connect will be used.  Otherwise, BrowserType.launch will be used.
+  public String wsEndpoint;
+  public BrowserType.ConnectOptions connectOptions;
+  // The dir where test artifacts will be stored
+  public Path outputDir;
+  // When to record traces.  Default is OFF.
+  public Trace trace = Trace.OFF;
+
+  public enum Trace {
+    OFF,
+    ON,
+    RETAIN_ON_FAILURE;
+  }
+
+  public Options setTrace(Trace trace) {
+    this.trace = trace;
+    return this;
+  }
+
+  public Options setOutputDir(Path outputDir) {
+    this.outputDir = outputDir;
+    return this;
+  }
+
+  public Options setWsEndpoint(String wsEndpoint) {
+    this.wsEndpoint = wsEndpoint;
+    return this;
+  }
+
+  public Options setConnectOptions(BrowserType.ConnectOptions connectOptions) {
+    this.connectOptions = connectOptions;
+    return this;
+  }
 
   public Options setPlaywrightCreateOptions(Playwright.CreateOptions playwrightCreateOptions) {
     this.playwrightCreateOptions = playwrightCreateOptions;

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

@@ -0,0 +1,108 @@
+/*
+ * 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;
+
+import java.nio.file.Path;
+
+public class ClientCertificate {
+  /**
+   * Exact origin that the certificate is valid for. Origin includes {@code https} protocol, a hostname and optionally a
+   * port.
+   */
+  public String origin;
+  /**
+   * Path to the file with the certificate in PEM format.
+   */
+  public Path certPath;
+  /**
+   * Direct value of the certificate in PEM format.
+   */
+  public byte[] cert;
+  /**
+   * Path to the file with the private key in PEM format.
+   */
+  public Path keyPath;
+  /**
+   * Direct value of the private key in PEM format.
+   */
+  public byte[] key;
+  /**
+   * Path to the PFX or PKCS12 encoded private key and certificate chain.
+   */
+  public Path pfxPath;
+  /**
+   * Direct value of the PFX or PKCS12 encoded private key and certificate chain.
+   */
+  public byte[] pfx;
+  /**
+   * Passphrase for the private key (PEM or PFX).
+   */
+  public String passphrase;
+
+  public ClientCertificate(String origin) {
+    this.origin = origin;
+  }
+  /**
+   * Path to the file with the certificate in PEM format.
+   */
+  public ClientCertificate setCertPath(Path certPath) {
+    this.certPath = certPath;
+    return this;
+  }
+  /**
+   * Direct value of the certificate in PEM format.
+   */
+  public ClientCertificate setCert(byte[] cert) {
+    this.cert = cert;
+    return this;
+  }
+  /**
+   * Path to the file with the private key in PEM format.
+   */
+  public ClientCertificate setKeyPath(Path keyPath) {
+    this.keyPath = keyPath;
+    return this;
+  }
+  /**
+   * Direct value of the private key in PEM format.
+   */
+  public ClientCertificate setKey(byte[] key) {
+    this.key = key;
+    return this;
+  }
+  /**
+   * Path to the PFX or PKCS12 encoded private key and certificate chain.
+   */
+  public ClientCertificate setPfxPath(Path pfxPath) {
+    this.pfxPath = pfxPath;
+    return this;
+  }
+  /**
+   * Direct value of the PFX or PKCS12 encoded private key and certificate chain.
+   */
+  public ClientCertificate setPfx(byte[] pfx) {
+    this.pfx = pfx;
+    return this;
+  }
+  /**
+   * Passphrase for the private key (PEM or PFX).
+   */
+  public ClientCertificate setPassphrase(String passphrase) {
+    this.passphrase = passphrase;
+    return this;
+  }
+}

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

@@ -20,15 +20,16 @@ public class Cookie {
   public String name;
   public String value;
   /**
-   * either url or domain / path are required. Optional.
+   * Either url or domain / path are required. Optional.
    */
   public String url;
   /**
-   * either url or domain / path are required Optional.
+   * For the cookie to apply to all subdomains as well, prefix domain with a dot, like this: ".example.com". Either url or
+   * domain / path are required. Optional.
    */
   public String domain;
   /**
-   * either url or domain / path are required Optional.
+   * Either url or domain / path are required Optional.
    */
   public String path;
   /**
@@ -53,21 +54,22 @@ public class Cookie {
     this.value = value;
   }
   /**
-   * either url or domain / path are required. Optional.
+   * Either url or domain / path are required. Optional.
    */
   public Cookie setUrl(String url) {
     this.url = url;
     return this;
   }
   /**
-   * either url or domain / path are required Optional.
+   * For the cookie to apply to all subdomains as well, prefix domain with a dot, like this: ".example.com". Either url or
+   * domain / path are required. Optional.
    */
   public Cookie setDomain(String domain) {
     this.domain = domain;
     return this;
   }
   /**
-   * either url or domain / path are required Optional.
+   * Either url or domain / path are required Optional.
    */
   public Cookie setPath(String path) {
     this.path = path;

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

@@ -32,6 +32,141 @@ import java.nio.file.Path;
  * }</pre>
  */
 public interface FormData {
+  /**
+   * Appends a new value onto an existing key inside a FormData object, or adds the key if it does not already exist. File
+   * values can be passed either as {@code Path} or as {@code FilePayload}. Multiple fields with the same name can be added.
+   *
+   * <p> The difference between {@link com.microsoft.playwright.FormData#set FormData.set()} and {@link
+   * com.microsoft.playwright.FormData#append FormData.append()} is that if the specified key already exists, {@link
+   * com.microsoft.playwright.FormData#set FormData.set()} will overwrite all existing values with the new one, whereas
+   * {@link com.microsoft.playwright.FormData#append FormData.append()} will append the new value onto the end of the
+   * existing set of values.
+   * <pre>{@code
+   * import com.microsoft.playwright.options.FormData;
+   * ...
+   * FormData form = FormData.create()
+   *     // Only name and value are set.
+   *     .append("firstName", "John")
+   *     // Name and value are set, filename and Content-Type are inferred from the file path.
+   *     .append("attachment", Paths.get("pic.jpg"))
+   *     // Name, value, filename and Content-Type are set.
+   *     .append("attachment", new FilePayload("table.csv", "text/csv", Files.readAllBytes(Paths.get("my-tble.csv"))));
+   * page.request().post("http://localhost/submit", RequestOptions.create().setForm(form));
+   * }</pre>
+   *
+   * @param name Field name.
+   * @param value Field value.
+   * @since v1.44
+   */
+  FormData append(String name, String value);
+  /**
+   * Appends a new value onto an existing key inside a FormData object, or adds the key if it does not already exist. File
+   * values can be passed either as {@code Path} or as {@code FilePayload}. Multiple fields with the same name can be added.
+   *
+   * <p> The difference between {@link com.microsoft.playwright.FormData#set FormData.set()} and {@link
+   * com.microsoft.playwright.FormData#append FormData.append()} is that if the specified key already exists, {@link
+   * com.microsoft.playwright.FormData#set FormData.set()} will overwrite all existing values with the new one, whereas
+   * {@link com.microsoft.playwright.FormData#append FormData.append()} will append the new value onto the end of the
+   * existing set of values.
+   * <pre>{@code
+   * import com.microsoft.playwright.options.FormData;
+   * ...
+   * FormData form = FormData.create()
+   *     // Only name and value are set.
+   *     .append("firstName", "John")
+   *     // Name and value are set, filename and Content-Type are inferred from the file path.
+   *     .append("attachment", Paths.get("pic.jpg"))
+   *     // Name, value, filename and Content-Type are set.
+   *     .append("attachment", new FilePayload("table.csv", "text/csv", Files.readAllBytes(Paths.get("my-tble.csv"))));
+   * page.request().post("http://localhost/submit", RequestOptions.create().setForm(form));
+   * }</pre>
+   *
+   * @param name Field name.
+   * @param value Field value.
+   * @since v1.44
+   */
+  FormData append(String name, boolean value);
+  /**
+   * Appends a new value onto an existing key inside a FormData object, or adds the key if it does not already exist. File
+   * values can be passed either as {@code Path} or as {@code FilePayload}. Multiple fields with the same name can be added.
+   *
+   * <p> The difference between {@link com.microsoft.playwright.FormData#set FormData.set()} and {@link
+   * com.microsoft.playwright.FormData#append FormData.append()} is that if the specified key already exists, {@link
+   * com.microsoft.playwright.FormData#set FormData.set()} will overwrite all existing values with the new one, whereas
+   * {@link com.microsoft.playwright.FormData#append FormData.append()} will append the new value onto the end of the
+   * existing set of values.
+   * <pre>{@code
+   * import com.microsoft.playwright.options.FormData;
+   * ...
+   * FormData form = FormData.create()
+   *     // Only name and value are set.
+   *     .append("firstName", "John")
+   *     // Name and value are set, filename and Content-Type are inferred from the file path.
+   *     .append("attachment", Paths.get("pic.jpg"))
+   *     // Name, value, filename and Content-Type are set.
+   *     .append("attachment", new FilePayload("table.csv", "text/csv", Files.readAllBytes(Paths.get("my-tble.csv"))));
+   * page.request().post("http://localhost/submit", RequestOptions.create().setForm(form));
+   * }</pre>
+   *
+   * @param name Field name.
+   * @param value Field value.
+   * @since v1.44
+   */
+  FormData append(String name, int value);
+  /**
+   * Appends a new value onto an existing key inside a FormData object, or adds the key if it does not already exist. File
+   * values can be passed either as {@code Path} or as {@code FilePayload}. Multiple fields with the same name can be added.
+   *
+   * <p> The difference between {@link com.microsoft.playwright.FormData#set FormData.set()} and {@link
+   * com.microsoft.playwright.FormData#append FormData.append()} is that if the specified key already exists, {@link
+   * com.microsoft.playwright.FormData#set FormData.set()} will overwrite all existing values with the new one, whereas
+   * {@link com.microsoft.playwright.FormData#append FormData.append()} will append the new value onto the end of the
+   * existing set of values.
+   * <pre>{@code
+   * import com.microsoft.playwright.options.FormData;
+   * ...
+   * FormData form = FormData.create()
+   *     // Only name and value are set.
+   *     .append("firstName", "John")
+   *     // Name and value are set, filename and Content-Type are inferred from the file path.
+   *     .append("attachment", Paths.get("pic.jpg"))
+   *     // Name, value, filename and Content-Type are set.
+   *     .append("attachment", new FilePayload("table.csv", "text/csv", Files.readAllBytes(Paths.get("my-tble.csv"))));
+   * page.request().post("http://localhost/submit", RequestOptions.create().setForm(form));
+   * }</pre>
+   *
+   * @param name Field name.
+   * @param value Field value.
+   * @since v1.44
+   */
+  FormData append(String name, Path value);
+  /**
+   * Appends a new value onto an existing key inside a FormData object, or adds the key if it does not already exist. File
+   * values can be passed either as {@code Path} or as {@code FilePayload}. Multiple fields with the same name can be added.
+   *
+   * <p> The difference between {@link com.microsoft.playwright.FormData#set FormData.set()} and {@link
+   * com.microsoft.playwright.FormData#append FormData.append()} is that if the specified key already exists, {@link
+   * com.microsoft.playwright.FormData#set FormData.set()} will overwrite all existing values with the new one, whereas
+   * {@link com.microsoft.playwright.FormData#append FormData.append()} will append the new value onto the end of the
+   * existing set of values.
+   * <pre>{@code
+   * import com.microsoft.playwright.options.FormData;
+   * ...
+   * FormData form = FormData.create()
+   *     // Only name and value are set.
+   *     .append("firstName", "John")
+   *     // Name and value are set, filename and Content-Type are inferred from the file path.
+   *     .append("attachment", Paths.get("pic.jpg"))
+   *     // Name, value, filename and Content-Type are set.
+   *     .append("attachment", new FilePayload("table.csv", "text/csv", Files.readAllBytes(Paths.get("my-tble.csv"))));
+   * page.request().post("http://localhost/submit", RequestOptions.create().setForm(form));
+   * }</pre>
+   *
+   * @param name Field name.
+   * @param value Field value.
+   * @since v1.44
+   */
+  FormData append(String name, FilePayload value);
   /**
    * Creates new instance of {@code FormData}.
    *
@@ -51,7 +186,7 @@ public interface FormData {
    *     // Name and value are set, filename and Content-Type are inferred from the file path.
    *     .set("profilePicture1", Paths.get("john.jpg"))
    *     // Name, value, filename and Content-Type are set.
-   *     .set("profilePicture2", new FilePayload("john.jpg", "image/jpeg", Files.readAllBytes(Paths.get("john.jpg"))));
+   *     .set("profilePicture2", new FilePayload("john.jpg", "image/jpeg", Files.readAllBytes(Paths.get("john.jpg"))))
    *     .set("age", 30);
    * page.request().post("http://localhost/submit", RequestOptions.create().setForm(form));
    * }</pre>
@@ -72,7 +207,7 @@ public interface FormData {
    *     // Name and value are set, filename and Content-Type are inferred from the file path.
    *     .set("profilePicture1", Paths.get("john.jpg"))
    *     // Name, value, filename and Content-Type are set.
-   *     .set("profilePicture2", new FilePayload("john.jpg", "image/jpeg", Files.readAllBytes(Paths.get("john.jpg"))));
+   *     .set("profilePicture2", new FilePayload("john.jpg", "image/jpeg", Files.readAllBytes(Paths.get("john.jpg"))))
    *     .set("age", 30);
    * page.request().post("http://localhost/submit", RequestOptions.create().setForm(form));
    * }</pre>
@@ -93,7 +228,7 @@ public interface FormData {
    *     // Name and value are set, filename and Content-Type are inferred from the file path.
    *     .set("profilePicture1", Paths.get("john.jpg"))
    *     // Name, value, filename and Content-Type are set.
-   *     .set("profilePicture2", new FilePayload("john.jpg", "image/jpeg", Files.readAllBytes(Paths.get("john.jpg"))));
+   *     .set("profilePicture2", new FilePayload("john.jpg", "image/jpeg", Files.readAllBytes(Paths.get("john.jpg"))))
    *     .set("age", 30);
    * page.request().post("http://localhost/submit", RequestOptions.create().setForm(form));
    * }</pre>
@@ -114,7 +249,7 @@ public interface FormData {
    *     // Name and value are set, filename and Content-Type are inferred from the file path.
    *     .set("profilePicture1", Paths.get("john.jpg"))
    *     // Name, value, filename and Content-Type are set.
-   *     .set("profilePicture2", new FilePayload("john.jpg", "image/jpeg", Files.readAllBytes(Paths.get("john.jpg"))));
+   *     .set("profilePicture2", new FilePayload("john.jpg", "image/jpeg", Files.readAllBytes(Paths.get("john.jpg"))))
    *     .set("age", 30);
    * page.request().post("http://localhost/submit", RequestOptions.create().setForm(form));
    * }</pre>
@@ -135,7 +270,7 @@ public interface FormData {
    *     // Name and value are set, filename and Content-Type are inferred from the file path.
    *     .set("profilePicture1", Paths.get("john.jpg"))
    *     // Name, value, filename and Content-Type are set.
-   *     .set("profilePicture2", new FilePayload("john.jpg", "image/jpeg", Files.readAllBytes(Paths.get("john.jpg"))));
+   *     .set("profilePicture2", new FilePayload("john.jpg", "image/jpeg", Files.readAllBytes(Paths.get("john.jpg"))))
    *     .set("age", 30);
    * page.request().post("http://localhost/submit", RequestOptions.create().setForm(form));
    * }</pre>

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

@@ -23,6 +23,13 @@ public class HttpCredentials {
    * Restrain sending http credentials on specific origin (scheme://host:port).
    */
   public String origin;
+  /**
+   * This option only applies to the requests sent from corresponding {@code APIRequestContext} and does not affect requests
+   * sent from the browser. {@code "always"} - {@code Authorization} header with basic authentication credentials will be
+   * sent with the each API request. {@code 'unauthorized} - the credentials are only sent when 401 (Unauthorized) response
+   * with {@code WWW-Authenticate} header is received. Defaults to {@code "unauthorized"}.
+   */
+  public HttpCredentialsSend send;
 
   public HttpCredentials(String username, String password) {
     this.username = username;
@@ -35,4 +42,14 @@ public class HttpCredentials {
     this.origin = origin;
     return this;
   }
+  /**
+   * This option only applies to the requests sent from corresponding {@code APIRequestContext} and does not affect requests
+   * sent from the browser. {@code "always"} - {@code Authorization} header with basic authentication credentials will be
+   * sent with the each API request. {@code 'unauthorized} - the credentials are only sent when 401 (Unauthorized) response
+   * with {@code WWW-Authenticate} header is received. Defaults to {@code "unauthorized"}.
+   */
+  public HttpCredentials setSend(HttpCredentialsSend send) {
+    this.send = send;
+    return this;
+  }
 }

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

@@ -0,0 +1,22 @@
+/*
+ * 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 HttpCredentialsSend {
+  UNAUTHORIZED,
+  ALWAYS
+}

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

@@ -19,6 +19,7 @@ package com.microsoft.playwright.options;
 public enum KeyboardModifier {
   ALT,
   CONTROL,
+  CONTROLORMETA,
   META,
   SHIFT
 }

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

@@ -133,6 +133,15 @@ public interface RequestOptions {
    * @since v1.26
    */
   RequestOptions setMaxRedirects(int maxRedirects);
+  /**
+   *
+   *
+   * @param maxRetries Maximum number of times network errors should be retried. Currently only {@code ECONNRESET} error is retried. Does not
+   * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to {@code 0} - no
+   * retries.
+   * @since v1.46
+   */
+  RequestOptions setMaxRetries(int maxRetries);
   /**
    * Changes the request method (e.g. <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PUT">PUT</a> or <a
    * href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST">POST</a>).

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

@@ -19,11 +19,15 @@ package com.microsoft.playwright;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsParameters;
 
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLParameters;
-import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.*;
+import java.io.FileInputStream;
+import java.io.InputStream;
 import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
 
 class HttpsConfiguratorImpl extends HttpsConfigurator {
 
@@ -31,7 +35,7 @@ class HttpsConfiguratorImpl extends HttpsConfigurator {
     return new HttpsConfiguratorImpl(createSSLContext());
   }
 
-  private HttpsConfiguratorImpl(SSLContext context) {
+  HttpsConfiguratorImpl(SSLContext context) {
     super(context);
   }
 
@@ -39,8 +43,8 @@ class HttpsConfiguratorImpl extends HttpsConfigurator {
   public void configure(HttpsParameters params) {
     SSLContext sslContext = getSSLContext();
     SSLParameters sslParams = sslContext.getDefaultSSLParameters();
-    sslParams.setNeedClientAuth(true);
-    params.setNeedClientAuth(true);
+    sslParams.setWantClientAuth(true);
+    params.setWantClientAuth(true);
     params.setSSLParameters(sslParams);
   }
 

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

@@ -20,7 +20,6 @@ import com.sun.net.httpserver.*;
 
 import java.io.*;
 import java.net.InetSocketAddress;
-import java.nio.file.FileSystems;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
@@ -73,11 +72,8 @@ public class Server implements HttpHandler {
     } else {
       server = HttpServer.create(new InetSocketAddress("localhost", port), 0);
     }
-
     server.createContext("/", this);
     server.setExecutor(null); // creates a default executor
-
-    File cwd = FileSystems.getDefault().getPath(".").toFile();
     server.start();
   }
 

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

@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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;
+
+import com.sun.net.httpserver.*;
+
+import javax.net.ssl.*;
+import java.io.*;
+import java.net.InetSocketAddress;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.cert.*;
+import java.util.*;
+
+public class ServerWithClientCertificate implements HttpHandler {
+  private final HttpServer server;
+  final String origin;
+  final String crossOrigin;
+  final String url;
+  KeyStore keyStore;
+
+  static ServerWithClientCertificate create(int port) throws IOException {
+    return new ServerWithClientCertificate(port);
+  }
+
+  private ServerWithClientCertificate(int port) throws IOException {
+    origin = "https://localhost:" + port;
+    crossOrigin = "https://127.0.0.1:" + port;;
+    url = origin + "/index.html";
+    HttpsServer httpsServer = HttpsServer.create(new InetSocketAddress("localhost", port), 0);
+    httpsServer.setHttpsConfigurator(new HttpsConfiguratorImpl(loadCertificates()));
+    server = httpsServer;
+    server.createContext("/", this);
+    server.setExecutor(null); // creates a default executor
+    server.start();
+  }
+
+  public void stop() {
+    server.stop(0);
+  }
+
+  private SSLContext loadCertificates() {
+    try {
+      // Create an SSL context
+      SSLContext sslContext = SSLContext.getInstance("TLS");
+
+      // Load the keystore from file
+      char[] password = "".toCharArray(); // the password you set during the PKCS12 export
+      keyStore = KeyStore.getInstance("PKCS12");
+      InputStream fis = HttpsConfiguratorImpl.class.getClassLoader().getResourceAsStream(
+        "resources/client-certificates/server/server_keystore.p12");
+      keyStore.load(fis, password);
+
+      // Set up the KeyManagerFactory to use the keystore
+      KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+      kmf.init(keyStore, password);
+
+      TrustManager[] trustAllCerts = new TrustManager[]{
+        new X509TrustManager() {
+          public X509Certificate[] getAcceptedIssuers() {
+            List<X509Certificate> certs = new ArrayList<>();
+            try {
+              for (String alias : Collections.list(keyStore.aliases())) {
+                certs.add((X509Certificate) keyStore.getCertificate(alias));
+              }
+            } catch (KeyStoreException e) {
+              throw new RuntimeException(e);
+            }
+            return certs.toArray(new X509Certificate[0]);
+          }
+
+          public void checkClientTrusted(X509Certificate[] clientCerts, String authType) throws CertificateException {
+          }
+
+          public void checkServerTrusted(X509Certificate[] certs, String authType) {
+          }
+        }
+      };
+
+      // Initialize the SSL context
+      sslContext.init(kmf.getKeyManagers(), trustAllCerts, null);
+      return sslContext;
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private boolean validateCertChain(Certificate[] clientCerts) {
+    try {
+      // Create CertPath from the provided client certificates
+      CertificateFactory factory = CertificateFactory.getInstance("X.509");
+      CertPath certPath = factory.generateCertPath(Arrays.asList(clientCerts));
+
+      // Extract Trust Anchors from the trust store
+      Set<TrustAnchor> trustAnchors = new HashSet<>();
+      for (String alias : Collections.list(keyStore.aliases())) {
+        X509Certificate trustedCert = (X509Certificate) keyStore.getCertificate(alias);
+        if (trustedCert != null) {
+          trustAnchors.add(new TrustAnchor(trustedCert, null));
+        }
+      }
+
+      // Initialize PKIX parameters
+      PKIXParameters params = new PKIXParameters(trustAnchors);
+      params.setRevocationEnabled(false); // Set to true if you want to enable CRL checking
+
+      // Validate the certification path
+      CertPathValidator certPathValidator = CertPathValidator.getInstance(CertPathValidator.getDefaultType());
+      certPathValidator.validate(certPath, params);
+
+      return true;
+    } catch (Exception e) {
+      return false;
+    }
+  }
+
+  private static String div(String testId, String message) {
+    return "<div data-testid='" + testId + "'>" + message + "</div>";
+  }
+
+  @Override
+  public void handle(HttpExchange exchange) throws IOException {
+    SSLSession sslSession = ((HttpsExchange) exchange).getSSLSession();
+    String response = div("servername", sslSession.getPeerHost());
+    try {
+      Certificate[] certs = sslSession.getPeerCertificates();
+      X509Certificate cert = (X509Certificate) certs[0];
+      exchange.getResponseHeaders().add("Content-Type", "text/html");
+      if (validateCertChain(certs)) {
+        exchange.sendResponseHeaders(200, 0);
+        response += div("message", String.format("Hello %s, your certificate was issued by %s!",
+            cert.getSubjectX500Principal().getName(), cert.getIssuerX500Principal().getName()));
+      } else {
+        response += div("message", String.format("Sorry %s, certificates from %s are not welcome here.",
+          cert.getSubjectX500Principal().getName(), cert.getIssuerX500Principal().getName()));
+        exchange.sendResponseHeaders(403, 0);
+      }
+    } catch (SSLPeerUnverifiedException e) {
+      response += div("message", "Sorry, but you need to provide a client certificate to continue.");
+      exchange.sendResponseHeaders(401, 0);
+    }
+    try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
+      writer.write(response);
+    }
+  }
+}

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

@@ -22,6 +22,7 @@ import com.microsoft.playwright.options.SameSiteAttribute;
 
 import javax.sql.rowset.Predicate;
 import java.io.IOException;
+import java.io.InputStream;
 import java.security.Provider;
 import java.time.Duration;
 import java.time.Instant;
@@ -42,9 +43,11 @@ public class TestBase {
   Browser browser;
 
   static final boolean isMac = Utils.getOS() == Utils.OS.MAC;
+  static final boolean isLinux = Utils.getOS() == Utils.OS.LINUX;
   static final boolean isWindows = Utils.getOS() == Utils.OS.WINDOWS;
   static final boolean headful;
   static final SameSiteAttribute defaultSameSiteCookieValue;
+
   static {
     String headfulEnv = System.getenv("HEADFUL");
     headful = headfulEnv != null && !"0".equals(headfulEnv) && !"false".equals(headfulEnv);
@@ -160,14 +163,28 @@ public class TestBase {
   void waitForCondition(BooleanSupplier predicate) {
     waitForCondition(predicate, 5_000);
   }
+
   void waitForCondition(BooleanSupplier predicate, int timeoutMs) {
     page.waitForCondition(predicate, new Page.WaitForConditionOptions().setTimeout(timeoutMs));
   }
 
   private static SameSiteAttribute initSameSiteAttribute() {
     if (isChromium()) return SameSiteAttribute.LAX;
-    if (isWebKit()) return SameSiteAttribute.NONE;
+    if (isWebKit() && isLinux) return SameSiteAttribute.LAX;
+    if (isWebKit() && !isLinux) return SameSiteAttribute.NONE;
     // for firefox version >= 103 'None' is used.
     return SameSiteAttribute.NONE;
   }
+
+  static boolean chromiumVersionLessThan(String a, String b) {
+    String[] aParts = a.split("\\.");
+    String[] bParts = b.split("\\.");
+    for (int i = 0; i < 4; i++) {
+      int aPart = Integer.parseInt(aParts[i]);
+      int bPart = Integer.parseInt(bParts[i]);
+      if (aPart > bPart) return false;
+      if (aPart < bPart) return true;
+    }
+    return false;
+  }
 }

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

@@ -18,6 +18,7 @@ package com.microsoft.playwright;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.microsoft.playwright.junit.FixtureTest;
 import com.microsoft.playwright.junit.UsePlaywright;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIf;
@@ -25,9 +26,9 @@ import org.junit.jupiter.api.condition.EnabledIf;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Pattern;
 
-import static com.microsoft.playwright.Utils.getBrowserTypeFromEnv;
 import static org.junit.jupiter.api.Assertions.*;
 
+@FixtureTest
 @UsePlaywright(TestOptionsFactories.BasicOptionsFactory.class)
 public class TestBrowser1 {
 
@@ -73,8 +74,8 @@ public class TestBrowser1 {
   }
 
   @Test
-  void shouldReturnBrowserType(Playwright playwright, Browser browser) {
-    assertEquals(getBrowserTypeFromEnv(playwright), browser.browserType());
+  void shouldReturnBrowserType(BrowserType browserType, Browser browser) {
+    assertEquals(browserType, browser.browserType());
   }
 
   @Test

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

@@ -16,6 +16,7 @@
 
 package com.microsoft.playwright;
 
+import com.microsoft.playwright.junit.FixtureTest;
 import com.microsoft.playwright.junit.Options;
 import com.microsoft.playwright.junit.OptionsFactory;
 import com.microsoft.playwright.junit.UsePlaywright;
@@ -28,6 +29,7 @@ import static com.microsoft.playwright.TestOptionsFactories.createLaunchOptions;
 import static com.microsoft.playwright.TestOptionsFactories.getBrowserChannelFromEnv;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+@FixtureTest
 @UsePlaywright(TestBrowser2.ChannelOptionsFactory.class)
 public class TestBrowser2 {
 
@@ -70,12 +72,11 @@ public class TestBrowser2 {
   }
 
   @Test
-  void shouldSupportDeprecatedChannelEnum(Playwright playwright) {
+  void shouldSupportDeprecatedChannelEnum(BrowserType browserType) {
     BrowserChannel channel = getBrowserChannelEnumFromEnv();
     Assumptions.assumeTrue(channel != null);
     BrowserType.LaunchOptions options = createLaunchOptions();
     options.setChannel(channel);
-    BrowserType browserType = Utils.getBrowserTypeFromEnv(playwright);
     Browser browser = browserType.launch(options);
     assertNotNull(browser);
     browser.close();

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

@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import static com.microsoft.playwright.TestOptionsFactories.isChromium;
+import static com.microsoft.playwright.TestBase.defaultSameSiteCookieValue;
 import static com.microsoft.playwright.TestOptionsFactories.isFirefox;
 import static com.microsoft.playwright.Utils.assertJsonEquals;
 import static java.util.Arrays.asList;
@@ -227,7 +227,7 @@ public class TestBrowserContextAddCookies {
       "  expires: -1,\n" +
       "  httpOnly: false,\n" +
       "  secure: false,\n" +
-      "  sameSite: '" + (isChromium() ? "LAX" : "NONE") +"'\n" +
+      "  sameSite: '" + defaultSameSiteCookieValue +"'\n" +
       "}]", cookies);
   }
 
@@ -246,7 +246,7 @@ public class TestBrowserContextAddCookies {
       "  expires: -1,\n" +
       "  httpOnly: false,\n" +
       "  secure: false,\n" +
-      "  sameSite: '" + (isChromium() ? "LAX" : "NONE") +"'\n" +
+      "  sameSite: '" + defaultSameSiteCookieValue +"'\n" +
       "}]", cookies);
     assertEquals("gridcookie=GRID", page.evaluate("document.cookie"));
     page.navigate(server.EMPTY_PAGE);
@@ -311,7 +311,7 @@ public class TestBrowserContextAddCookies {
       "  expires: -1,\n" +
       "  httpOnly: false,\n" +
       "  secure: true,\n" +
-      "  sameSite: '" + (isChromium() ? "LAX" : "NONE") +"'\n" +
+      "  sameSite: '" + defaultSameSiteCookieValue +"'\n" +
       "}]", context.cookies("https://www.example.com"));
   }
 

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

@@ -48,7 +48,7 @@ public class TestBrowserContextCookies extends TestBase {
       "    expires: -1,\n" +
       "    httpOnly: false,\n" +
       "    secure: false,\n" +
-      "    sameSite: '" + (isChromium() ? "LAX" : "NONE") +"'\n" +
+      "    sameSite: '" + defaultSameSiteCookieValue +"'\n" +
       "  }]", cookies);
   }
 
@@ -72,6 +72,7 @@ public class TestBrowserContextCookies extends TestBase {
     assertFalse(cookies.get(0).httpOnly);
     assertFalse(cookies.get(0).secure);
     assertEquals(defaultSameSiteCookieValue, cookies.get(0).sameSite);
+    assertEquals(defaultSameSiteCookieValue, cookies.get(0).sameSite);
 
     // Browsers start to cap cookies with 400 days max expires value.
     // See https://github.com/httpwg/http-extensions/pull/1732
@@ -147,7 +148,7 @@ public class TestBrowserContextCookies extends TestBase {
       "    expires: -1,\n" +
       "    httpOnly: false,\n" +
       "    secure: false,\n" +
-      "    sameSite: '" + (isChromium() ? "LAX" : "NONE") +"'\n" +
+      "    sameSite: '" + defaultSameSiteCookieValue +"'\n" +
       "  },\n" +
       "  {\n" +
       "    name: 'username',\n" +
@@ -157,7 +158,7 @@ public class TestBrowserContextCookies extends TestBase {
       "    expires: -1,\n" +
       "    httpOnly: false,\n" +
       "    secure: false,\n" +
-      "    sameSite: '" + (isChromium() ? "LAX" : "NONE") +"'\n" +
+      "    sameSite: '" + defaultSameSiteCookieValue +"'\n" +
       "  }\n" +
       "]", cookies);
   }
@@ -178,7 +179,7 @@ public class TestBrowserContextCookies extends TestBase {
       "  expires: -1.0,\n" +
       "  httpOnly: false,\n" +
       "  secure: true,\n" +
-      "  sameSite: '" + (isChromium() ? "LAX" : "NONE") +"'\n" +
+      "  sameSite: '" + defaultSameSiteCookieValue +"'\n" +
       "}, {\n" +
       "  name: 'doggo',\n" +
       "  value: 'woofs',\n" +
@@ -187,7 +188,7 @@ public class TestBrowserContextCookies extends TestBase {
       "  expires: -1.0,\n" +
       "  httpOnly: false,\n" +
       "  secure: true,\n" +
-      "  sameSite: '" + (isChromium() ? "LAX" : "NONE") +"'\n" +
+      "  sameSite: '" + defaultSameSiteCookieValue +"'\n" +
       "}]", cookies);
   }
 
@@ -205,14 +206,14 @@ public class TestBrowserContextCookies extends TestBase {
 
     page.navigate(server.EMPTY_PAGE);
     Object documentCookie = page.evaluate("document.cookie.split('; ').sort().join('; ')");
-    if (isChromium()) {
+    if (isChromium() || (isLinux && isWebKit())) {
       assertEquals("one=uno; two=dos", documentCookie);
     } else {
       assertEquals("one=uno; three=tres; two=dos", documentCookie);
     }
 
     List<SameSiteAttribute> list = context.cookies().stream().map(c -> c.sameSite).sorted().collect(Collectors.toList());
-    if (isChromium()) {
+    if (isChromium() || (isLinux && isWebKit())) {
       assertEquals(asList(SameSiteAttribute.STRICT, SameSiteAttribute.LAX), list);
     } else {
       assertEquals(asList(SameSiteAttribute.STRICT, SameSiteAttribute.LAX, SameSiteAttribute.NONE), list);

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

@@ -23,10 +23,12 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.*;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.text.ParseException;
 import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.ExecutionException;
@@ -130,7 +132,7 @@ public class TestBrowserContextFetch extends TestBase {
     context.request().get(server.EMPTY_PAGE + "?p1=foo",
       RequestOptions.create().setQueryParam("p1", "v1").setQueryParam("парам2", "знач2"));
     assertNotNull(req.get());
-    assertEquals("/empty.html?p1=v1&%D0%BF%D0%B0%D1%80%D0%B0%D0%BC2=%D0%B7%D0%BD%D0%B0%D1%872", req.get().url);
+    assertEquals("/empty.html?p1=foo&p1=v1&%D0%BF%D0%B0%D1%80%D0%B0%D0%BC2=%D0%B7%D0%BD%D0%B0%D1%872", req.get().url);
   }
 
   ;
@@ -216,7 +218,7 @@ public class TestBrowserContextFetch extends TestBase {
         writer.write("<title>Served by the proxy</title>");
       }
     });
-    try (Browser browser = browserType.launch(new BrowserType.LaunchOptions().setProxy("http://per-context"))) {
+    try (Browser browser = browserType.launch()) {
       BrowserContext context = browser.newContext(new Browser.NewContextOptions().setProxy("localhost:" + server.PORT));
       Future<Server.Request> request = server.futureRequest("/target.html");
       APIResponse response = context.request().get("http://non-existent.com/target.html");
@@ -516,10 +518,20 @@ public class TestBrowserContextFetch extends TestBase {
     testData.date = new Date(currentMillis);
     testData.localDateTime = testData.date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
     context.request().fetch(pageReq, RequestOptions.create().setMethod("POST").setData(testData));
-    assertEquals("{\"name\":\"foo\",\"localDateTime\":\"2022-12-23T06:14:58.818Z\",\"date\":\"2022-12-23T06:14:58.818Z\"}",
+    assertEquals("{\"name\":\"foo\",\"localDateTime\":\"2022-12-23T06:14:58.818Z\",\"date\":\"2022-12-23T06:14:58.818Z\",\"nullLocalDateTime\":null,\"nullDate\":null}",
       new String(req.get().postBody));
   }
 
+  @Test
+  void shouldSupportOffsetDateTimeInData() throws ExecutionException, InterruptedException {
+    APIRequestContext request = playwright.request().newContext();
+    OffsetDateTime offsetDateTime = OffsetDateTime.parse("2024-07-10T10:15:30-08:00");
+    Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
+    request.get(server.EMPTY_PAGE, RequestOptions.create().setData(mapOf("date", offsetDateTime)));
+    byte[] body = serverRequest.get().postBody;
+    assertEquals("{\"date\":\"2024-07-10T18:15:30.000Z\"}", new String(body));
+  }
+
   @Test
   void shouldSupportApplicationXWwwFormUrlencoded() throws ExecutionException, InterruptedException {
     Future<Server.Request> req = server.futureRequest("/empty.html");
@@ -591,6 +603,46 @@ public class TestBrowserContextFetch extends TestBase {
     assertEquals(200, response.status());
   }
 
+  @Test
+  public void shouldSupportRepeatingNamesInMultipartFormData() throws InterruptedException, ExecutionException {
+    Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
+
+    FilePayload file1 = new FilePayload("f.js", "text/javascript",
+      "var x = 10;\r\n;console.log(x);".getBytes(StandardCharsets.UTF_8));
+    FilePayload file2 = new FilePayload("f2.txt", "text/plain",
+      "hello".getBytes(StandardCharsets.UTF_8));
+    APIResponse response = context.request().post(server.EMPTY_PAGE, RequestOptions.create().setMultipart(
+      FormData.create()
+        .set("name", "John")
+        .append("name", "Doe")
+        .append("file", file1)
+        .append("file", file2)));
+
+    assertEquals("POST", serverRequest.get().method);
+    List<String> contentType = serverRequest.get().headers.get("content-type");
+    assertNotNull(contentType);
+    assertEquals(1, contentType.size());
+    assertTrue(contentType.get(0).contains("multipart/form-data"), contentType.get(0));
+
+    String body = new String(serverRequest.get().postBody);
+    assertTrue(body.contains("content-disposition: form-data; name=\"name\"\r\n" +
+      "\r\n" +
+      "John"), body);
+    assertTrue(body.contains("content-disposition: form-data; name=\"name\"\r\n" +
+      "\r\n" +
+      "Doe"), body);
+    assertTrue(body.contains("content-disposition: form-data; name=\"file\"; filename=\"f.js\"\r\n" +
+      "content-type: text/javascript\r\n" +
+      "\r\n" +
+      "var x = 10;\r\n" +
+      ";console.log(x);"), body);
+    assertTrue(body.contains("content-disposition: form-data; name=\"file\"; filename=\"f2.txt\"\r\n" +
+      "content-type: text/plain\r\n" +
+      "\r\n" +
+      "hello"), body);
+    assertEquals(200, response.status());
+  }
+
   @Test
   void shouldSupportMultipartFormDataWithPathValues(@TempDir Path tmp) throws ExecutionException, InterruptedException, IOException {
     Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
@@ -756,4 +808,85 @@ public class TestBrowserContextFetch extends TestBase {
       assertEquals(401, response.status());
     }
   }
+
+  @Test
+  void shouldSerializeNullValuesInPostData() throws ExecutionException, InterruptedException {
+    Future<Server.Request> req = server.futureRequest("/empty.html");
+    APIResponse response = context.request().post(server.EMPTY_PAGE, RequestOptions.create().setData(mapOf("foo", null)));
+    assertEquals(200, response.status());
+    assertEquals("{\"foo\":null}", new String(req.get().postBody));
+  }
+
+    @Test
+    void shouldSupportHTTPCredentialsSendImmediatelyForNewContext() throws ExecutionException, InterruptedException {
+      Browser.NewContextOptions options = new Browser.NewContextOptions().setHttpCredentials(
+          new HttpCredentials("user", "pass")
+            .setOrigin(server.PREFIX.toUpperCase())
+            .setSend(HttpCredentialsSend.ALWAYS));
+      try (BrowserContext context = browser.newContext(options)) {
+        Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
+        APIResponse response = context.request().get(server.EMPTY_PAGE);
+        assertEquals("Basic " + java.util.Base64.getEncoder().encodeToString("user:pass".getBytes()),
+          serverRequest.get().headers.getFirst("authorization"));
+        assertEquals(200, response.status());
+
+        serverRequest = server.futureRequest("/empty.html");
+        response = context.request().get(server.CROSS_PROCESS_PREFIX + "/empty.html");
+        // Not sent to another origin.
+        assertNull(serverRequest.get().headers.get("authorization"));
+        assertEquals(200, response.status());
+      }
+    }
+
+    @Test
+    void shouldSupportHTTPCredentialsSendImmediatelyForBrowserNewPage() throws ExecutionException, InterruptedException {
+      Browser.NewPageOptions options = new Browser.NewPageOptions().setHttpCredentials(
+        new HttpCredentials("user", "pass")
+          .setOrigin(server.PREFIX.toUpperCase())
+          .setSend(HttpCredentialsSend.ALWAYS));
+      try (Page newPage = browser.newPage(options)) {
+        Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
+        APIResponse response = newPage.request().get(server.EMPTY_PAGE);
+        assertEquals("Basic " + java.util.Base64.getEncoder().encodeToString("user:pass".getBytes()),
+          serverRequest.get().headers.getFirst("authorization"));
+        assertEquals(200, response.status());
+
+        serverRequest = server.futureRequest("/empty.html");
+        response = newPage.request().get(server.CROSS_PROCESS_PREFIX + "/empty.html");
+        // Not sent to another origin.
+        assertNull(serverRequest.get().headers.get("authorization"));
+        assertEquals(200, response.status());
+      }
+    }
+
+  @Test
+  void shouldNotWorkAfterContextDispose() {
+    context.close(new BrowserContext.CloseOptions().setReason("Test ended."));
+    PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.request().get(server.EMPTY_PAGE));
+    assertTrue(e.getMessage().contains("Test ended."), e.getMessage());
+  }
+
+  @Test
+  public void shouldRetryECONNRESET() {
+    int[] requestCount = {0};
+    server.setRoute("/test", exchange -> {
+      if (requestCount[0]++ < 3) {
+        exchange.close();
+        return;
+      }
+      exchange.getResponseHeaders().add("Content-Type", "text/plain");
+      exchange.sendResponseHeaders(200, 0);
+      try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("Hello!");
+      }
+    });
+
+    APIRequestContext requestContext = context.request();
+    APIResponse response = requestContext.get(server.PREFIX + "/test",
+      RequestOptions.create().setMaxRetries(3));
+
+    assertEquals(200, response.status());
+    assertEquals("Hello!", response.text());
+    assertEquals(4, requestCount[0]);
+  }
 }

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

@@ -29,31 +29,6 @@ import java.util.List;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TestBrowserContextProxy extends TestBase {
-
-  @Override
-  @BeforeAll
-  // Hide base class method to provide extra option.
-  void launchBrowser() {
-    BrowserType.LaunchOptions options = createLaunchOptions();
-    options.setProxy(new Proxy("per-context"));
-    launchBrowser(options);
-  }
-
-  static boolean isChromiumWindows() {
-    return isChromium() && isWindows;
-  }
-
-  @Test
-  @EnabledIf(value="isChromiumWindows", disabledReason="Platform-specific")
-  void shouldThrowForMissingGlobalProxyOnChromiumWindows() {
-    try (Browser browser = browserType.launch(createLaunchOptions())) {
-      PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
-        browser.newContext(new Browser.NewContextOptions().setProxy("localhost:" + server.PORT));
-      });
-      assertTrue(e.getMessage().contains("Browser needs to be launched with the global proxy"));
-    }
-  }
-
   void shouldThrowForBadServerValue() {
     // Enforced by compiler in Java
   }

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

@@ -98,6 +98,20 @@ public class TestBrowserContextStorageState extends TestBase {
       "}");
     Path path = tempDir.resolve("storage-state.json");
     context.storageState(new BrowserContext.StorageStateOptions().setPath(path));
+
+    String sameSiteCamelCase = "Lax";
+    switch (defaultSameSiteCookieValue) {
+      case STRICT:
+        sameSiteCamelCase = "Strict";
+        break;
+      case LAX:
+        sameSiteCamelCase = "Lax";
+        break;
+      case NONE:
+        sameSiteCamelCase = "None";
+        break;
+    }
+
     JsonObject expected = new Gson().fromJson(
       "{\n" +
       "  'cookies':[\n" +
@@ -109,7 +123,7 @@ public class TestBrowserContextStorageState extends TestBase {
       "      'expires':-1,\n" +
       "      'httpOnly':false,\n" +
       "      'secure':false,\n" +
-      "      'sameSite':'" + (isChromium() ? "Lax" : "None") + "'\n" +
+      "      'sameSite':'" + sameSiteCamelCase + "'\n" +
       "    }],\n" +
       "  'origins':[\n" +
       "    {\n" +

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

@@ -238,7 +238,7 @@ public class TestBrowserTypeConnect extends TestBase {
     }
     assertFalse(remote.isConnected());
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.evaluate("1 + 1"));
-    assertTrue(e.getMessage().contains("Browser has been closed"), e.getMessage());
+    assertTrue(e.getMessage().contains("Browser has been closed") || e.getMessage().contains("Browser closed"), e.getMessage());
     assertFalse(remote.isConnected());
   }
 
@@ -259,7 +259,7 @@ public class TestBrowserTypeConnect extends TestBase {
     }
     assertFalse(browser.isConnected());
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.waitForNavigation(() -> {}));
-    assertTrue(e.getMessage().contains("Page closed") || e.getMessage().contains("Browser has been closed"), e.getMessage());
+    assertTrue(e.getMessage().contains("Browser closed") || e.getMessage().contains("Page closed") || e.getMessage().contains("Browser has been closed"), e.getMessage());
   }
 
   @Test
@@ -506,7 +506,7 @@ public class TestBrowserTypeConnect extends TestBase {
   }
 
   @Test
-  void setInputFilesDhouldPreserveLastModifiedTimestamp() throws IOException {
+  void setInputFilesShouldPreserveLastModifiedTimestamp() throws IOException {
     page.setContent("<input type=file multiple=true/>");
     Locator input = page.locator("input");
     input.setInputFiles(FILE_TO_UPLOAD);

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

@@ -0,0 +1,232 @@
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.options.ClientCertificate;
+import com.microsoft.playwright.options.Proxy;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import static com.microsoft.playwright.Utils.nextFreePort;
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+import static java.nio.file.Files.readAllBytes;
+import static java.util.Arrays.asList;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestClientCertificates extends TestBase {
+  private ServerWithClientCertificate customServer;
+
+  private static Path asset(String path) {
+    return Paths.get("src/test/resources/" + path).toAbsolutePath();
+  }
+
+  private static String origin(String urlString) {
+    try {
+      URL url = new URL(urlString);
+      String origin = url.getProtocol() + "://" + url.getHost();
+      if (url.getPort() != -1 && url.getPort() != url.getDefaultPort()) {
+        origin += ":" + url.getPort();
+      }
+      return origin;
+    } catch (MalformedURLException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @BeforeAll
+  @Override
+  void startServer() throws IOException {
+    super.startServer();
+    customServer = ServerWithClientCertificate.create(nextFreePort());
+  }
+
+  @AfterAll
+  @Override
+  void stopServer() {
+    if (customServer != null) {
+      customServer.stop();
+      customServer = null;
+    }
+    super.stopServer();
+  }
+
+  @Test
+  public void shouldFailWithNoClientCertificatesProvided() {
+    APIRequestContext request = playwright.request().newContext(
+        new APIRequest.NewContextOptions().setIgnoreHTTPSErrors(true));
+    APIResponse response = request.get(customServer.url);
+    assertTrue(response.text().contains("Sorry, but you need to provide a client certificate to continue."), response.text());
+    request.dispose();
+  }
+
+  @Test
+  public void shouldKeepSupportingHttp() {
+    APIRequest.NewContextOptions requestOptions = new APIRequest.NewContextOptions()
+      .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
+      .setClientCertificates(asList(
+        new ClientCertificate(origin(server.PREFIX))
+          .setCertPath(asset("client-certificates/client/trusted/cert.pem"))
+          .setKeyPath(asset("client-certificates/client/trusted/key.pem"))));
+    APIRequestContext request = playwright.request().newContext(requestOptions);
+    APIResponse response = request.get(server.PREFIX + "/one-style.html");
+    assertEquals(server.PREFIX + "/one-style.html", response.url());
+    assertEquals(200, response.status());
+    assertTrue(response.text().contains("<div>hello, world!</div>"));
+    request.dispose();
+  }
+
+  @Test
+  public void shouldThrowWithUntrustedClientCerts() {
+    APIRequest.NewContextOptions requestOptions = new APIRequest.NewContextOptions()
+      .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
+      .setClientCertificates(asList(
+        new ClientCertificate(customServer.origin)
+          .setCertPath(asset("client-certificates/client/self-signed/cert.pem"))
+          .setKeyPath(asset("client-certificates/client/self-signed/key.pem"))));
+
+    APIRequestContext request = playwright.request().newContext(requestOptions);
+    APIResponse response = request.get(customServer.url);
+
+    assertEquals(customServer.url, response.url());
+    assertEquals(403, response.status());
+    assertTrue(response.text().contains("Sorry CN=Bob, certificates from CN=Bob are not welcome here."), response.text());
+
+    request.dispose();
+  }
+
+  @Test
+  public void passWithTrustedClientCertificates() {
+    APIRequest.NewContextOptions requestOptions = new APIRequest.NewContextOptions()
+      .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
+      .setClientCertificates(asList(
+        new ClientCertificate(customServer.origin)
+          .setCertPath(asset("client-certificates/client/trusted/cert.pem"))
+          .setKeyPath(asset("client-certificates/client/trusted/key.pem"))));
+
+    APIRequestContext request = playwright.request().newContext(requestOptions);
+    APIResponse response = request.get(customServer.url);
+
+    assertEquals(customServer.url, response.url());
+    assertEquals(200, response.status());
+    assertTrue(response.text().contains("Hello CN=Alice, your certificate was issued by O=Client Certificate Demo,CN=localhost!"), response.text());
+
+    request.dispose();
+  }
+
+  static boolean isWebKitMacOS() {
+    return isWebKit() && isMac;
+  }
+
+  @Test
+  @DisabledIf(value="com.microsoft.playwright.TestClientCertificates#isWebKitMacOS", disabledReason="The network connection was lost.")
+  public void shouldWorkWithBrowserNewContext() {
+    Browser.NewContextOptions options = new Browser.NewContextOptions()
+      .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
+      .setClientCertificates(asList(
+        new ClientCertificate(customServer.origin)
+          .setCertPath(asset("client-certificates/client/trusted/cert.pem"))
+          .setKeyPath(asset("client-certificates/client/trusted/key.pem"))));
+
+    try (BrowserContext context = browser.newContext(options)) {
+      Page page = context.newPage();
+      {
+        APIResponse response = page.request().get(customServer.crossOrigin);
+        assertTrue(response.text().contains("Sorry, but you need to provide a client certificate to continue."), response.text());
+      }
+      {
+        page.navigate(customServer.crossOrigin);
+        assertThat(page.getByTestId("message")).hasText("Sorry, but you need to provide a client certificate to continue.");
+      }
+      page.navigate(customServer.url);
+      assertThat(page.getByText("Hello CN=Alice")).isVisible();
+      APIResponse response = page.request().get(customServer.url);
+      assertTrue(response.text().contains("Hello CN=Alice"), response.text());
+    }
+  }
+
+  @Test
+  @DisabledIf(value="com.microsoft.playwright.TestClientCertificates#isWebKitMacOS", disabledReason="The network connection was lost.")
+  public void shouldWorkWithBrowserNewPage() {
+    Browser.NewPageOptions options = new Browser.NewPageOptions()
+      .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
+      .setClientCertificates(asList(
+        new ClientCertificate(customServer.origin)
+          .setCertPath(asset("client-certificates/client/trusted/cert.pem"))
+          .setKeyPath(asset("client-certificates/client/trusted/key.pem"))));
+
+    try (Page page = browser.newPage(options)) {
+      {
+        page.navigate(customServer.crossOrigin);
+        assertThat(page.getByTestId("message")).hasText("Sorry, but you need to provide a client certificate to continue.");
+      }
+      {
+        APIResponse response = page.request().get(customServer.crossOrigin);
+        assertTrue(response.text().contains("Sorry, but you need to provide a client certificate to continue."), response.text());
+      }
+      page.navigate(customServer.url);
+      assertThat(page.getByText("Hello CN=Alice")).isVisible();
+      APIResponse response = page.request().get(customServer.url);
+      assertTrue(response.text().contains("Hello CN=Alice"), response.text());
+    }
+  }
+
+  @Test
+  @DisabledIf(value="com.microsoft.playwright.TestClientCertificates#isWebKitMacOS", disabledReason="The network connection was lost.")
+  public void shouldWorkWithBrowserNewPageWhenPassingAsContent() throws IOException {
+    Browser.NewPageOptions options = new Browser.NewPageOptions()
+      .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
+      .setClientCertificates(asList(
+        new ClientCertificate(customServer.origin)
+          .setCert(readAllBytes(asset("client-certificates/client/trusted/cert.pem")))
+          .setKey(readAllBytes(asset("client-certificates/client/trusted/key.pem")))));
+
+    try (Page page = browser.newPage(options)) {
+       {
+        page.navigate(customServer.crossOrigin);
+        assertThat(page.getByTestId("message")).hasText("Sorry, but you need to provide a client certificate to continue.");
+      }
+      {
+        APIResponse response = page.request().get(customServer.crossOrigin);
+        assertTrue(response.text().contains("Sorry, but you need to provide a client certificate to continue."), response.text());
+      }
+      page.navigate(customServer.url);
+      assertThat(page.getByText("Hello CN=Alice")).isVisible();
+      APIResponse response = page.request().get(customServer.url);
+      assertTrue(response.text().contains("Hello CN=Alice"), response.text());
+    }
+  }
+
+  @Test
+  @DisabledIf(value="com.microsoft.playwright.TestClientCertificates#isWebKitMacOS", disabledReason="The network connection was lost.")
+  public void shouldWorkWithBrowserLaunchPersistentContext(@TempDir Path tmpDir) {
+    BrowserType.LaunchPersistentContextOptions options = new BrowserType.LaunchPersistentContextOptions()
+      .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
+      .setClientCertificates(asList(
+        new ClientCertificate(customServer.origin)
+          .setCertPath(asset("client-certificates/client/trusted/cert.pem"))
+          .setKeyPath(asset("client-certificates/client/trusted/key.pem"))));
+
+    try (BrowserContext context = browser.browserType().launchPersistentContext(tmpDir.resolve("profile") , options)) {
+      Page page = context.pages().get(0);
+      {
+        page.navigate(customServer.crossOrigin);
+        assertThat(page.getByTestId("message")).hasText("Sorry, but you need to provide a client certificate to continue.");
+      }
+      {
+        APIResponse response = page.request().get(customServer.crossOrigin);
+        assertTrue(response.text().contains("Sorry, but you need to provide a client certificate to continue."), response.text());
+      }
+      page.navigate(customServer.url);
+      assertThat(page.getByText("Hello CN=Alice")).isVisible();
+      APIResponse response = page.request().get(customServer.url);
+      assertTrue(response.text().contains("Hello CN=Alice"), response.text());
+    }
+  }
+}

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

@@ -168,35 +168,6 @@ public class TestDefaultBrowserContext2 extends TestBase {
     browserContext3.close();
   }
 
-  @Test
-  void shouldRestoreCookiesFromUserDataDir() throws IOException {
-// TODO:   test.flaky(browserName === "chromium");
-    Path userDataDir = tempDir.resolve("user-data-dir");
-    BrowserType.LaunchPersistentContextOptions browserOptions = null;
-    BrowserContext browserContext = browserType.launchPersistentContext(userDataDir, browserOptions);
-    Page page = browserContext.newPage();
-    page.navigate(server.EMPTY_PAGE);
-    Object documentCookie = page.evaluate("() => {\n" +
-      "    document.cookie = 'doSomethingOnlyOnce=true; expires=Fri, 31 Dec 9999 23:59:59 GMT';\n" +
-      "    return document.cookie;\n" +
-      "  }");
-    assertEquals("doSomethingOnlyOnce=true", documentCookie);
-    browserContext.close();
-
-    BrowserContext browserContext2 = browserType.launchPersistentContext(userDataDir, browserOptions);
-    Page page2 = browserContext2.newPage();
-    page2.navigate(server.EMPTY_PAGE);
-    assertEquals("doSomethingOnlyOnce=true", page2.evaluate("() => document.cookie"));
-    browserContext2.close();
-
-    Path userDataDir2 = tempDir.resolve("user-data-dir-2");
-    BrowserContext browserContext3 = browserType.launchPersistentContext(userDataDir2, browserOptions);
-    Page page3 = browserContext3.newPage();
-    page3.navigate(server.EMPTY_PAGE);
-    assertNotEquals("doSomethingOnlyOnce=true", page3.evaluate("() => document.cookie"));
-    browserContext3.close();
-  }
-
   @Test
   void shouldHaveDefaultURLWhenLaunchingBrowser() {
     launchPersistent();

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

@@ -43,9 +43,9 @@ public class TestElementHandleConvenience extends TestBase {
     String text = String.join("", Collections.nCopies(100, "😛"));
     page.setContent("<div title='" + text + "'>" + text + "</div>");
     ElementHandle handle = page.querySelector("div");
-    context.waitForCondition(() -> "JSHandle@<div title=\"😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛…>😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛…</div>"
+    context.waitForCondition(() -> "JSHandle@<div title=\"😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛\">😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛…</div>"
         .equals(handle.toString()), new BrowserContext.WaitForConditionOptions().setTimeout(5_000));
-    assertEquals("JSHandle@<div title=\"😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛…>😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛…</div>", handle.toString());
+    assertEquals("JSHandle@<div title=\"😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛\">😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛😛…</div>", handle.toString());
   }
 
   @Test

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

@@ -18,6 +18,7 @@ package com.microsoft.playwright;
 
 import com.google.gson.Gson;
 import com.microsoft.playwright.options.HttpCredentials;
+import com.microsoft.playwright.options.HttpCredentialsSend;
 import com.microsoft.playwright.options.HttpHeader;
 import com.microsoft.playwright.options.RequestOptions;
 import org.junit.jupiter.api.Disabled;
@@ -25,6 +26,7 @@ import org.junit.jupiter.api.Test;
 
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.util.Base64;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
@@ -490,4 +492,60 @@ public class TestGlobalFetch extends TestBase {
     assertEquals(401, response.status());
   }
 
+  @Test
+  void shouldSupportHTTPCredentialsSendImmediately() throws InterruptedException, ExecutionException {
+    APIRequestContext request = playwright.request().newContext(new APIRequest.NewContextOptions()
+      .setHttpCredentials(new HttpCredentials("user", "pass")
+        .setOrigin(server.PREFIX.toUpperCase())
+        .setSend(HttpCredentialsSend.ALWAYS)));
+
+    Future<Server.Request> serverRequestFuture = server.futureRequest("/empty.html");
+    APIResponse response = request.get(server.EMPTY_PAGE);
+    assertEquals("Basic " + Base64.getEncoder().encodeToString("user:pass".getBytes()),
+      serverRequestFuture.get().headers.getFirst("authorization"));
+    assertEquals(200, response.status());
+
+    // Second request and response to another origin
+    serverRequestFuture = server.futureRequest("/empty.html");
+    response = request.get(server.CROSS_PROCESS_PREFIX + "/empty.html");
+
+    // Not sent to another origin
+    assertNull(serverRequestFuture.get().headers.get("authorization"));
+    assertEquals(200, response.status());
+
+    request.dispose();
+  }
+
+  @Test
+  void shouldSupportDisposeReason() {
+    APIRequestContext request = playwright.request().newContext();
+    request.dispose(new APIRequestContext.DisposeOptions().setReason("My reason"));
+    PlaywrightException e = assertThrows(PlaywrightException.class, () -> request.get(server.EMPTY_PAGE));
+    assertTrue(e.getMessage().contains("My reason"), e.getMessage());
+  }
+
+  @Test
+  public void shouldRetryECONNRESET() {
+    int[] requestCount = {0};
+    server.setRoute("/test", exchange -> {
+      if (requestCount[0]++ < 3) {
+        exchange.close();
+        return;
+      }
+      exchange.getResponseHeaders().add("Content-Type", "text/plain");
+      exchange.sendResponseHeaders(200, 0);
+      try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("Hello!");
+      }
+    });
+
+    APIRequestContext requestContext = playwright.request().newContext();
+    APIResponse response = requestContext.get(server.PREFIX + "/test",
+      RequestOptions.create().setMaxRetries(3));
+
+    assertEquals(200, response.status());
+    assertEquals("Hello!", response.text());
+    assertEquals(4, requestCount[0]);
+    requestContext.dispose();
+  }
 }

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

@@ -17,9 +17,12 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.assertions.LocatorAssertions;
+import com.microsoft.playwright.options.AriaRole;
 import org.junit.jupiter.api.Test;
 import org.opentest4j.AssertionFailedError;
 
+import java.util.regex.Pattern;
+
 import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -115,4 +118,36 @@ public class TestLocatorAssertions2 extends TestBase {
     page.setContent("<div id=node>Text content</div>");
     assertThat(page.locator("no-such-thing")).not().isAttached(new LocatorAssertions.IsAttachedOptions().setTimeout(1));
   }
+
+  @Test
+  public void toHaveAccessibleName() {
+    page.setContent("<div role=\"button\" aria-label=\"Hello\"></div>");
+
+    assertThat(page.locator("div")).hasAccessibleName("Hello");
+    assertThat(page.locator("div")).not().hasAccessibleName("hello");
+    assertThat(page.locator("div")).hasAccessibleName("hello", new LocatorAssertions.HasAccessibleNameOptions().setIgnoreCase(true));
+    assertThat(page.locator("div")).hasAccessibleName(Pattern.compile("ell\\w"));
+    assertThat(page.locator("div")).not().hasAccessibleName(Pattern.compile("hello"));
+    assertThat(page.locator("div")).hasAccessibleName(Pattern.compile("hello"), new LocatorAssertions.HasAccessibleNameOptions().setIgnoreCase(true));
+  }
+
+  @Test
+  public void toHaveAccessibleDescription() {
+    page.setContent("<div role=\"button\" aria-description=\"Hello\"></div>");
+
+    assertThat(page.locator("div")).hasAccessibleDescription("Hello");
+    assertThat(page.locator("div")).not().hasAccessibleDescription("hello");
+    assertThat(page.locator("div")).hasAccessibleDescription("hello", new LocatorAssertions.HasAccessibleDescriptionOptions().setIgnoreCase(true));
+    assertThat(page.locator("div")).hasAccessibleDescription(Pattern.compile("ell\\w"));
+    assertThat(page.locator("div")).not().hasAccessibleDescription(Pattern.compile("hello"));
+    assertThat(page.locator("div")).hasAccessibleDescription(Pattern.compile("hello"), new LocatorAssertions.HasAccessibleDescriptionOptions().setIgnoreCase(true));
+  }
+
+  @Test
+  public void toHaveRole() {
+    page.setContent("<div role=\"button\">Button!</div>");
+
+    assertThat(page.locator("div")).hasRole(AriaRole.BUTTON);
+    assertThat(page.locator("div")).not().hasRole(AriaRole.CHECKBOX);
+  }
 }