Merge branch 'trunk' into renovate/ws-8.x

Author: pujagani

dotnet/src/webdriver/BiDi/Network/Cookie.cs

@@ -32,5 +32,6 @@ public enum SameSite
 {
     Strict,
     Lax,
-    None
+    None,
+    Default
 }

dotnet/src/webdriver/Chromium/ChromiumDriverService.cs

@@ -95,6 +95,11 @@ protected ChromiumDriverService(string? executablePath, string? executableFileNa
     /// </summary>
     public string? AllowedIPAddresses { get; set; }
 
+    /// <summary>
+    /// Adds readable timestamps to log
+    /// </summary>
+    public bool ReadableTimestamp { get; set; }
+
     /// <summary>
     /// Gets the command-line arguments for the driver service.
     /// </summary>
@@ -128,6 +133,11 @@ protected override string CommandLineArguments
                 argsBuilder.Append(" --append-log");
             }
 
+            if (this.ReadableTimestamp)
+            {
+                argsBuilder.Append(" --readable-timestamp");
+            }
+
             if (!string.IsNullOrEmpty(this.LogPath))
             {
                 argsBuilder.AppendFormat(CultureInfo.InvariantCulture, " --log-path=\"{0}\"", this.LogPath);

dotnet/src/webdriver/Firefox/FirefoxDriverService.cs

@@ -103,6 +103,16 @@ protected override DriverOptions GetDefaultDriverOptions()
     /// </remarks>
     public string? LogPath { get; set; }
 
+    /// <summary>
+    /// Disable truncation of long log lines in GeckoDriver.
+    /// </summary>
+    public bool LogNoTruncate { get; set; }
+
+    /// <summary>
+    /// Directory in which GeckoDriver creates profiles.
+    /// </summary>
+    public string? ProfileRoot { get; set; }
+
     /// <summary>
     /// Gets or sets the level at which log output is displayed.
     /// </summary>
@@ -189,6 +199,21 @@ protected override string CommandLineArguments
                 argsBuilder.Append(" --jsdebugger");
             }
 
+            if (this.LogNoTruncate)
+            {
+                argsBuilder.Append(" --log-no-truncate");
+            }
+
+            if (!string.IsNullOrEmpty(this.ProfileRoot))
+            {
+                if (!Directory.Exists(this.ProfileRoot))
+                {
+                    throw new ArgumentException($"Profile root directory does not exist: {this.ProfileRoot}", nameof(ProfileRoot));
+                }
+
+                argsBuilder.AppendFormat(CultureInfo.InvariantCulture, " --profile-root \"{0}\"", this.ProfileRoot);
+            }
+
             return argsBuilder.ToString().Trim();
         }
     }

java/src/org/openqa/selenium/bidi/network/Cookie.java

