Merge branch 'trunk' into replace-string-equals

Author: iampopovich

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -50,7 +50,7 @@ body:
     id: selenium-version
     attributes:
       label: What version of Selenium are you currently using?
-      description: Important! The latest released version of Selenium is 4.34 and we can't fix old versions.
+      description: Important! The latest released version of Selenium is 4.36 and we can't fix old versions.
       placeholder: e.g., 4.17.0
     validations:
       required: true

.github/label-commenter-config.yml

@@ -117,7 +117,7 @@ labels:
           This is related to code in the Support packages. The support packages contain example code that
           many users find helpful, but they do not necessarily represent the best practices for using Selenium,
           and the Selenium team is not prioritizing work on them right now.
-          This doesn't mean that we won't ever work on them, but it is not on our roadmap as we push to release Selenium 5.
+          This doesn't mean that we won't ever work on them, but it is not on our long term roadmap.
 
           We actively encourage people to create their own wrapper and helper code that makes sense for them.
           If you have any questions, please [contact us](https://www.selenium.dev/support)
@@ -127,10 +127,12 @@ labels:
 
           The support packages contain example code that many users find helpful, but they do not necessarily represent
           the best practices for using Selenium, and the Selenium team is not currently merging changes to them.
+          
+          After reviewing the change, unless it is a critical fix or a feature that is needed for Selenium 
+          to work, we will likely close the PR.
 
           We actively encourage people to add the wrapper and helper code that makes sense for them to their own frameworks.
           If you have any questions, please [contact us](https://www.selenium.dev/support)
-        action: close
 
 
 

.github/renovate.json

@@ -1,3 +1,26 @@
 {
-  "labels": ["B-dependencies"]
+  "labels": [
+    "B-dependencies"
+  ],
+  "docker": {
+    "enabled": false
+  },
+  "packageRules": [
+    {
+      "matchDatasources": [
+        "docker"
+      ],
+      "enabled": false
+    },
+    {
+      "matchPackagePatterns": [
+        "^docker:",
+        "^gcr.io/",
+        "^registry.k8s.io/",
+        "^quay.io/",
+        "^ghcr.io/"
+      ],
+      "enabled": false
+    }
+  ]
 }

.github/workflows/bazel.yml

@@ -126,6 +126,8 @@ jobs:
         with:
           bazelisk-cache: true
           bazelrc: common --color=yes
+          # Workaround for long path issues: https://github.com/bazelbuild/bazel/pull/22532
+          output-base: ${{ inputs.os == 'windows' && 'D://b' || '' }}
           cache-version: 2
           disk-cache: ${{ inputs.cache-key }}
           external-cache: |

.github/workflows/ci-java.yml

@@ -28,7 +28,8 @@ jobs:
             //java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest `
             //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest `
             //java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest `
-            //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest
+            //java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest `
+            //java/test/org/openqa/selenium/devtools:NetworkInterceptorRestTest
 
   browser-tests-macos:
     name: Browser Tests

.github/workflows/ci-python.yml

@@ -11,7 +11,8 @@ jobs:
     with:
       name: Build
       cache-key: py-build
-      run: bazel build //py:selenium-wheel //py:selenium-sdist
+      run: |
+        bazel build //py:selenium-wheel //py:selenium-sdist
 
   docs:
     name: Documentation
@@ -21,15 +22,16 @@ jobs:
       - name: Checkout source tree
         uses: actions/checkout@v4
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.27.0
+          pip install tox==4.30.2
       - name: Generate docs
-        run: tox -c py/tox.ini
+        run: |
+          tox -c py/tox.ini
         env:
           TOXENV: docs
 
@@ -41,19 +43,36 @@ jobs:
       - name: Checkout source tree
         uses: actions/checkout@v4
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.27.0
+          pip install tox==4.30.2
       - name: Run type checking
         run: |
           tox -c py/tox.ini || true
         env:
           TOXENV: mypy
 
+  unit-tests:
+    name: Unit Tests
+    needs: build
+    uses: ./.github/workflows/bazel.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu
+          - os: macos
+    with:
+      name: Unit Tests (${{ matrix.os }})
+      os: ${{ matrix.os }}
+      cache-key: python-unit-test-${{ matrix.os }}
+      run: |
+        bazel test //py:unit
+
   remote-tests:
     name: Remote Tests
     needs: build
@@ -67,7 +86,8 @@ jobs:
       name: Integration Tests (remote, ${{ matrix.browser }})
       browser: ${{ matrix.browser }}
       cache-key: py-remote-${{ matrix.browser }}
-      run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
+      run: |
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
 
   browser-tests:
     name: Browser Tests
@@ -89,10 +109,30 @@ jobs:
       os: ${{ matrix.os }}
       cache-key: py-browser-${{ matrix.browser }}
       run: |
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi //py:test-${{ matrix.browser }}
+
+  browser-tests-windows:
+    name: Browser Tests
+    needs: build
+    uses: ./.github/workflows/bazel.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - browser: chrome
+            os: windows
+          - browser: edge
+            os: windows
+    with:
+      name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
+      browser: ${{ matrix.browser }}
+      os: ${{ matrix.os }}
+      cache-key: py-browser-${{ matrix.browser }}
+      run: |
+        fsutil 8dot3name set 0
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi //py:test-${{ matrix.browser }}
 
-  safari-tests:
+  browser-tests-macos:
     name: Browser Tests
     needs: build
     uses: ./.github/workflows/bazel.yml
@@ -108,4 +148,4 @@ jobs:
       os: ${{ matrix.os }}
       cache-key: py-browser-${{ matrix.browser }}
       run: |
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }} //py:test-${{ matrix.browser }}

.github/workflows/ci-ruby.yml

@@ -96,7 +96,7 @@ jobs:
       matrix:
         include:
           - browser: edge
-            os: windows
+            os: macos
     with:
       name: Remote Tests (${{ matrix.browser }}, ${{ matrix.os }})
       browser: ${{ matrix.browser }}

.github/workflows/stage-release.yml

@@ -81,3 +81,5 @@ jobs:
     with:
       version: ${{ needs.github-release.outputs.version }}
       sha: ${{ github.sha }}
+    secrets:
+      SELENIUM_CI_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}

.github/workflows/update-documentation.yml

@@ -19,6 +19,11 @@ on:
           - dotnet
           - node
           - all
+      force:
+        description: Force generation even if version is nightly, type "force" to enable
+        required: false
+        type: string
+        default: ""
 
   workflow_call:
     inputs:
@@ -32,6 +37,9 @@ on:
         required: false
         type: string
         default: "all"
+    secrets:
+      SELENIUM_CI_TOKEN:
+        required: true
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -60,7 +68,7 @@ jobs:
           distribution: 'temurin'
       - name: Set up Python 3.9
         if: ${{ inputs.language == 'py' || inputs.language == 'all' }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Install dependencies
@@ -74,7 +82,7 @@ jobs:
           npm install
           npm install --prefix javascript/selenium-webdriver
       - name: Generate Documentation for selected langauges
-        run: ./go ${{ inputs.language }}:docs
+        run: ./go ${{ inputs.language }}:docs ${{ inputs.force }}
       - name: Documentation Pull Request
         id: cpr
         uses: peter-evans/create-pull-request@v6

.gitignore

@@ -78,7 +78,6 @@ py/docs/source/**/*
 !py/docs/source/conf.py
 !py/docs/source/*.rst
 py/build/
-py/LICENSE
 py/pytestdebug.log
 py/python.iml
 selenium.egg-info/