@@ -25,7 +25,8 @@ public class Cookie {
   public enum SameSite {
     STRICT("strict"),
     LAX("lax"),
-    NONE("none");
+    NONE("none"),
+    DEFAULT("default");
 
     private final String type;
 

javascript/selenium-webdriver/bidi/networkTypes.js

@@ -26,6 +26,7 @@ const SameSite = {
   STRICT: 'strict',
   LAX: 'lax',
   NONE: 'none',
+  DEFAULT: 'default',
 
   findByName(name) {
     return (

py/BUILD.bazel

@@ -441,7 +441,8 @@ BIDI_TESTS = glob(["test/selenium/webdriver/common/**/*bidi*_tests.py"])
                 "test/selenium/webdriver/common/**/*.py",
                 "test/selenium/webdriver/support/**/*.py",
             ],
-            exclude = BIDI_TESTS + ["test/selenium/webdriver/common/print_pdf_tests.py"],
+            exclude = BIDI_TESTS + ["test/selenium/webdriver/common/print_pdf_tests.py"] +
+                      (["test/selenium/webdriver/common/devtools_tests.py"] if browser == "chrome-beta" else []),
         ),
         args = [
             "--instafail",
@@ -467,7 +468,8 @@ BIDI_TESTS = glob(["test/selenium/webdriver/common/**/*bidi*_tests.py"])
                 "test/selenium/webdriver/common/**/*.py",
                 "test/selenium/webdriver/support/**/*.py",
             ],
-            exclude = ["test/selenium/webdriver/common/print_pdf_tests.py"],
+            exclude = ["test/selenium/webdriver/common/print_pdf_tests.py"] +
+                      (["test/selenium/webdriver/common/devtools_tests.py"] if browser == "chrome-beta" else []),
         ),
         args = [
             "--instafail",
@@ -534,6 +536,29 @@ py_test_suite(
     ] + TEST_DEPS,
 )
 
+py_test_suite(
+    name = "test-chrome-beta",
+    size = "large",
+    srcs = glob(
+        [
+            "test/selenium/webdriver/chrome/**/*.py",
+        ],
+    ),
+    args = [
+        "--instafail",
+    ] + BROWSERS["chrome-beta"]["args"],
+    data = BROWSERS["chrome-beta"]["data"],
+    env_inherit = ["DISPLAY"],
+    tags = [
+        "no-sandbox",
+    ] + BROWSERS["chrome-beta"]["tags"],
+    deps = [
+        ":init-tree",
+        ":selenium",
+        ":webserver",
+    ] + TEST_DEPS,
+)
+
 py_test_suite(
     name = "test-edge",
     size = "large",

py/docs/source/index.rst

@@ -47,24 +47,32 @@ Several browsers are supported, as well as the Remote protocol:
 Installing
 ==========
 
-If you have `pip <https://pip.pypa.io/>`_ on your system, you can simply install or upgrade the Python bindings::
+Install or upgrade the Python bindings with `pip <https://pip.pypa.io/>`.
+
+Latest official release::
 
     pip install -U selenium
 
-You may want to consider using a `virtual environment <https://packaging.python.org/en/latest/guides/installing-using-pip-and-virtual-environments>`_
-to create isolated Python environments.
+Nightly development release::
+
+    pip install -U --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ selenium
+
+Note: you should consider using a
+`virtual environment <https://packaging.python.org/en/latest/guides/installing-using-pip-and-virtual-environments>`_
+to create an isolated Python environment for installation.
 
 Drivers
 =======
 
 Selenium requires a driver to interface with the chosen browser (chromedriver, edgedriver, geckodriver, etc).
 
-In older versions of Selenium, it was necessary to install and manage these drivers yourself. You had to make sure the driver
-executable was available on your system `PATH`, or specified explicitly in code. Modern versions of Selenium handle browser and
-driver installation for you with `Selenium Manager <https://www.selenium.dev/documentation/selenium_manager>`_. You generally
-don't have to worry about driver installation or configuration now that it's done for you when you instantiate a WebDriver.
-Selenium Manager works with most supported platforms and browsers. If it doesn't meet your needs, you can still install and
-specify browsers and drivers yourself.
+In older versions of Selenium, it was necessary to install and manage these drivers yourself. You had to make sure the
+driver executable was available on your system `PATH`, or specified explicitly in code. Modern versions of Selenium
+handle browser and driver installation for you with
+`Selenium Manager <https://www.selenium.dev/documentation/selenium_manager>`_. You generally don't have to worry about
+driver installation or configuration now that it's done for you when you instantiate a WebDriver. Selenium Manager works
+with most supported platforms and browsers. If it doesn't meet your needs, you can still install and specify browsers
+and drivers yourself.
 
 Links to some of the more popular browser drivers:
 
@@ -123,8 +131,8 @@ Example 1:
 Example 2:
 ==========
 
-Selenium WebDriver is often used as a basis for testing web applications. Here is a simple example using Python's standard
-`unittest <http://docs.python.org/3/library/unittest.html>`_ library:
+Selenium WebDriver is often used as a basis for testing web applications. Here is a simple example using Python's
+standard `unittest <http://docs.python.org/3/library/unittest.html>`_ library:
 
 .. code-block:: python
 
@@ -150,8 +158,8 @@ Selenium Grid (optional)
 
 For local Selenium scripts, the Java server is not needed.
 
-To use Selenium remotely, you need to also run the Selenium grid.
-For information on running Selenium Grid: https://www.selenium.dev/documentation/grid/getting_started/
+To use Selenium remotely, you need to also run a Selenium Grid. For information on running Selenium Grid:
+https://www.selenium.dev/documentation/grid/getting_started/
 
 To use Remote WebDriver see: https://www.selenium.dev/documentation/webdriver/drivers/remote_webdriver/?tab=python
 
@@ -167,15 +175,14 @@ View source code online:
 Contributing
 =============
 
- - Fork the selenium repo and clone it locally
+ - Fork the selenium repo
+ - Clone your fork locally
  - Create a branch for your work
-     - Run: `git checkout -b my-cool-branch-name`
+     - `git checkout -b my-cool-branch-name`
  - Create a virtual environment and install tox
-     - Run: `python -m venv venv && source venv/bin/activate && pip install tox`
+     - `python -m venv venv && source venv/bin/activate && pip install tox`
  - Make your changes
- - Run: `tox -e linting`
+ - Run the linter/formatter
+     - `tox -e linting`
  - If tox exits `0`, commit and push. Otherwise, fix the newly introduced style violations
-     - `flake8` requires manual fixes
-     - `black` will rewrite the violations automatically, however the files are unstaged and should be staged again
-     - `isort` will rewrite the violations automatically, however the files are unstaged and should be staged again
  - Submit a Pull Request

py/private/browsers.bzl

@@ -1,6 +1,7 @@
 load(
     "//common:browsers.bzl",
     "COMMON_TAGS",
+    "chrome_beta_data",
     "chrome_data",
     "edge_data",
     "firefox_data",
@@ -27,6 +28,20 @@ chrome_args = select({
     "//conditions:default": [],
 }) + headless_args
 
+chrome_beta_args = select({
+    "@selenium//common:use_pinned_linux_chrome": [
+        "--driver-binary=$(location @linux_beta_chromedriver//:chromedriver)",
+        "--browser-binary=$(location @linux_beta_chrome//:chrome-linux64/chrome)",
+        "--browser-args=--disable-dev-shm-usage",
+        "--browser-args=--no-sandbox",
+    ],
+    "@selenium//common:use_pinned_macos_chrome": [
+        "--driver-binary=$(location @mac_beta_chromedriver//:chromedriver)",
+        "--browser-binary=$(location @mac_beta_chrome//:Chrome.app)/Contents/MacOS/Chrome",
+    ],
+    "//conditions:default": [],
+}) + headless_args
+
 edge_args = select({
     "@selenium//common:use_pinned_linux_edge": [
         "--driver-binary=$(location @linux_edgedriver//:msedgedriver)",
@@ -59,6 +74,11 @@ BROWSERS = {
         "data": chrome_data,
         "tags": COMMON_TAGS + ["chrome"],
     },
+    "chrome-beta": {
+        "args": ["--driver=chrome"] + chrome_beta_args,
+        "data": chrome_beta_data,
+        "tags": COMMON_TAGS + ["chrome"],
+    },
     "edge": {
         "args": ["--driver=edge"] + edge_args,
         "data": edge_data,

py/selenium/webdriver/common/bidi/storage.py

@@ -26,6 +26,7 @@ class SameSite:
     STRICT = "strict"
     LAX = "lax"
     NONE = "none"
+    DEFAULT = "default"
 
 
 class BytesValue: